[overlord-commits] Overlord SVN: r182 - in cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src: java/org/jboss/tools/overlord/jbossesb/model/actions and 2 other directories.
overlord-commits at lists.jboss.org
overlord-commits at lists.jboss.org
Thu Jul 17 09:25:20 EDT 2008
Author: objectiser
Date: 2008-07-17 09:25:20 -0400 (Thu, 17 Jul 2008)
New Revision: 182
Added:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/util/
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/util/ClasspathUtil.java
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/DefaultESBLanguageModel.java
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/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/IfAction.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/MessageRouterAction.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/java/org/jboss/tools/overlord/jbossesb/model/actions/PerformAction.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/ReceiveMessageAction.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/RetrieveSessionAction.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/ScheduleStateAction.java
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/java/org/jboss/tools/overlord/jbossesb/model/actions/SetStateAction.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/SwitchAction.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/WhenAction.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/WhileAction.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/IfActionTest.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/MessageRouterActionTest.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/ParallelActionTest.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/PerformActionTest.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/ReceiveMessageActionTest.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/RetrieveSessionActionTest.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/ScheduleStateActionTest.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/SendMessageActionTest.java
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/SetStateActionTest.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/SwitchActionTest.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/WhenActionTest.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/WhileActionTest.java
Log:
Fixed validation performance problem. Now checking for unknown properties. Updated PerformAction properties from 'responseService....' to 'returnService....'.
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/DefaultESBLanguageModel.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/DefaultESBLanguageModel.java 2008-07-17 11:14:48 UTC (rev 181)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/DefaultESBLanguageModel.java 2008-07-17 13:25:20 UTC (rev 182)
@@ -20,9 +20,17 @@
import java.util.Properties;
import java.util.logging.Logger;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.jdt.core.IClasspathEntry;
+import org.eclipse.jdt.core.IJavaProject;
+import org.eclipse.jdt.core.JavaCore;
import org.scribble.conversation.model.*;
import org.scribble.extensions.RegistryFactory;
import org.scribble.model.*;
+import org.scribble.osgi.model.OSGIModelRepository;
/**
* This class represents an ESB model.
@@ -290,12 +298,32 @@
return(m_contents);
}
+ /**
+ * This method returns a custom classloader that uses the project's
+ * classpath to locate classes referenced by the ESB config file.
+ *
+ * @see http://dev.eclipse.org/newslists/news.eclipse.tools.jdt/msg17769.html
+ *
+ * @return The classloader
+ * @throws Exception Failed to obtain the classloader
+ */
+ public synchronized ClassLoader getModelClassLoader() throws Exception {
+
+ if (m_classLoader == null) {
+ m_classLoader = org.jboss.tools.overlord.jbossesb.model.util.ClasspathUtil.createClassLoader(getModelReference());
+ }
+
+ return(m_classLoader);
+ }
+
+
private static Logger logger = Logger.getLogger("org.jboss.tools.overlord.jbossesb.model");
private ModelReference m_source=null;
private org.w3c.dom.Element m_esbConfig=null;
private String m_contents=null;
private java.util.Map<String,ESBService> m_services=new java.util.Hashtable<String,ESBService>();
+ private ClassLoader m_classLoader=null;
public class InnerModelListener implements ModelListener {
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-17 11:14:48 UTC (rev 181)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/DefaultESBService.java 2008-07-17 13:25:20 UTC (rev 182)
@@ -202,7 +202,8 @@
java.lang.annotation.Annotation ret=null;
try {
- ClassLoader cl=getServiceClassLoader();
+ ClassLoader cl=
+ org.jboss.tools.overlord.jbossesb.model.util.ClasspathUtil.getClassLoader(getModel());
Class<?> cls=Class.forName(session, true, cl);
@@ -446,7 +447,8 @@
if (session != null) {
try {
- ClassLoader cl=getServiceClassLoader();
+ ClassLoader cl=
+ org.jboss.tools.overlord.jbossesb.model.util.ClasspathUtil.getClassLoader(getModel());
ret = Class.forName(session, true, cl);
@@ -522,77 +524,6 @@
return(servCount);
}
- /**
- * This method returns a custom classloader that uses the project's
- * classpath to locate classes referenced by the ESB config file.
- *
- * @see http://dev.eclipse.org/newslists/news.eclipse.tools.jdt/msg17769.html
- *
- * @return The classloader
- * @throws Exception Failed to obtain the classloader
- */
- public ClassLoader getServiceClassLoader() throws Exception {
- java.net.URLClassLoader classLoader=null;
- IFile file=OSGIModelRepository.getFile(getModel().getModelReference());
-
- if (file != null) {
- IJavaProject javaProject=JavaCore.create(file.getProject());
- java.util.List<java.net.URL> urls=new java.util.Vector<java.net.URL>();
-
- scanProjectForClasspath(javaProject, urls);
-
- java.net.URL[] urlarray=new java.net.URL[urls.size()];
- urls.toArray(urlarray);
-
- classLoader = new java.net.URLClassLoader(urlarray,
- String.class.getClassLoader());
- }
-
- return(classLoader);
- }
-
- protected void scanProjectForClasspath(IJavaProject javaProject,
- java.util.List<java.net.URL> urls) throws Exception {
- IClasspathEntry[] entries = javaProject.getResolvedClasspath(true);
-
- IResource outres=ResourcesPlugin.getWorkspace().getRoot().findMember(javaProject.getOutputLocation());
- if (outres != null) {
- urls.add(new java.io.File(outres.getLocation().toPortableString()).toURL());
- }
-
- for (IClasspathEntry entry : entries) {
- if(entry.getEntryKind() == IClasspathEntry.CPE_PROJECT) {
- IResource project =
- ResourcesPlugin.getWorkspace().getRoot().findMember(entry.getPath());
-
- if (project instanceof IProject) {
- IJavaProject jproj=JavaCore.create((IProject)project);
-
- if (jproj != null) {
- scanProjectForClasspath(jproj, urls);
- }
- }
-
- } else {
-
- IResource res=ResourcesPlugin.getWorkspace().getRoot().findMember(entry.getPath());
-
- java.net.URL url=null;
-
- if (res != null) {
- url = new java.io.File(res.getLocation().
- toPortableString()).toURL();
- } else {
- url = entry.getPath().toFile().toURL();
- }
-
- if (url != null && urls.contains(url) == false) {
- urls.add(url);
- }
- }
- }
- }
-
public int hashCode() {
return(m_service.hashCode());
}
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-17 11:14:48 UTC (rev 181)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/ESBService.java 2008-07-17 13:25:20 UTC (rev 182)
@@ -159,16 +159,5 @@
* @return The service node position
*/
public int getServicePosition();
-
- /**
- * This method returns a custom classloader that uses the project's
- * classpath to locate classes referenced by the ESB config file.
- *
- * @see http://dev.eclipse.org/newslists/news.eclipse.tools.jdt/msg17769.html
- *
- * @return The classloader
- * @throws Exception Failed to obtain the classloader
- */
- public ClassLoader getServiceClassLoader() throws Exception;
-
+
}
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-17 11:14:48 UTC (rev 181)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/Messages.properties 2008-07-17 13:25:20 UTC (rev 182)
@@ -18,5 +18,4 @@
_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
_NOT_SPECIFIED_SESSION_CLASS=First conversation action must specify a valid session class
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-17 11:14:48 UTC (rev 181)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/AbstractESBAction.java 2008-07-17 13:25:20 UTC (rev 182)
@@ -30,14 +30,16 @@
public abstract class AbstractESBAction extends ModelObject
implements ESBAction {
+ public static final String SERVICE_DESCRIPTION_NAME = "serviceDescriptionName";
+ public static final String IDENTITIES = "identities";
+ public static final String SESSION = "session";
private static final String ACTION_ELEMENT = "action";
- //private static final String SERVICE_ELEMENT = "service";
private static final String VALUE_ATTR = "value";
private static final String NAME_ATTR = "name";
private static final String PROPERTY_ELEMENT = "property";
private static final String CLASS_PROPERTY = "class";
- protected static final String BUSINESS_OBJECT_TYPE_PROPERTY = "session";
+ protected static final String BUSINESS_OBJECT_TYPE_PROPERTY = SESSION;
/**
* The default constructor.
@@ -117,24 +119,40 @@
*/
public void validate(ModelListener l) {
- String[] mandatory=getMandatoryProperties();
+ java.util.List<String> mandatory=getMandatoryProperties();
- for (int i=0; i < mandatory.length; i++) {
- if (getPropertyValue(mandatory[i]) == null) {
+ for (int i=0; i < mandatory.size(); i++) {
+ if (getPropertyValue(mandatory.get(i)) == null) {
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"),
"_NOT_SPECIFIED_PROPERTY",
- new String[]{mandatory[i]}), null);
+ new String[]{mandatory.get(i)}), null);
}
}
+ java.util.List<String> propNames=getPropertyNames();
+
+ for (int i=0; i < propNames.size(); i++) {
+ String propName=propNames.get(i);
+
+ if (getOptionalProperties().contains(propName) == false &&
+ getMandatoryProperties().contains(propName) == false) {
+ l.error(this, org.scribble.util.MessageUtil.format(
+ java.util.PropertyResourceBundle.getBundle(
+ "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
+ "_UNKNOWN_PROPERTY",
+ new String[]{propName}), null);
+ }
+ }
+
String session=getPropertyValue(BUSINESS_OBJECT_TYPE_PROPERTY);
if (session != null) {
// Validate that the business object type exists
try {
- ClassLoader cl=getService().getServiceClassLoader();
+ ClassLoader cl=
+ org.jboss.tools.overlord.jbossesb.model.util.ClasspathUtil.getClassLoader(getService().getModel());
try {
Class.forName(session, true, cl);
@@ -226,11 +244,25 @@
*
* @return The mandatory property names
*/
- protected String[] getMandatoryProperties() {
- return(new String[0]);
+ protected java.util.List<String> getMandatoryProperties() {
+ java.util.List<String> ret=new java.util.Vector<String>();
+ return(ret);
}
/**
+ * This method returns the optional property names.
+ *
+ * @return The optional property names
+ */
+ protected java.util.List<String> getOptionalProperties() {
+ java.util.List<String> ret=new java.util.Vector<String>();
+ ret.add(SESSION);
+ ret.add(IDENTITIES);
+ ret.add(SERVICE_DESCRIPTION_NAME);
+ return(ret);
+ }
+
+ /**
* This method returns the action's class name.
*
* @return The action's class name
@@ -272,6 +304,29 @@
}
/**
+ * This method returns the list of property names defined for
+ * this action.
+ *
+ * @return The list of property names
+ */
+ public java.util.List<String> getPropertyNames() {
+ java.util.List<String> ret=new java.util.Vector<String>();
+
+ if (m_action != null) {
+ org.w3c.dom.NodeList nl=m_action.getChildNodes();
+
+ for (int i=0; i < nl.getLength(); i++) {
+ if (nl.item(i) instanceof org.w3c.dom.Element &&
+ nl.item(i).getNodeName().equals(PROPERTY_ELEMENT)) {
+ ret.add(((org.w3c.dom.Element)nl.item(i)).getAttribute(NAME_ATTR));
+ }
+ }
+ }
+
+ return(ret);
+ }
+
+ /**
* This method returns the 'property' child nodes, associated with the
* supplied property name, within the action configuration.
*
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-17 11:14:48 UTC (rev 181)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/CreateSessionAction.java 2008-07-17 13:25:20 UTC (rev 182)
@@ -29,6 +29,9 @@
*/
public class CreateSessionAction extends AbstractESBAction {
+ public static final String ROOT = "root";
+ public static final String CONVERSATION_TYPE = "conversationType";
+
/**
* The constructor for the action.
*
@@ -52,6 +55,19 @@
}
/**
+ * 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);
+ ret.add(ROOT);
+ return(ret);
+ }
+
+ /**
* This method validates the ESB action and reports warnings or
* errors to the supplied model listener.
*
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/IfAction.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/IfAction.java 2008-07-17 11:14:48 UTC (rev 181)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/IfAction.java 2008-07-17 13:25:20 UTC (rev 182)
@@ -91,8 +91,10 @@
* @return The mandatory property names
*/
@Override
- protected String[] getMandatoryProperties() {
- return(new String[]{PATHS});
+ protected java.util.List<String> getMandatoryProperties() {
+ java.util.List<String> ret=super.getMandatoryProperties();
+ ret.add(PATHS);
+ return(ret);
}
/**
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/MessageRouterAction.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/MessageRouterAction.java 2008-07-17 11:14:48 UTC (rev 181)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/MessageRouterAction.java 2008-07-17 13:25:20 UTC (rev 182)
@@ -110,8 +110,10 @@
* @return The mandatory property names
*/
@Override
- protected String[] getMandatoryProperties() {
- return(new String[]{PATHS});
+ protected java.util.List<String> getMandatoryProperties() {
+ java.util.List<String> ret=super.getMandatoryProperties();
+ ret.add(PATHS);
+ return(ret);
}
/**
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-17 11:14:48 UTC (rev 181)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/Messages.properties 2008-07-17 13:25:20 UTC (rev 182)
@@ -29,6 +29,7 @@
_NOT_FOUND_PERFORM_CREATE_SESSION=Perform action can only invoke a service descriptor that starts with a CreateSessionAction
_NOT_SPECIFIED_CONVERSATION_TYPE=Conversation type must be specified on root service descriptor
_NOT_SPECIFIED_CONVERSATION_TYPE_ROLE=Conversation type '{0}' must specify a role name following the '@' symbol
+_NOT_SPECIFIED_PROPERTY=Property '{0}' must be specified
_NOT_SPECIFIED_REQ_RESP_EPR=Send does not contain request service category/name or response client EPR
_MUST_BE_FIRST_ACTION='{0}' action must be first in the service descriptor
_MUST_SPECIFY_STATE_OR_MESSAGE_EXPRESSION=Must specify either a State OR Message based expression
@@ -37,6 +38,7 @@
_PATH_SERVICE_DETAILS_MISSING=One or more paths are missing the service cateogry and/or name
_ROUTER_ONE_OR_MORE_PATHS=MessageRouter action must specify one or more routes
_SWITCH_ONE_OR_MORE_PATHS=Switch action must specify atleast one case
+_UNKNOWN_PROPERTY=Property '{0}' is unknown for this action
_WHEN_ONE_OR_MORE_PATHS=When action must specify atleast one entry
_WHEN_PATH_AFTER_JOIN=When path must not be defined after a join
_WHILE_PATH_AFTER_EXIT=While path must not be defined after an exit
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-17 11:14:48 UTC (rev 181)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/ParallelAction.java 2008-07-17 13:25:20 UTC (rev 182)
@@ -106,8 +106,10 @@
* @return The mandatory property names
*/
@Override
- protected String[] getMandatoryProperties() {
- return(new String[]{PATHS});
+ protected java.util.List<String> getMandatoryProperties() {
+ java.util.List<String> ret=super.getMandatoryProperties();
+ ret.add(PATHS);
+ return(ret);
}
/**
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/PerformAction.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/PerformAction.java 2008-07-17 11:14:48 UTC (rev 181)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/PerformAction.java 2008-07-17 13:25:20 UTC (rev 182)
@@ -28,10 +28,11 @@
*/
public class PerformAction extends AbstractESBAction {
- private static final String SERVICE_NAME = "serviceName";
- private static final String SERVICE_CATEGORY = "serviceCategory";
- private static final String JOIN_SERVICE_NAME = "joinServiceName";
- private static final String JOIN_SERVICE_CATEGORY = "joinServiceCategory";
+ public static final String SERVICE_NAME = "serviceName";
+ public static final String SERVICE_CATEGORY = "serviceCategory";
+ public static final String RETURN_SERVICE_NAME = "returnServiceName";
+ public static final String RETURN_SERVICE_CATEGORY = "returnServiceCategory";
+ public static final String BIND_DETAILS = "bindDetails";
/**
* The constructor for the action.
@@ -62,8 +63,8 @@
getLinks().add(new ESBLink(m_category, m_name, m_service, true));
}
- m_joinCategory=getPropertyValue(JOIN_SERVICE_CATEGORY);
- m_joinName=getPropertyValue(JOIN_SERVICE_NAME);
+ m_joinCategory=getPropertyValue(RETURN_SERVICE_CATEGORY);
+ m_joinName=getPropertyValue(RETURN_SERVICE_NAME);
if (m_joinCategory != null && m_joinName != null) {
m_joinService=getService().getModel().getService(m_joinCategory, m_joinName);
@@ -89,11 +90,28 @@
* @return The mandatory property names
*/
@Override
- protected String[] getMandatoryProperties() {
- return(new String[]{SERVICE_CATEGORY, SERVICE_NAME});
+ protected java.util.List<String> getMandatoryProperties() {
+ java.util.List<String> ret=super.getMandatoryProperties();
+ ret.add(SERVICE_CATEGORY);
+ ret.add(SERVICE_NAME);
+ return(ret);
}
/**
+ * 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(RETURN_SERVICE_NAME);
+ ret.add(RETURN_SERVICE_CATEGORY);
+ ret.add(BIND_DETAILS);
+ return(ret);
+ }
+
+ /**
* This method validates the ESB action and reports warnings or
* errors to the supplied model listener.
*
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/ReceiveMessageAction.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/ReceiveMessageAction.java 2008-07-17 11:14:48 UTC (rev 181)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/ReceiveMessageAction.java 2008-07-17 13:25:20 UTC (rev 182)
@@ -31,6 +31,7 @@
private static final String IDENTITIES = "identities";
private static final String MESSAGE_TYPE = "messageType";
private static final String OPERATION = "operation";
+ private static final String CLIENT_EPR = "clientEPR";
/**
* The constructor for the action.
@@ -50,11 +51,27 @@
* @return The mandatory property names
*/
@Override
- protected String[] getMandatoryProperties() {
- return(new String[]{MESSAGE_TYPE,IDENTITIES});
+ protected java.util.List<String> getMandatoryProperties() {
+ java.util.List<String> ret=super.getMandatoryProperties();
+ ret.add(MESSAGE_TYPE);
+ ret.add(IDENTITIES);
+ return(ret);
}
/**
+ * 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(OPERATION);
+ ret.add(CLIENT_EPR);
+ return(ret);
+ }
+
+ /**
* This method converts the ESB action into an equivalent
* behavioural description for conformance checking.
*
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/RetrieveSessionAction.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/RetrieveSessionAction.java 2008-07-17 11:14:48 UTC (rev 181)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/RetrieveSessionAction.java 2008-07-17 13:25:20 UTC (rev 182)
@@ -27,7 +27,7 @@
*/
public class RetrieveSessionAction extends AbstractESBAction {
- private static final String IDENTITIES = "identities";
+ public static final String IDENTITIES = "identities";
/**
* The constructor for the action.
@@ -47,8 +47,10 @@
* @return The mandatory property names
*/
@Override
- protected String[] getMandatoryProperties() {
- return(new String[]{IDENTITIES});
+ protected java.util.List<String> getMandatoryProperties() {
+ java.util.List<String> ret=super.getMandatoryProperties();
+ ret.add(IDENTITIES);
+ return(ret);
}
/**
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/ScheduleStateAction.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/ScheduleStateAction.java 2008-07-17 11:14:48 UTC (rev 181)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/ScheduleStateAction.java 2008-07-17 13:25:20 UTC (rev 182)
@@ -68,11 +68,26 @@
* @return The mandatory property names
*/
@Override
- protected String[] getMandatoryProperties() {
- return(new String[]{SERVICE_CATEGORY, SERVICE_NAME});
+ protected java.util.List<String> getMandatoryProperties() {
+ java.util.List<String> ret=super.getMandatoryProperties();
+ ret.add(SERVICE_CATEGORY);
+ ret.add(SERVICE_NAME);
+ return(ret);
}
/**
+ * 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(IMMEDIATE);
+ return(ret);
+ }
+
+ /**
* This method validates the ESB action and reports warnings or
* errors to the supplied model listener.
*
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-17 11:14:48 UTC (rev 181)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/SendMessageAction.java 2008-07-17 13:25:20 UTC (rev 182)
@@ -87,11 +87,33 @@
* @return The mandatory property names
*/
@Override
- protected String[] getMandatoryProperties() {
- return(new String[]{MESSAGE_TYPE, IDENTITIES});
+ protected java.util.List<String> getMandatoryProperties() {
+ java.util.List<String> ret=super.getMandatoryProperties();
+ ret.add(MESSAGE_TYPE);
+ ret.add(IDENTITIES);
+ return(ret);
}
/**
+ * 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(OPERATION);
+ ret.add(CLIENT_EPR);
+ ret.add(RESPONSE_SERVICE_NAME);
+ ret.add(RESPONSE_SERVICE_CATEGORY);
+ ret.add(SERVICE_NAME);
+ ret.add(SERVICE_CATEGORY);
+ ret.add(SERVICE_NAME_EXPRESSION);
+ ret.add(SERVICE_CATEGORY_EXPRESSION);
+ return(ret);
+ }
+
+ /**
* This method validates the ESB action and reports warnings or
* errors to the supplied model listener.
*
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-17 11:14:48 UTC (rev 181)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/SetMessageAction.java 2008-07-17 13:25:20 UTC (rev 182)
@@ -28,6 +28,7 @@
public class SetMessageAction extends AbstractESBAction {
public static final String STATE_EXPRESSION = "stateExpression";
+ public static final String HEADER_PROPERTY = "headerProperty";
/**
* The constructor for the action.
@@ -47,11 +48,25 @@
* @return The mandatory property names
*/
@Override
- protected String[] getMandatoryProperties() {
- return(new String[]{STATE_EXPRESSION});
+ protected java.util.List<String> getMandatoryProperties() {
+ java.util.List<String> ret=super.getMandatoryProperties();
+ ret.add(STATE_EXPRESSION);
+ return(ret);
}
/**
+ * 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(HEADER_PROPERTY);
+ return(ret);
+ }
+
+ /**
* This method validates the ESB action and reports warnings or
* errors to the supplied model listener.
*
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/SetStateAction.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/SetStateAction.java 2008-07-17 11:14:48 UTC (rev 181)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/SetStateAction.java 2008-07-17 13:25:20 UTC (rev 182)
@@ -51,11 +51,26 @@
* @return The mandatory property names
*/
@Override
- protected String[] getMandatoryProperties() {
- return(new String[]{VARIABLE});
+ protected java.util.List<String> getMandatoryProperties() {
+ java.util.List<String> ret=super.getMandatoryProperties();
+ ret.add(VARIABLE);
+ return(ret);
}
/**
+ * 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(STATE_EXPRESSION);
+ ret.add(MESSAGE_EXPRESSION);
+ return(ret);
+ }
+
+ /**
* This method validates the ESB action and reports warnings or
* errors to the supplied model listener.
*
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/SwitchAction.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/SwitchAction.java 2008-07-17 11:14:48 UTC (rev 181)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/SwitchAction.java 2008-07-17 13:25:20 UTC (rev 182)
@@ -83,8 +83,10 @@
* @return The mandatory property names
*/
@Override
- protected String[] getMandatoryProperties() {
- return(new String[]{PATHS});
+ protected java.util.List<String> getMandatoryProperties() {
+ java.util.List<String> ret=super.getMandatoryProperties();
+ ret.add(PATHS);
+ return(ret);
}
/**
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/WhenAction.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/WhenAction.java 2008-07-17 11:14:48 UTC (rev 181)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/WhenAction.java 2008-07-17 13:25:20 UTC (rev 182)
@@ -103,8 +103,10 @@
* @return The mandatory property names
*/
@Override
- protected String[] getMandatoryProperties() {
- return(new String[]{PATHS});
+ protected java.util.List<String> getMandatoryProperties() {
+ java.util.List<String> ret=super.getMandatoryProperties();
+ ret.add(PATHS);
+ return(ret);
}
/**
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/WhileAction.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/WhileAction.java 2008-07-17 11:14:48 UTC (rev 181)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/WhileAction.java 2008-07-17 13:25:20 UTC (rev 182)
@@ -115,8 +115,10 @@
* @return The mandatory property names
*/
@Override
- protected String[] getMandatoryProperties() {
- return(new String[]{PATHS});
+ protected java.util.List<String> getMandatoryProperties() {
+ java.util.List<String> ret=super.getMandatoryProperties();
+ ret.add(PATHS);
+ return(ret);
}
/**
Added: cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/util/ClasspathUtil.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/util/ClasspathUtil.java (rev 0)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/util/ClasspathUtil.java 2008-07-17 13:25:20 UTC (rev 182)
@@ -0,0 +1,109 @@
+/*
+ * 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.
+ */
+package org.jboss.tools.overlord.jbossesb.model.util;
+
+import org.scribble.model.*;
+import org.scribble.osgi.model.OSGIModelRepository;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.jdt.core.IClasspathEntry;
+import org.eclipse.jdt.core.IJavaProject;
+import org.eclipse.jdt.core.JavaCore;
+import org.jboss.tools.overlord.jbossesb.model.*;
+
+public class ClasspathUtil {
+
+ public static ClassLoader getClassLoader(ESBLanguageModel model)
+ throws Exception {
+ ClassLoader ret=null;
+
+ if (model instanceof DefaultESBLanguageModel) {
+ ret = ((DefaultESBLanguageModel)model).getModelClassLoader();
+ } else {
+ ret = createClassLoader(model.getModelReference());
+ }
+
+ return(ret);
+ }
+
+ public synchronized static ClassLoader createClassLoader(ModelReference ref)
+ throws Exception {
+ ClassLoader ret=null;
+
+ IFile file=OSGIModelRepository.getFile(ref);
+
+ if (file != null) {
+ IJavaProject javaProject=JavaCore.create(file.getProject());
+ java.util.List<java.net.URL> urls=new java.util.Vector<java.net.URL>();
+
+ scanProjectForClasspath(javaProject, urls);
+
+ java.net.URL[] urlarray=new java.net.URL[urls.size()];
+ urls.toArray(urlarray);
+
+ ret = new java.net.URLClassLoader(urlarray,
+ String.class.getClassLoader());
+ }
+
+ return(ret);
+ }
+
+ protected static void scanProjectForClasspath(IJavaProject javaProject,
+ java.util.List<java.net.URL> urls) throws Exception {
+ IClasspathEntry[] entries = javaProject.getResolvedClasspath(true);
+
+ IResource outres=ResourcesPlugin.getWorkspace().getRoot().findMember(javaProject.getOutputLocation());
+ if (outres != null) {
+ urls.add(new java.io.File(outres.getLocation().toPortableString()).toURL());
+ }
+
+ for (IClasspathEntry entry : entries) {
+ if(entry.getEntryKind() == IClasspathEntry.CPE_PROJECT) {
+ IResource project =
+ ResourcesPlugin.getWorkspace().getRoot().findMember(entry.getPath());
+
+ if (project instanceof IProject) {
+ IJavaProject jproj=JavaCore.create((IProject)project);
+
+ if (jproj != null) {
+ scanProjectForClasspath(jproj, urls);
+ }
+ }
+
+ } else {
+
+ IResource res=ResourcesPlugin.getWorkspace().getRoot().findMember(entry.getPath());
+
+ java.net.URL url=null;
+
+ if (res != null) {
+ url = new java.io.File(res.getLocation().
+ toPortableString()).toURL();
+ } else {
+ url = entry.getPath().toFile().toURL();
+ }
+
+ if (url != null && urls.contains(url) == false) {
+ urls.add(url);
+ }
+ }
+ }
+ }
+}
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/IfActionTest.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/IfActionTest.java 2008-07-17 11:14:48 UTC (rev 181)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/IfActionTest.java 2008-07-17 13:25:20 UTC (rev 182)
@@ -40,7 +40,7 @@
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.Messages"),
+ "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
"_NOT_SPECIFIED_PROPERTY",
new String[]{"paths"}));
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/MessageRouterActionTest.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/MessageRouterActionTest.java 2008-07-17 11:14:48 UTC (rev 181)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/MessageRouterActionTest.java 2008-07-17 13:25:20 UTC (rev 182)
@@ -38,7 +38,7 @@
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.Messages"),
+ "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
"_NOT_SPECIFIED_PROPERTY",
new String[]{"paths"}));
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/ParallelActionTest.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/ParallelActionTest.java 2008-07-17 11:14:48 UTC (rev 181)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/ParallelActionTest.java 2008-07-17 13:25:20 UTC (rev 182)
@@ -40,7 +40,7 @@
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.Messages"),
+ "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
"_NOT_SPECIFIED_PROPERTY",
new String[]{"paths"}));
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/PerformActionTest.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/PerformActionTest.java 2008-07-17 11:14:48 UTC (rev 181)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/PerformActionTest.java 2008-07-17 13:25:20 UTC (rev 182)
@@ -30,7 +30,7 @@
service.setRoot(true);
java.util.Map<String,String> props=new java.util.Hashtable<String,String>();
- props.put("serviceName", "");
+ props.put(PerformAction.SERVICE_NAME, "");
org.w3c.dom.Element elem=ESBActionTestUtil.getAction(null, props, null);
@@ -42,7 +42,7 @@
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.Messages"),
+ "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
"_NOT_SPECIFIED_PROPERTY",
new String[]{"serviceCategory"}));
@@ -58,7 +58,7 @@
service.setRoot(true);
java.util.Map<String,String> props=new java.util.Hashtable<String,String>();
- props.put("serviceCategory", "");
+ props.put(PerformAction.SERVICE_CATEGORY, "");
org.w3c.dom.Element elem=ESBActionTestUtil.getAction(null, props, null);
@@ -70,7 +70,7 @@
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.Messages"),
+ "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
"_NOT_SPECIFIED_PROPERTY",
new String[]{"serviceName"}));
@@ -86,8 +86,8 @@
service.setRoot(true);
java.util.Map<String,String> props=new java.util.Hashtable<String,String>();
- props.put("serviceCategory", "cat1");
- props.put("serviceName", "name1");
+ props.put(PerformAction.SERVICE_CATEGORY, "cat1");
+ props.put(PerformAction.SERVICE_NAME, "name1");
org.w3c.dom.Element elem=ESBActionTestUtil.getAction(null, props, null);
@@ -116,15 +116,15 @@
}
}
- public void testValidateJoinService() {
+ public void testValidateReturnService() {
TestESBService service=new TestESBService();
service.setRoot(true);
java.util.Map<String,String> props=new java.util.Hashtable<String,String>();
- props.put("serviceCategory", "cat1");
- props.put("serviceName", "name1");
- props.put("joinServiceCategory", "cat2");
- props.put("joinServiceName", "name2");
+ props.put(PerformAction.SERVICE_CATEGORY, "cat1");
+ props.put(PerformAction.SERVICE_NAME, "name1");
+ props.put(PerformAction.RETURN_SERVICE_CATEGORY, "cat2");
+ props.put(PerformAction.RETURN_SERVICE_NAME, "name2");
org.w3c.dom.Element elem=ESBActionTestUtil.getAction(null, props, null);
@@ -164,10 +164,10 @@
service.setRoot(true);
java.util.Map<String,String> props=new java.util.Hashtable<String,String>();
- props.put("serviceCategory", "cat1");
- props.put("serviceName", "name1");
- props.put("joinServiceCategory", "cat2");
- props.put("joinServiceName", "name2");
+ props.put(PerformAction.SERVICE_CATEGORY, "cat1");
+ props.put(PerformAction.SERVICE_NAME, "name1");
+ props.put(PerformAction.RETURN_SERVICE_CATEGORY, "cat2");
+ props.put(PerformAction.RETURN_SERVICE_NAME, "name2");
org.w3c.dom.Element elem=ESBActionTestUtil.getAction(null, props, null);
@@ -211,10 +211,10 @@
TestESBService service=new TestESBService();
java.util.Map<String,String> props=new java.util.Hashtable<String,String>();
- props.put("serviceCategory", "cat1");
- props.put("serviceName", "name1");
- props.put("joinServiceCategory", "cat2");
- props.put("joinServiceName", "name2");
+ props.put(PerformAction.SERVICE_CATEGORY, "cat1");
+ props.put(PerformAction.SERVICE_NAME, "name1");
+ props.put(PerformAction.RETURN_SERVICE_CATEGORY, "cat2");
+ props.put(PerformAction.RETURN_SERVICE_NAME, "name2");
org.w3c.dom.Element elem=ESBActionTestUtil.getAction(null, props, null);
@@ -281,10 +281,10 @@
TestESBService service=new TestESBService();
java.util.Map<String,String> props=new java.util.Hashtable<String,String>();
- props.put("serviceCategory", "cat1");
- props.put("serviceName", "name1");
- props.put("joinServiceCategory", "cat2");
- props.put("joinServiceName", "name2");
+ props.put(PerformAction.SERVICE_CATEGORY, "cat1");
+ props.put(PerformAction.SERVICE_NAME, "name1");
+ props.put(PerformAction.RETURN_SERVICE_CATEGORY, "cat2");
+ props.put(PerformAction.RETURN_SERVICE_NAME, "name2");
org.w3c.dom.Element elem=ESBActionTestUtil.getAction(null, props, null);
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/ReceiveMessageActionTest.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/ReceiveMessageActionTest.java 2008-07-17 11:14:48 UTC (rev 181)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/ReceiveMessageActionTest.java 2008-07-17 13:25:20 UTC (rev 182)
@@ -41,7 +41,7 @@
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.Messages"),
+ "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
"_NOT_SPECIFIED_PROPERTY",
new String[]{"messageType"}));
@@ -69,7 +69,7 @@
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.Messages"),
+ "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
"_NOT_SPECIFIED_PROPERTY",
new String[]{"identities"}));
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/RetrieveSessionActionTest.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/RetrieveSessionActionTest.java 2008-07-17 11:14:48 UTC (rev 181)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/RetrieveSessionActionTest.java 2008-07-17 13:25:20 UTC (rev 182)
@@ -92,7 +92,7 @@
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.Messages"),
+ "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
"_NOT_SPECIFIED_PROPERTY",
new String[]{"identities"}));
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/ScheduleStateActionTest.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/ScheduleStateActionTest.java 2008-07-17 11:14:48 UTC (rev 181)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/ScheduleStateActionTest.java 2008-07-17 13:25:20 UTC (rev 182)
@@ -41,7 +41,7 @@
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.Messages"),
+ "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
"_NOT_SPECIFIED_PROPERTY",
new String[]{"serviceCategory"}));
@@ -69,7 +69,7 @@
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.Messages"),
+ "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
"_NOT_SPECIFIED_PROPERTY",
new String[]{"serviceName"}));
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/SendMessageActionTest.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/SendMessageActionTest.java 2008-07-17 11:14:48 UTC (rev 181)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/SendMessageActionTest.java 2008-07-17 13:25:20 UTC (rev 182)
@@ -46,7 +46,7 @@
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.Messages"),
+ "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
"_NOT_SPECIFIED_PROPERTY",
new String[]{"messageType"}));
@@ -75,7 +75,7 @@
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.Messages"),
+ "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
"_NOT_SPECIFIED_PROPERTY",
new String[]{"identities"}));
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-17 11:14:48 UTC (rev 181)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/SetMessageActionTest.java 2008-07-17 13:25:20 UTC (rev 182)
@@ -39,7 +39,7 @@
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.Messages"),
+ "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
"_NOT_SPECIFIED_PROPERTY",
new String[]{SetMessageAction.STATE_EXPRESSION}));
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/SetStateActionTest.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/SetStateActionTest.java 2008-07-17 11:14:48 UTC (rev 181)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/SetStateActionTest.java 2008-07-17 13:25:20 UTC (rev 182)
@@ -40,7 +40,7 @@
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.Messages"),
+ "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
"_NOT_SPECIFIED_PROPERTY",
new String[]{SetStateAction.VARIABLE}));
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/SwitchActionTest.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/SwitchActionTest.java 2008-07-17 11:14:48 UTC (rev 181)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/SwitchActionTest.java 2008-07-17 13:25:20 UTC (rev 182)
@@ -40,7 +40,7 @@
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.Messages"),
+ "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
"_NOT_SPECIFIED_PROPERTY",
new String[]{"paths"}));
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/WhenActionTest.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/WhenActionTest.java 2008-07-17 11:14:48 UTC (rev 181)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/WhenActionTest.java 2008-07-17 13:25:20 UTC (rev 182)
@@ -40,7 +40,7 @@
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.Messages"),
+ "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
"_NOT_SPECIFIED_PROPERTY",
new String[]{"paths"}));
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/WhileActionTest.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/WhileActionTest.java 2008-07-17 11:14:48 UTC (rev 181)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.jbossesb/src/test/org/jboss/tools/overlord/jbossesb/model/actions/WhileActionTest.java 2008-07-17 13:25:20 UTC (rev 182)
@@ -40,7 +40,7 @@
l.addExpectedError(org.scribble.util.MessageUtil.format(
java.util.PropertyResourceBundle.getBundle(
- "org.jboss.tools.overlord.jbossesb.model.Messages"),
+ "org.jboss.tools.overlord.jbossesb.model.actions.Messages"),
"_NOT_SPECIFIED_PROPERTY",
new String[]{"paths"}));
More information about the overlord-commits
mailing list