JBoss JBPM SVN: r4855 - in jbpm4/trunk/modules: jpdl/src/main/java/org/jbpm/jpdl/internal/repository and 6 other directories.
by do-not-reply＠jboss.org
Author: tom.baeyens(a)jboss.com
Date: 2009-05-20 05:22:00 -0400 (Wed, 20 May 2009)
New Revision: 4855
Modified:
jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/DecisionBinding.java
jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/EsbBinding.java
jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JpdlBinding.java
jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/MailBinding.java
jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/ScriptBinding.java
jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/StartBinding.java
jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/SubProcessBinding.java
jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/repository/JpdlDeployer.java
jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/xml/BindingsParser.java
jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/xml/JpdlParser.java
jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/xml/UnresolvedTransition.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/LifeCycleParser.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/XmlUtil.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/AbstractCollectionBinding.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/BasicTypeBinding.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/BusinessCalendarBinding.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/ByteBinding.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/CharBinding.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/ClassBinding.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/DoubleBinding.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/FieldBinding.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/FloatBinding.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/HibernateConfigurationBinding.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/IntBinding.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/InvokeBinding.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/JndiBinding.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/LongBinding.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/MailSessionBinding.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/MapBinding.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/MessageSessionBinding.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/ObjectBinding.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/PropertiesBinding.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/PropertyBinding.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/RefBinding.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/RetryInterceptorBinding.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/ScriptManagerBinding.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/ShortBinding.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/TransactionBinding.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/TypesBinding.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/xml/BindingParser.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/Parse.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/Parser.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/ProblemList.java
Log:
undoing r4838, wrong way of adding the elements to the problems
Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/DecisionBinding.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/DecisionBinding.java 2009-05-20 09:10:17 UTC (rev 4854)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/DecisionBinding.java 2009-05-20 09:22:00 UTC (rev 4855)
@@ -106,8 +106,7 @@
if (hasConditions) {
return new DecisionConditionActivity();
} else {
- String message = "decision '"+element.getAttribute("name")+"' must have one of: expr attribute, handler attribute, handler element or condition expressions";
- parse.addProblem(message,null, "error", element);
+ parse.addProblem("decision '"+element.getAttribute("name")+"' must have one of: expr attribute, handler attribute, handler element or condition expressions");
}
return null;
Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/EsbBinding.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/EsbBinding.java 2009-05-20 09:10:17 UTC (rev 4854)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/EsbBinding.java 2009-05-20 09:22:00 UTC (rev 4855)
@@ -81,8 +81,7 @@
||
( (expression!=null) && (descriptorElement!=null) )
) {
- String message = "in <"+TAG+"...> an expr or exactly one child element is expected";
- parse.addProblem(message, null, "error", partElement);
+ parse.addProblem("in <"+TAG+"...> an expr or exactly one child element is expected");
}
if (expression!=null) {
Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JpdlBinding.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JpdlBinding.java 2009-05-20 09:10:17 UTC (rev 4854)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JpdlBinding.java 2009-05-20 09:22:00 UTC (rev 4855)
@@ -22,8 +22,14 @@
package org.jbpm.jpdl.internal.activity;
+import java.util.List;
+
+import org.jbpm.api.model.Event;
import org.jbpm.jpdl.internal.xml.JpdlParser;
+import org.jbpm.jpdl.internal.xml.UnresolvedTransitions;
import org.jbpm.pvm.internal.model.ActivityImpl;
+import org.jbpm.pvm.internal.model.TimerDefinitionImpl;
+import org.jbpm.pvm.internal.model.TransitionImpl;
import org.jbpm.pvm.internal.util.TagBinding;
import org.jbpm.pvm.internal.util.XmlUtil;
import org.jbpm.pvm.internal.wire.xml.WireParser;
@@ -48,11 +54,9 @@
if (name!=null) {
// basic name validation
if ("".equals(name)) {
- String message = XmlUtil.errorMessageAttribute(element, "name", name, "is empty");
- parse.addProblem(message, null, "error", element);
+ parse.addProblem(XmlUtil.errorMessageAttribute(element, "name", name, "is empty"));
} else if (name.indexOf('/')!=-1) {
- String message = XmlUtil.errorMessageAttribute(element, "name", name, "contains slash (/)");
- parse.addProblem(message, null, "error", element);
+ parse.addProblem(XmlUtil.errorMessageAttribute(element, "name", name, "contains slash (/)"));
}
activity.setName(name);
}
@@ -61,4 +65,29 @@
public boolean isNameRequired() {
return true;
}
+
+ public void parseTransitions(Element element, ActivityImpl activity, Parse parse, JpdlParser jpdlParser) {
+ List<Element> transitionElements = XmlUtil.elements(element, "transition");
+ UnresolvedTransitions unresolvedTransitions = parse.findObject(UnresolvedTransitions.class);
+ for (Element transitionElement: transitionElements) {
+ String transitionName = XmlUtil.attribute(transitionElement, "name", false, parse);
+
+ Element timerElement = XmlUtil.element(transitionElement, "timer");
+ if (timerElement!=null) {
+ if (transitionName!=null) {
+ TimerDefinitionImpl timerDefinitionImpl = jpdlParser.parseTimerDefinition(timerElement, parse, activity);
+ timerDefinitionImpl.setSignalName(transitionName);
+ } else {
+ parse.addProblem("a transition name is required when a timer is placed on a transition");
+ }
+ }
+
+ TransitionImpl transition = activity.createOutgoingTransition();
+ transition.setName(transitionName);
+
+ unresolvedTransitions.add(transition, transitionElement);
+
+ jpdlParser.parseOnEvent(transitionElement, transition, Event.TAKE, parse);
+ }
+ }
}
Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/MailBinding.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/MailBinding.java 2009-05-20 09:10:17 UTC (rev 4854)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/MailBinding.java 2009-05-20 09:22:00 UTC (rev 4855)
@@ -74,7 +74,7 @@
MailTemplateRegistry templateRegistry = Environment.getFromCurrent(MailTemplateRegistry.class);
template = templateRegistry.getTemplate(templateName);
if (template == null) {
- parse.addProblem("mail template not found: " + templateName, null, "error", element);
+ parse.addProblem("mail template not found: " + templateName, element);
}
}
else {
Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/ScriptBinding.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/ScriptBinding.java 2009-05-20 09:10:17 UTC (rev 4854)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/ScriptBinding.java 2009-05-20 09:22:00 UTC (rev 4855)
@@ -49,8 +49,7 @@
ScriptManager scriptManager = Environment.getFromCurrent(ScriptManager.class);
language = scriptManager.getDefaultExpressionLanguage();
if (textElement!=null) {
- String message = "in <script ...> attribute expr can't be combined with a nexted text element";
- parse.addProblem(message, null, "error", element);
+ parse.addProblem("in <script ...> attribute expr can't be combined with a nexted text element");
}
} else {
language = XmlUtil.attribute(element, "lang");
Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/StartBinding.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/StartBinding.java 2009-05-20 09:10:17 UTC (rev 4854)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/StartBinding.java 2009-05-20 09:22:00 UTC (rev 4855)
@@ -45,7 +45,7 @@
processDefinition.setInitial(startActivity);
} else if (startActivity.getParentActivity()==null) {
- parse.addProblem("multiple start events not yet supported", null, "error", element);
+ parse.addProblem("multiple start events not yet supported");
}
return new StartActivity();
Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/SubProcessBinding.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/SubProcessBinding.java 2009-05-20 09:10:17 UTC (rev 4854)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/SubProcessBinding.java 2009-05-20 09:22:00 UTC (rev 4855)
@@ -75,7 +75,7 @@
if (outcomeValueElement!=null) {
String transitionName = XmlUtil.attribute(transitionElement, "name");
if (transitionName==null) {
- parse.addProblem("transitions with an outcome-value must have a name", null, "error", transitionElement);
+ parse.addProblem("transitions with an outcome-value must have a name", transitionElement);
}
Element valueElement = XmlUtil.element(outcomeValueElement);
if (valueElement!=null) {
@@ -83,7 +83,7 @@
Object value = WireContext.create(descriptor);
outcomeVariableMappings.put(value, transitionName);
} else {
- parse.addProblem("outcome-value must contain exactly one element", null, "error", outcomeValueElement);
+ parse.addProblem("outcome-value must contain exactly one element", outcomeValueElement);
}
}
}
Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/repository/JpdlDeployer.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/repository/JpdlDeployer.java 2009-05-20 09:10:17 UTC (rev 4854)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/repository/JpdlDeployer.java 2009-05-20 09:22:00 UTC (rev 4855)
@@ -106,8 +106,7 @@
for (ProcessDefinition existingProcess: existingProcesses) {
if (!processDefinitionKey.equals(existingProcess.getKey())) {
- String message = "invalid key '"+processDefinitionKey+"' in process "+processDefinition.getName()+". Existing process has name '"+processDefinitionName+"' and key '"+processDefinitionKey+"'";
- deployment.addProblem(message, null, "error", null);
+ deployment.addProblem("invalid key '"+processDefinitionKey+"' in process "+processDefinition.getName()+". Existing process has name '"+processDefinitionName+"' and key '"+processDefinitionKey+"'");
}
}
@@ -117,8 +116,7 @@
for (ProcessDefinition existingProcess: existingProcesses) {
if (!processDefinitionName.equals(existingProcess.getName())) {
- String message = "invalid name '"+processDefinitionName+"' in process "+processDefinition.getName()+". Existing process has name '"+processDefinitionName+"' and key '"+processDefinitionKey+"'";
- deployment.addProblem(message, null, "error", null);
+ deployment.addProblem("invalid name '"+processDefinitionName+"' in process "+processDefinition.getName()+". Existing process has name '"+processDefinitionName+"' and key '"+processDefinitionKey+"'");
}
}
}
@@ -136,7 +134,7 @@
.id(id)
.uniqueResult();
if (existingProcessDefinition != null) {
- deployment.addProblem("process '" + id + "' already exists", null, "error", null);
+ deployment.addProblem("process '" + id + "' already exists");
}
}
Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/xml/BindingsParser.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/xml/BindingsParser.java 2009-05-20 09:10:17 UTC (rev 4854)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/xml/BindingsParser.java 2009-05-20 09:22:00 UTC (rev 4855)
@@ -61,7 +61,7 @@
Class<?> bindingClass = ReflectUtil.loadClass(classLoader, bindingClassName);
return (Binding) bindingClass.newInstance();
} catch (Exception e) {
- parse.addProblem("couldn't instantiate activity binding "+bindingClassName, e, "error", bindingElement);
+ parse.addProblem("couldn't instantiate activity binding "+bindingClassName, e);
}
}
return null;
Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/xml/JpdlParser.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/xml/JpdlParser.java 2009-05-20 09:10:17 UTC (rev 4854)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/xml/JpdlParser.java 2009-05-20 09:22:00 UTC (rev 4855)
@@ -209,7 +209,7 @@
if (processDefinition.getInitial()==null) {
- parse.addProblem("no start activity in process", null, "error", documentElement);
+ parse.addProblem("no start activity in process");
}
return processDefinition;
@@ -265,7 +265,7 @@
if (coordinates != null) {
activity.setCoordinates(coordinates);
} else {
- parse.addProblem("invalid coordinates g=\"" + g + "\" in " + activity, null, "error", nestedElement);
+ parse.addProblem("invalid coordinates g=\"" + g + "\" in " + activity);
}
}
} finally {
@@ -297,10 +297,10 @@
Date duedatetimeDate = dateFormat.parse(duedatetime);
timerDefinition.setDueDate(duedatetimeDate);
} catch (ParseException e) {
- parse.addProblem("couldn't parse duedatetime "+duedatetime, e, "error", timerElement);
+ parse.addProblem("couldn't parse duedatetime "+duedatetime, e);
}
} else {
- parse.addProblem("either duedate or duedatetime is required in timer", null, "error", timerElement);
+ parse.addProblem("either duedate or duedatetime is required in timer");
}
String repeat = XmlUtil.attribute(timerElement, "repeat");
@@ -425,7 +425,7 @@
ProcessDefinitionImpl processDefinition = parse.findObject(ProcessDefinitionImpl.class);
if (processDefinition.getTaskDefinition(taskName)!=null) {
- parse.addProblem("duplicate task name "+taskName, null, "error",element);
+ parse.addProblem("duplicate task name "+taskName);
} else {
processDefinition.addTaskDefinitionImpl(taskDefinition);
}
@@ -437,7 +437,7 @@
if (swimlaneDefinition!=null) {
taskDefinition.setSwimlaneDefinition(swimlaneDefinition);
} else {
- parse.addProblem("swimlane "+swimlaneName+" not declared", null, "error", element);
+ parse.addProblem("swimlane "+swimlaneName+" not declared");
}
}
@@ -510,10 +510,10 @@
}
if (initRequired && sources==0) {
- parse.addProblem("no init specified", null, "error", inElement);
+ parse.addProblem("no init specified", inElement);
}
if (sources>1) {
- parse.addProblem("init attribute and init element are mutually exclusive on element variable", null, "error", inElement);
+ parse.addProblem("init attribute and init element are mutually exclusive on element variable", inElement);
}
variableDefinitions.add(variableDefinition);
Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/xml/UnresolvedTransition.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/xml/UnresolvedTransition.java 2009-05-20 09:10:17 UTC (rev 4854)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/xml/UnresolvedTransition.java 2009-05-20 09:22:00 UTC (rev 4855)
@@ -42,8 +42,7 @@
if (destination!=null) {
destination.addIncomingTransition(transition);
} else {
- String message = XmlUtil.errorMessageAttribute(transitionElement, "to", to, "doesn't reference an existing activity name");
- parse.addProblem(message, null, "error", transitionElement);
+ parse.addProblem(XmlUtil.errorMessageAttribute(transitionElement, "to", to, "doesn't reference an existing activity name"));
}
}
}
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/LifeCycleParser.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/LifeCycleParser.java 2009-05-20 09:10:17 UTC (rev 4854)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/LifeCycleParser.java 2009-05-20 09:22:00 UTC (rev 4855)
@@ -55,7 +55,7 @@
if (initial!=null) {
lifeCycleProcess.setInitial(initial);
} else {
- parse.addProblem("initial "+initialStateName+" doesn't exist", null, "error", element);
+ parse.addProblem("initial "+initialStateName+" doesn't exist");
}
}
@@ -64,7 +64,7 @@
public void parseTransitions(Element element, ProcessDefinitionImpl lifeCycleProcess, Parse parse) {
if (! element.hasAttribute("name")) {
- parse.addProblem("state doesn't have a name: "+XmlUtil.toString(element), null, "error", element);
+ parse.addProblem("state doesn't have a name: "+XmlUtil.toString(element));
return;
}
String stateName = element.getAttribute("name");
@@ -78,13 +78,12 @@
public void parseTransition(Element element, ActivityImpl state, Parse parse) {
if (! element.hasAttribute("name")) {
- parse.addProblem("transition doesn't have a name: "+XmlUtil.toString(element), null, "error", element);
+ parse.addProblem("transition doesn't have a name: "+XmlUtil.toString(element));
return;
}
String transitionName = element.getAttribute("name");
if (! element.hasAttribute("to")) {
- String message = "transition "+transitionName+" doesn't have a to attribute indicating the destination state: "+XmlUtil.toString(element);
- parse.addProblem(message, null, "error", element);
+ parse.addProblem("transition "+transitionName+" doesn't have a to attribute indicating the destination state: "+XmlUtil.toString(element));
return;
}
String destinationName = element.getAttribute("to");
@@ -94,13 +93,13 @@
transition.setDestination(destination);
transition.setName(transitionName);
} else {
- parse.addProblem("destination "+destinationName+" of "+transitionName+" is unknown", null, "error", element);
+ parse.addProblem("destination "+destinationName+" of "+transitionName+" is unknown");
}
}
public void parseState(Element element, ProcessDefinitionImpl lifeCycleProcess, Parse parse) {
if (! element.hasAttribute("name")) {
- parse.addProblem("state doesn't have an id: "+XmlUtil.toString(element), null, "error", element);
+ parse.addProblem("state doesn't have an id: "+XmlUtil.toString(element));
return;
}
String stateName = element.getAttribute("name");
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/XmlUtil.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/XmlUtil.java 2009-05-20 09:10:17 UTC (rev 4854)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/XmlUtil.java 2009-05-20 09:22:00 UTC (rev 4855)
@@ -128,7 +128,7 @@
}
if (required && (parse!=null)) {
- parse.addProblem("nested element <"+XmlUtil.getTagLocalName(element)+"><"+tagName+" ... />... is required", null, "error", element);
+ parse.addProblem("nested element <"+XmlUtil.getTagLocalName(element)+"><"+tagName+" ... />... is required");
}
return null;
}
@@ -323,13 +323,13 @@
if (element.hasAttribute(attributeName)) {
String value = element.getAttribute(attributeName);
if (required && "".equals(value)) {
- parse.addProblem("attribute <"+XmlUtil.getTagLocalName(element)+" "+attributeName+"=\"\" is empty", null, "error", element);
+ parse.addProblem("attribute <"+XmlUtil.getTagLocalName(element)+" "+attributeName+"=\"\" is empty");
}
return value;
}
if (required) {
- parse.addProblem("attribute <"+XmlUtil.getTagLocalName(element)+" "+attributeName+"=\"...\" is required", null, "error", element);
+ parse.addProblem("attribute <"+XmlUtil.getTagLocalName(element)+" "+attributeName+"=\"...\" is required");
}
return defaultValue;
@@ -344,7 +344,7 @@
try {
return Integer.parseInt(valueText);
} catch (NumberFormatException e) {
- parse.addProblem(errorMessageAttribute(element, attributeName, valueText, "value not parsable as integer"), null, "error", element);
+ parse.addProblem(errorMessageAttribute(element, attributeName, valueText, "value not parsable as integer"));
}
}
@@ -362,7 +362,7 @@
if (valueText!=null) {
Boolean value = parseBooleanValue(valueText);
if (value==null) {
- parse.addProblem(errorMessageAttribute(element, attributeName, valueText, "value not in {true, enabled, on, false, disabled, off}"), null, "error", element);
+ parse.addProblem(errorMessageAttribute(element, attributeName, valueText, "value not in {true, enabled, on, false, disabled, off}"));
}
return value;
}
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/AbstractCollectionBinding.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/AbstractCollectionBinding.java 2009-05-20 09:10:17 UTC (rev 4854)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/AbstractCollectionBinding.java 2009-05-20 09:22:00 UTC (rev 4855)
@@ -58,10 +58,10 @@
if (collectionInterface.isAssignableFrom(collectionClass)) {
return true;
} else {
- parse.addProblem("class "+ className+" is not a "+collectionInterface.getName(), null, "error", null);
+ parse.addProblem("class "+ className+" is not a "+collectionInterface.getName());
}
} catch (JbpmException e) {
- parse.addProblem("class "+className+" could not be found", null, "error", null);
+ parse.addProblem("class "+className+" could not be found");
}
return false;
}
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/BasicTypeBinding.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/BasicTypeBinding.java 2009-05-20 09:10:17 UTC (rev 4854)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/BasicTypeBinding.java 2009-05-20 09:22:00 UTC (rev 4855)
@@ -20,7 +20,7 @@
String value = element.getAttribute("value");
descriptor = createDescriptor(value, element, parse);
} else {
- parse.addProblem("attribute 'value' is required in element '"+XmlUtil.getTagLocalName(element)+"': "+XmlUtil.toString(element), null, "error", element);
+ parse.addProblem("attribute 'value' is required in element '"+XmlUtil.getTagLocalName(element)+"': "+XmlUtil.toString(element));
}
return descriptor;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/BusinessCalendarBinding.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/BusinessCalendarBinding.java 2009-05-20 09:10:17 UTC (rev 4854)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/BusinessCalendarBinding.java 2009-05-20 09:22:00 UTC (rev 4855)
@@ -142,14 +142,14 @@
dayParts.add(dayPart);
} catch(Exception e) {
- parse.addProblem(dayText+" has invalid hours part '"+part+"': "+e.getMessage(), null, "error", daysElement);
+ parse.addProblem(dayText+" has invalid hours part '"+part+"': "+e.getMessage());
}
dayPartIndex++;
}
} else {
- parse.addProblem(dayText+" must have attribute 'hours'", null, "error", daysElement);
+ parse.addProblem(dayText+" must have attribute 'hours'");
}
DayPart[] dayPartArray = new DayPart[dayParts.size()];
@@ -186,7 +186,7 @@
holiday.setToDay(toDate);
} else {
- parse.addProblem("attribute 'period' in element business-calendar is required", null, "error", holidayElement);
+ parse.addProblem("attribute 'period' in element business-calendar is required");
}
// now we are going to set the toDay to the end of the day, rather then the beginning.
@@ -198,7 +198,7 @@
holiday.setToDay(toDay);
} catch (Exception e) {
- parse.addProblem("couldn't parse holiday: "+XmlUtil.toString(holidayElement), null, "error", holidayElement);
+ parse.addProblem("couldn't parse holiday: "+XmlUtil.toString(holidayElement));
}
return holiday;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/ByteBinding.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/ByteBinding.java 2009-05-20 09:10:17 UTC (rev 4854)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/ByteBinding.java 2009-05-20 09:22:00 UTC (rev 4855)
@@ -48,7 +48,7 @@
return byteDescriptor;
} catch (NumberFormatException e) {
- parse.addProblem(createValueExceptionMessage("'"+value+"' cannot be parsed to a byte", element), null, "error", element);
+ parse.addProblem(createValueExceptionMessage("'"+value+"' cannot be parsed to a byte", element));
}
return null;
}
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/CharBinding.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/CharBinding.java 2009-05-20 09:10:17 UTC (rev 4854)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/CharBinding.java 2009-05-20 09:22:00 UTC (rev 4855)
@@ -42,7 +42,7 @@
protected AbstractDescriptor createDescriptor(String value, Element element, Parse parse) {
CharacterDescriptor characterDescriptor = new CharacterDescriptor();
if (value.length()!=1) {
- parse.addProblem(createValueExceptionMessage("length of value must be 1", element), null, "error", element);
+ parse.addProblem(createValueExceptionMessage("length of value must be 1", element));
return null;
}
char c = value.charAt(0);
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/ClassBinding.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/ClassBinding.java 2009-05-20 09:10:17 UTC (rev 4854)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/ClassBinding.java 2009-05-20 09:22:00 UTC (rev 4855)
@@ -26,7 +26,7 @@
classDescriptor = new ClassDescriptor();
classDescriptor.setClassName(className);
} else {
- parse.addProblem("class must have classname attribute: "+XmlUtil.toString(element), null, "error", element);
+ parse.addProblem("class must have classname attribute: "+XmlUtil.toString(element));
}
return classDescriptor;
}
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/DoubleBinding.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/DoubleBinding.java 2009-05-20 09:10:17 UTC (rev 4854)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/DoubleBinding.java 2009-05-20 09:22:00 UTC (rev 4855)
@@ -45,7 +45,7 @@
try {
doubleValue = new Double(value);
} catch (NumberFormatException e) {
- parse.addProblem(createValueExceptionMessage("'"+value+"' cannot be parsed to a double", element), null, "error", element);
+ parse.addProblem(createValueExceptionMessage("'"+value+"' cannot be parsed to a double", element));
return null;
}
doubleDescriptor.setValue(doubleValue);
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/FieldBinding.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/FieldBinding.java 2009-05-20 09:10:17 UTC (rev 4854)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/FieldBinding.java 2009-05-20 09:22:00 UTC (rev 4855)
@@ -47,7 +47,7 @@
if (element.hasAttribute("name")) {
fieldOperation.setFieldName(element.getAttribute("name"));
} else {
- parse.addProblem("field must have name : "+XmlUtil.toString(element), null, "error", element);
+ parse.addProblem("field must have name : "+XmlUtil.toString(element));
}
Element descriptorElement = XmlUtil.element(element);
if (descriptorElement!=null) {
@@ -55,10 +55,10 @@
if (descriptor!=null) {
fieldOperation.setDescriptor(descriptor);
} else {
- parse.addProblem("unknown descriptor element "+descriptorElement.getTagName()+" inside field operation: "+XmlUtil.toString(element), null, "error", element);
+ parse.addProblem("unknown descriptor element "+descriptorElement.getTagName()+" inside field operation: "+XmlUtil.toString(element));
}
} else {
- parse.addProblem("field must have 1 descriptor element out of "+parser.getBindings().getTagNames(WireParser.CATEGORY_DESCRIPTOR)+" as content: "+XmlUtil.toString(element), null, "error", element);
+ parse.addProblem("field must have 1 descriptor element out of "+parser.getBindings().getTagNames(WireParser.CATEGORY_DESCRIPTOR)+" as content: "+XmlUtil.toString(element));
}
return fieldOperation;
}
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/FloatBinding.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/FloatBinding.java 2009-05-20 09:10:17 UTC (rev 4854)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/FloatBinding.java 2009-05-20 09:22:00 UTC (rev 4855)
@@ -45,7 +45,7 @@
try {
floatValue = new Float(value);
} catch (NumberFormatException e) {
- parse.addProblem(createValueExceptionMessage("'"+value+"' cannot be parsed to a float", element), null, "error", element);
+ parse.addProblem(createValueExceptionMessage("'"+value+"' cannot be parsed to a float", element));
return null;
}
floatDescriptor.setValue(floatValue);
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/HibernateConfigurationBinding.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/HibernateConfigurationBinding.java 2009-05-20 09:10:17 UTC (rev 4854)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/HibernateConfigurationBinding.java 2009-05-20 09:22:00 UTC (rev 4855)
@@ -105,7 +105,7 @@
descriptor.addCfgUrl(urlText);
} else {
- parse.addProblem("exactly 1 attribute in {resource, file, url} was expected in cfg: "+XmlUtil.toString(configElement), null, "error", configElement);
+ parse.addProblem("exactly 1 attribute in {resource, file, url} was expected in cfg: "+XmlUtil.toString(configElement));
}
} else if ("mapping".equals(XmlUtil.getTagLocalName(configElement))) {
@@ -130,7 +130,7 @@
descriptor.addMappingUrl(urlText);
} else {
- parse.addProblem("exactly 1 attribute in {resource, file, class, url} was expected in mapping: "+XmlUtil.toString(element), null, "error", configElement);
+ parse.addProblem("exactly 1 attribute in {resource, file, class, url} was expected in mapping: "+XmlUtil.toString(element));
}
} else if ("properties".equals(XmlUtil.getTagLocalName(configElement))) {
@@ -147,7 +147,7 @@
|| ("transactional".equals(cacheUsage))
)
){
- parse.addProblem("problem in cache-configuration: no usage attribute or illegal value: "+cacheUsage+" Possible values are {read-only, nonstrict-read-write, read-write, transactional}", null, "error", configElement);
+ parse.addProblem("problem in cache-configuration: no usage attribute or illegal value: "+cacheUsage+" Possible values are {read-only, nonstrict-read-write, read-write, transactional}");
} else {
if (configElement.hasAttribute("file")) {
@@ -156,7 +156,7 @@
if (file.exists() && file.isFile()) {
streamSource = new FileStreamInput(file);
} else {
- parse.addProblem("file "+fileName+" isn't a file", null, "error", configElement);
+ parse.addProblem("file "+fileName+" isn't a file");
}
}
@@ -171,7 +171,7 @@
URL url = new URL(urlText);
streamSource = new UrlStreamInput(url);
} catch (Exception e) {
- parse.addProblem("couldn't open url "+urlText, e, "error", configElement);
+ parse.addProblem("couldn't open url "+urlText, e);
}
}
@@ -199,14 +199,14 @@
descriptor.addCollectionToCache(collection, cacheUsage);
} else {
- parse.addProblem("unknown hibernate cache configuration element "+XmlUtil.toString(configElement), null, "error", configElement);
+ parse.addProblem("unknown hibernate cache configuration element "+XmlUtil.toString(configElement));
}
}
}
}
} else {
- parse.addProblem("unknown hibernate configuration element "+XmlUtil.toString(configElement), null, "error", configElement);
+ parse.addProblem("unknown hibernate configuration element "+XmlUtil.toString(configElement));
}
}
}
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/IntBinding.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/IntBinding.java 2009-05-20 09:10:17 UTC (rev 4854)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/IntBinding.java 2009-05-20 09:22:00 UTC (rev 4855)
@@ -45,7 +45,7 @@
try {
integerValue = new Integer(value);
} catch (NumberFormatException e) {
- parse.addProblem(createValueExceptionMessage("'"+value+"' cannot be parsed to an int", element), null, "error", element);
+ parse.addProblem(createValueExceptionMessage("'"+value+"' cannot be parsed to an int", element));
return null;
}
integerDescriptor.setValue(integerValue);
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/InvokeBinding.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/InvokeBinding.java 2009-05-20 09:10:17 UTC (rev 4854)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/InvokeBinding.java 2009-05-20 09:22:00 UTC (rev 4855)
@@ -48,7 +48,7 @@
if (element.hasAttribute("method")) {
invokeOperation.setMethodName(element.getAttribute("method"));
} else {
- parse.addProblem("invoke must have method : "+XmlUtil.toString(element), null, "error", element);
+ parse.addProblem("invoke must have method : "+XmlUtil.toString(element));
}
List<Element> argElements = XmlUtil.elements(element, "arg");
Parser wireParser = (Parser) parser;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/JndiBinding.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/JndiBinding.java 2009-05-20 09:10:17 UTC (rev 4854)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/JndiBinding.java 2009-05-20 09:22:00 UTC (rev 4855)
@@ -45,7 +45,7 @@
return new JndiDescriptor(jndiName);
} else {
- parse.addProblem("jndi requires attribute 'jndi-name'", null, "error", element);
+ parse.addProblem("jndi requires attribute 'jndi-name'");
}
return null;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/LongBinding.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/LongBinding.java 2009-05-20 09:10:17 UTC (rev 4854)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/LongBinding.java 2009-05-20 09:22:00 UTC (rev 4855)
@@ -45,7 +45,7 @@
try {
longValue = new Long(value);
} catch (NumberFormatException e) {
- parse.addProblem(createValueExceptionMessage("'"+value+"' cannot be parsed to a long", element), null, "error", element);
+ parse.addProblem(createValueExceptionMessage("'"+value+"' cannot be parsed to a long", element));
return null;
}
longDescriptor.setValue(longValue);
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/MailSessionBinding.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/MailSessionBinding.java 2009-05-20 09:10:17 UTC (rev 4854)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/MailSessionBinding.java 2009-05-20 09:22:00 UTC (rev 4855)
@@ -94,7 +94,7 @@
serverDescriptor.addInjection("sessionProperties", propertiesDescriptor);
}
else {
- parse.addProblem("missing mail session properties", null, "error", serverElement);
+ parse.addProblem("missing mail session properties");
}
// authenticator
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/MapBinding.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/MapBinding.java 2009-05-20 09:10:17 UTC (rev 4854)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/MapBinding.java 2009-05-20 09:22:00 UTC (rev 4855)
@@ -78,10 +78,10 @@
keyDescriptors.add(keyDescriptor);
valueDescriptors.add(valueDescriptor);
} else {
- parse.addProblem("entry must have key and value element with a single descriptor as contents: "+XmlUtil.toString(entryElement), null, "error", entryElement);
+ parse.addProblem("entry must have key and value element with a single descriptor as contents: "+XmlUtil.toString(entryElement));
}
} else {
- parse.addProblem("map can only contain entry elements: "+XmlUtil.toString(entryElement), null, "error", entryElement);
+ parse.addProblem("map can only contain entry elements: "+XmlUtil.toString(entryElement));
}
}
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/MessageSessionBinding.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/MessageSessionBinding.java 2009-05-20 09:10:17 UTC (rev 4854)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/MessageSessionBinding.java 2009-05-20 09:22:00 UTC (rev 4855)
@@ -59,7 +59,7 @@
JndiDescriptor jndiDescriptor = new JndiDescriptor(jmsSessionJndiName);
objectDescriptor.addInjection("jmsSession", jndiDescriptor);
} else {
- parse.addProblem("attribute <"+XmlUtil.getTagLocalName(element)+" session-jndi=\"...\" is required when target=\"jms\"", null, "error", element);
+ parse.addProblem("attribute <"+XmlUtil.getTagLocalName(element)+" session-jndi=\"...\" is required when target=\"jms\"");
}
if (element.hasAttribute("destination-jndi")) {
@@ -67,7 +67,7 @@
JndiDescriptor jndiDescriptor = new JndiDescriptor(jmsDestinationJndiName);
objectDescriptor.addInjection("jmsDestination", jndiDescriptor);
} else {
- parse.addProblem("attribute <"+XmlUtil.getTagLocalName(element)+" destination-jndi=\"...\" is required when target=\"jms\"", null, "error", element);
+ parse.addProblem("attribute <"+XmlUtil.getTagLocalName(element)+" destination-jndi=\"...\" is required when target=\"jms\"");
}
} else {
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/ObjectBinding.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/ObjectBinding.java 2009-05-20 09:10:17 UTC (rev 4854)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/ObjectBinding.java 2009-05-20 09:22:00 UTC (rev 4855)
@@ -76,10 +76,10 @@
if (className!=null) {
descriptor.setClassName(className);
if (factoryObjectName!=null) {
- parse.addProblem("attribute 'factory' is specified together with attribute 'class' in element 'object': "+XmlUtil.toString(element), null, "error", element);
+ parse.addProblem("attribute 'factory' is specified together with attribute 'class' in element 'object': "+XmlUtil.toString(element));
}
if (factoryElement!=null) {
- parse.addProblem("element 'factory' is specified together with attribute 'class' in element 'object': "+XmlUtil.toString(element), null, "error", element);
+ parse.addProblem("element 'factory' is specified together with attribute 'class' in element 'object': "+XmlUtil.toString(element));
}
Element constructorElement = XmlUtil.element(element, "constructor");
@@ -89,14 +89,14 @@
descriptor.setArgDescriptors(argDescriptors);
if (element.hasAttribute("method")) {
- parse.addProblem("attributes 'class' and 'method' indicate static method and also a 'constructor' element is specified for element 'object': "+XmlUtil.toString(element), null, "error", element);
+ parse.addProblem("attributes 'class' and 'method' indicate static method and also a 'constructor' element is specified for element 'object': "+XmlUtil.toString(element));
}
}
} else if (factoryObjectName!=null) {
descriptor.setFactoryObjectName(factoryObjectName);
if (factoryElement!=null) {
- parse.addProblem("element 'factory' is specified together with attribute 'factory' in element 'object': "+XmlUtil.toString(element), null, "error", element);
+ parse.addProblem("element 'factory' is specified together with attribute 'factory' in element 'object': "+XmlUtil.toString(element));
}
} else if (factoryElement!=null) {
@@ -105,7 +105,7 @@
descriptor.setFactoryDescriptor(factoryDescriptor);
} else {
- parse.addProblem("element 'object' must have one of {attribute 'class', attribute 'factory' or element 'factory'}: "+XmlUtil.toString(element), null, "error", element);
+ parse.addProblem("element 'object' must have one of {attribute 'class', attribute 'factory' or element 'factory'}: "+XmlUtil.toString(element));
}
// method
@@ -116,11 +116,11 @@
List<ArgDescriptor> argDescriptors = wireParser.parseArgs(argElements, parse);
descriptor.setArgDescriptors(argDescriptors);
} else if (className == null) {
- parse.addProblem("element 'object' with a element 'factory' or a attribute 'factory' must have a attribute 'method': "+XmlUtil.toString(element), null, "error", element);
+ parse.addProblem("element 'object' with a element 'factory' or a attribute 'factory' must have a attribute 'method': "+XmlUtil.toString(element));
}
if( (className == null) && (XmlUtil.element(element, "constructor") != null)){
- parse.addProblem("element 'object' with a element 'factory' or a attribute 'factory' can't have a 'constructor' element: "+XmlUtil.toString(element), null, "error", element);
+ parse.addProblem("element 'object' with a element 'factory' or a attribute 'factory' can't have a 'constructor' element: "+XmlUtil.toString(element));
}
// read the operations elements
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/PropertiesBinding.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/PropertiesBinding.java 2009-05-20 09:10:17 UTC (rev 4854)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/PropertiesBinding.java 2009-05-20 09:22:00 UTC (rev 4855)
@@ -81,10 +81,10 @@
keyDescriptors.add(new StringDescriptor(name));
valueDescriptors.add(new StringDescriptor(value));
} else {
- parse.addProblem("property must have name and value attributes: "+XmlUtil.toString(propertyElement), null, "error", propertyElement);
+ parse.addProblem("property must have name and value attributes: "+XmlUtil.toString(propertyElement));
}
} else {
- parse.addProblem("properties can only contain property elements: "+XmlUtil.toString(propertyElement), null, "error", propertyElement);
+ parse.addProblem("properties can only contain property elements: "+XmlUtil.toString(propertyElement));
}
}
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/PropertyBinding.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/PropertyBinding.java 2009-05-20 09:10:17 UTC (rev 4854)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/PropertyBinding.java 2009-05-20 09:22:00 UTC (rev 4855)
@@ -86,7 +86,7 @@
} else if (element.hasAttribute("name")) {
propertyOperation.setPropertyName(element.getAttribute("name"));
} else {
- parse.addProblem("property must have name or setter attribute: "+XmlUtil.toString(element), null, "error", element);
+ parse.addProblem("property must have name or setter attribute: "+XmlUtil.toString(element));
}
Element descriptorElement = XmlUtil.element(element);
if (descriptorElement!=null) {
@@ -94,10 +94,10 @@
if (descriptor!=null) {
propertyOperation.setDescriptor(descriptor);
} else {
- parse.addProblem("couldn't parse property content element as a value descriptor: "+XmlUtil.toString(element), null, "error", element);
+ parse.addProblem("couldn't parse property content element as a value descriptor: "+XmlUtil.toString(element));
}
} else {
- parse.addProblem("property must have 1 descriptor element out of "+parser.getBindings().getTagNames(WireParser.CATEGORY_DESCRIPTOR)+" as content: "+XmlUtil.toString(element), null, "error", element);
+ parse.addProblem("property must have 1 descriptor element out of "+parser.getBindings().getTagNames(WireParser.CATEGORY_DESCRIPTOR)+" as content: "+XmlUtil.toString(element));
}
return propertyOperation;
}
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/RefBinding.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/RefBinding.java 2009-05-20 09:10:17 UTC (rev 4854)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/RefBinding.java 2009-05-20 09:22:00 UTC (rev 4855)
@@ -45,7 +45,7 @@
if (element.hasAttribute("object")) {
descriptor.setValue(element.getAttribute("object"));
} else {
- parse.addProblem("ref must have object attribute: "+XmlUtil.toString(element), null, "error", element);
+ parse.addProblem("ref must have object attribute: "+XmlUtil.toString(element));
}
return descriptor;
}
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/RetryInterceptorBinding.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/RetryInterceptorBinding.java 2009-05-20 09:10:17 UTC (rev 4854)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/RetryInterceptorBinding.java 2009-05-20 09:22:00 UTC (rev 4855)
@@ -48,7 +48,7 @@
int retries = Integer.parseInt(retriesText);
retryInterceptorDescriptor.setRetries(retries);
} catch (NumberFormatException e) {
- parse.addProblem("couldn't parse retries "+retriesText, null, "error", element);
+ parse.addProblem("couldn't parse retries "+retriesText);
}
}
@@ -58,7 +58,7 @@
long delay = Long.parseLong(delayText);
retryInterceptorDescriptor.setDelay(delay);
} catch (NumberFormatException e) {
- parse.addProblem("couldn't parse delay "+delayText, null, "error", element);
+ parse.addProblem("couldn't parse delay "+delayText);
}
}
@@ -68,7 +68,7 @@
long delayFactor = Long.parseLong(delayFactorText);
retryInterceptorDescriptor.setDelayFactor(delayFactor);
} catch (NumberFormatException e) {
- parse.addProblem("couldn't parse delay-factor "+delayFactorText, null, "error", element);
+ parse.addProblem("couldn't parse delay-factor "+delayFactorText);
}
}
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/ScriptManagerBinding.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/ScriptManagerBinding.java 2009-05-20 09:10:17 UTC (rev 4854)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/ScriptManagerBinding.java 2009-05-20 09:22:00 UTC (rev 4855)
@@ -66,7 +66,7 @@
descriptor.addInjection("readContextNames", new ProvidedObjectDescriptor(readContextNames));
} else {
- parse.addProblem("'read-contexts' is a required attribute in element <script-manager />", null, "error", element);
+ parse.addProblem("'read-contexts' is a required attribute in element <script-manager />");
}
if (element.hasAttribute("write-context")) {
@@ -74,7 +74,7 @@
descriptor.addInjection("writeContextName", new StringDescriptor(writeContextName));
} else {
- parse.addProblem("'write-context' is a required attribute in element <script-manager />", null, "error", element);
+ parse.addProblem("'write-context' is a required attribute in element <script-manager />");
}
ScriptEngineManager scriptEngineManager = new ScriptEngineManager();
@@ -84,13 +84,13 @@
if (scriptElement.hasAttribute("name")) {
languageName = scriptElement.getAttribute("name");
} else {
- parse.addProblem("'name' is a required attribute in element <script-language />", null, "error", element);
+ parse.addProblem("'name' is a required attribute in element <script-language />");
}
String factoryClassName = null;
if (scriptElement.hasAttribute("factory")) {
factoryClassName = scriptElement.getAttribute("factory");
} else {
- parse.addProblem("'name' is a required attribute in element <script-language />", null, "error", element);
+ parse.addProblem("'name' is a required attribute in element <script-language />");
}
if ( (languageName!=null)
@@ -101,7 +101,7 @@
ScriptEngineFactory scriptEngineFactory = (ScriptEngineFactory) factoryClass.newInstance();
scriptEngineManager.registerEngineName(languageName, scriptEngineFactory);
} catch (Exception e) {
- parse.addProblem("couldn't instantiate ScriptEngineFactory "+factoryClassName, e, "error", element);
+ parse.addProblem("couldn't instantiate ScriptEngineFactory "+factoryClassName, e);
}
}
}
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/ShortBinding.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/ShortBinding.java 2009-05-20 09:10:17 UTC (rev 4854)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/ShortBinding.java 2009-05-20 09:22:00 UTC (rev 4855)
@@ -45,7 +45,7 @@
try {
shortValue = new Short(value);
} catch (NumberFormatException e) {
- parse.addProblem(createValueExceptionMessage("'"+value+"' cannot be parsed to a short", element), null, "error", element);
+ parse.addProblem(createValueExceptionMessage("'"+value+"' cannot be parsed to a short", element));
return null;
}
shortDescriptor.setValue(shortValue);
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/TransactionBinding.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/TransactionBinding.java 2009-05-20 09:10:17 UTC (rev 4854)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/TransactionBinding.java 2009-05-20 09:22:00 UTC (rev 4855)
@@ -54,7 +54,7 @@
} else if ("jta".equals(type)){
transactionDescriptor = new ObjectDescriptor(JtaTransaction.class);
} else {
- parse.addProblem("unsupported transaction type: "+type, null, "error", element);
+ parse.addProblem("unsupported transaction type: "+type);
}
return transactionDescriptor;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/TypesBinding.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/TypesBinding.java 2009-05-20 09:10:17 UTC (rev 4854)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/TypesBinding.java 2009-05-20 09:22:00 UTC (rev 4855)
@@ -65,7 +65,7 @@
streamSource = new FileStreamInput(file);
parser.importStream(streamSource, element, parse);
} else {
- parse.addProblem("file "+fileName+" isn't a file", null, "error", element);
+ parse.addProblem("file "+fileName+" isn't a file");
}
}
@@ -82,7 +82,7 @@
streamSource = new UrlStreamInput(url);
parser.importStream(streamSource, element, parse);
} catch (Exception e) {
- parse.addProblem("couldn't open url "+urlText, e, "error", element);
+ parse.addProblem("couldn't open url "+urlText, e);
}
}
@@ -126,10 +126,10 @@
} else if ("string".equalsIgnoreCase(idType)) {
matcher = new HibernateStringIdMatcher(hibernateSessionFactoryName);
} else {
- parse.addProblem("id-type was not 'long' or 'string': "+idType, null, "error", element);
+ parse.addProblem("id-type was not 'long' or 'string': "+idType);
}
} else {
- parse.addProblem("id-type is required in a persistable type", null, "error", element);
+ parse.addProblem("id-type is required in a persistable type");
}
// otherwise, we expect type="some.java.ClassName"
@@ -145,10 +145,10 @@
try {
matcher = (Matcher) parser.parseElement(matcherObjectElement, parse);
} catch (ClassCastException e) {
- parse.addProblem("matcher is not a "+Matcher.class.getName()+": "+(matcher!=null ? matcher.getClass().getName() : "null"), null, "error", element);
+ parse.addProblem("matcher is not a "+Matcher.class.getName()+": "+(matcher!=null ? matcher.getClass().getName() : "null"));
}
} else {
- parse.addProblem("no matcher specified in "+XmlUtil.toString(element), null, "error", element);
+ parse.addProblem("no matcher specified in "+XmlUtil.toString(element));
}
}
@@ -163,7 +163,7 @@
Class<?> converterClass = ReflectUtil.loadClass(classLoader, converterClassName);
converter = (Converter) converterClass.newInstance();
} catch (Exception e) {
- parse.addProblem("couldn't instantiate converter "+converterClassName, null, "error", element);
+ parse.addProblem("couldn't instantiate converter "+converterClassName);
}
} else {
// look for the matcher element
@@ -173,7 +173,7 @@
try {
converter = (Converter) parser.parseElement(converterObjectElement, parse);
} catch (ClassCastException e) {
- parse.addProblem("converter is not a "+Converter.class.getName()+": "+(converter!=null ? converter.getClass().getName() : "null"), null, "error", element);
+ parse.addProblem("converter is not a "+Converter.class.getName()+": "+(converter!=null ? converter.getClass().getName() : "null"));
}
}
}
@@ -189,10 +189,10 @@
try {
variableClass = ReflectUtil.loadClass(classLoader, variableClassName);
} catch (Exception e) {
- parse.addProblem("couldn't instantiate variable-class "+variableClassName, e, "error", element);
+ parse.addProblem("couldn't instantiate variable-class "+variableClassName, e);
}
} else {
- parse.addProblem("variable-class is required on a type: "+XmlUtil.toString(element), null, "error", element);
+ parse.addProblem("variable-class is required on a type: "+XmlUtil.toString(element));
}
type.setVariableClass(variableClass);
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/xml/BindingParser.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/xml/BindingParser.java 2009-05-20 09:10:17 UTC (rev 4854)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/xml/BindingParser.java 2009-05-20 09:22:00 UTC (rev 4855)
@@ -52,7 +52,7 @@
log.trace("couldn't instantiate binding "+bindingClassName);
}
} else {
- parse.addProblem("class is a required attribute in a binding "+XmlUtil.toString(bindingElement), null, "error", bindingElement);
+ parse.addProblem("class is a required attribute in a binding "+XmlUtil.toString(bindingElement));
}
if (binding!=null) {
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/Parse.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/Parse.java 2009-05-20 09:10:17 UTC (rev 4854)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/Parse.java 2009-05-20 09:22:00 UTC (rev 4855)
@@ -146,7 +146,7 @@
return new InputSource(inputStream);
}
- addProblem("no source specified to parse", null, "error", null);
+ addProblem("no source specified to parse");
return null;
}
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/Parser.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/Parser.java 2009-05-20 09:10:17 UTC (rev 4854)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/Parser.java 2009-05-20 09:22:00 UTC (rev 4855)
@@ -300,7 +300,7 @@
try {
parse.documentBuilder = documentBuilderFactory.newDocumentBuilder();
} catch (Exception e) {
- parse.addProblem("couldn't get new document builder", e, "error", null);
+ parse.addProblem("couldn't get new document builder", e);
return null;
}
parse.documentBuilder.setErrorHandler(parse);
@@ -376,7 +376,7 @@
}
} catch (Exception e) {
- importingParse.addProblem("couldn't import "+importedStreamInput, e, "error", null);
+ importingParse.addProblem("couldn't import "+importedStreamInput, e);
}
}
@@ -395,7 +395,7 @@
} catch (Exception e) {
e.printStackTrace();
- parse.addProblem("couldn't interpret the dom model: "+e.getMessage(), e, "error", null);
+ parse.addProblem("couldn't interpret the dom model: "+e.getMessage(), e);
}
}
@@ -404,7 +404,7 @@
try {
parse.inputStream.close();
} catch (Exception e) {
- parse.addProblem("couldn't close input stream", e, "error", null);
+ parse.addProblem("couldn't close input stream", e);
}
}
}
@@ -451,7 +451,7 @@
xmlReader.parse(inputSource);
} catch (Exception e) {
- parse.addProblem("couldn't parse xml document", e, "error", null);
+ parse.addProblem("couldn't parse xml document", e);
}
return document;
@@ -511,7 +511,7 @@
if (binding!=null) {
object = binding.parse(element, parse, this);
} else {
- parse.addProblem("no element parser for tag "+tagName+(category!=null ? " in category "+category : " in the default category"), null, "error", element);
+ parse.addProblem("no element parser for tag "+tagName+(category!=null ? " in category "+category : " in the default category"));
}
return object;
@@ -532,7 +532,7 @@
argDescriptor.setTypeName(XmlUtil.attribute(argElement, "type"));
Element descriptorElement = XmlUtil.element(argElement);
if (descriptorElement==null) {
- parse.addProblem("arg must contain exactly one descriptor element out of "+bindings.getTagNames(category)+" as contents:"+XmlUtil.toString((Element) argElement.getParentNode()), null, "error", argElement);
+ parse.addProblem("arg must contain exactly one descriptor element out of "+bindings.getTagNames(category)+" as contents:"+XmlUtil.toString((Element) argElement.getParentNode()));
} else {
Descriptor descriptor = (Descriptor) parseElement(descriptorElement, parse, category);
argDescriptor.setDescriptor(descriptor);
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/ProblemList.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/ProblemList.java 2009-05-20 09:10:17 UTC (rev 4854)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/ProblemList.java 2009-05-20 09:22:00 UTC (rev 4855)
@@ -66,26 +66,26 @@
// problem constructor methods with default values //////////////////////////
/** add a problem with {@link ProblemImpl#TYPE_ERROR the default severity}.*/
-// public void addProblem(String msg) {
-// addProblem(msg, null, ProblemImpl.TYPE_ERROR, null);
-// }
+ public void addProblem(String msg) {
+ addProblem(msg, null, ProblemImpl.TYPE_ERROR, null);
+ }
/** add a problem with an exception cause and
* {@link ProblemImpl#TYPE_ERROR the default severity}.*/
-// public void addProblem(String msg, Exception e) {
-// addProblem(msg, e, ProblemImpl.TYPE_ERROR, null);
-// }
+ public void addProblem(String msg, Exception e) {
+ addProblem(msg, e, ProblemImpl.TYPE_ERROR, null);
+ }
/** add a problem with {@link ProblemImpl#TYPE_ERROR the default severity}.*/
-// public void addProblem(String msg, Element element) {
-// addProblem(msg, null, ProblemImpl.TYPE_ERROR, element);
-// }
+ public void addProblem(String msg, Element element) {
+ addProblem(msg, null, ProblemImpl.TYPE_ERROR, element);
+ }
/** add a problem with an exception cause and
* {@link ProblemImpl#TYPE_ERROR the default severity}.*/
-// public void addProblem(String msg, Exception e, Element element) {
-// addProblem(msg, e, ProblemImpl.TYPE_ERROR, element);
-// }
+ public void addProblem(String msg, Exception e, Element element) {
+ addProblem(msg, e, ProblemImpl.TYPE_ERROR, element);
+ }
// problem mgmt methods /////////////////////////////////////////////////////
15 years, 4 months
- 1
- 0
JBoss JBPM SVN: r4854 - in jbpm4/trunk/modules: devguide/src/main/docbook/en/images and 7 other directories.
by do-not-reply＠jboss.org
Author: tom.baeyens(a)jboss.com
Date: 2009-05-20 05:10:17 -0400 (Wed, 20 May 2009)
New Revision: 4854
Added:
jbpm4/trunk/modules/devguide/src/main/docbook/en/images/process.group.concurrency.png
jbpm4/trunk/modules/devguide/src/main/docbook/en/images/process.group.multipleentries.png
jbpm4/trunk/modules/devguide/src/main/docbook/en/images/process.group.simple.png
jbpm4/trunk/modules/devguide/src/main/docbook/en/images/process.group.timer.png
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/async/
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/async/activity/
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/async/activity/Application.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/async/activity/AsyncActivityTest.java
jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/async/
jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/async/activity/
jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/async/activity/process.jpdl.xml
Modified:
jbpm4/trunk/modules/api/src/main/resources/jpdl-4.0.xsd
jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JavaActivity.java
jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JavaBinding.java
Log:
JBPM-2256 starting on async example
Modified: jbpm4/trunk/modules/api/src/main/resources/jpdl-4.0.xsd
===================================================================
--- jbpm4/trunk/modules/api/src/main/resources/jpdl-4.0.xsd 2009-05-20 08:57:25 UTC (rev 4853)
+++ jbpm4/trunk/modules/api/src/main/resources/jpdl-4.0.xsd 2009-05-20 09:10:17 UTC (rev 4854)
@@ -602,6 +602,16 @@
<annotation><documentation>Graphical information used by process designer tool.
</documentation></annotation>
</attribute>
+ <attribute name="async">
+ <annotation><documentation>Graphical information used by process designer tool.
+ </documentation></annotation>
+ <simpleType>
+ <restriction base="string">
+ <enumeration value="true" />
+ <enumeration value="exclusive" />
+ </restriction>
+ </simpleType>
+ </attribute>
</attributeGroup>
<attributeGroup name="assignmentAttributes">
Added: jbpm4/trunk/modules/devguide/src/main/docbook/en/images/process.group.concurrency.png
===================================================================
(Binary files differ)
Property changes on: jbpm4/trunk/modules/devguide/src/main/docbook/en/images/process.group.concurrency.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: jbpm4/trunk/modules/devguide/src/main/docbook/en/images/process.group.multipleentries.png
===================================================================
(Binary files differ)
Property changes on: jbpm4/trunk/modules/devguide/src/main/docbook/en/images/process.group.multipleentries.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: jbpm4/trunk/modules/devguide/src/main/docbook/en/images/process.group.simple.png
===================================================================
(Binary files differ)
Property changes on: jbpm4/trunk/modules/devguide/src/main/docbook/en/images/process.group.simple.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: jbpm4/trunk/modules/devguide/src/main/docbook/en/images/process.group.timer.png
===================================================================
(Binary files differ)
Property changes on: jbpm4/trunk/modules/devguide/src/main/docbook/en/images/process.group.timer.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/async/activity/Application.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/async/activity/Application.java (rev 0)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/async/activity/Application.java 2009-05-20 09:10:17 UTC (rev 4854)
@@ -0,0 +1,30 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY 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 along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jbpm.examples.async.activity;
+
+
+/**
+ * @author Tom Baeyens
+ */
+public class Application {
+
+}
Property changes on: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/async/activity/Application.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/async/activity/AsyncActivityTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/async/activity/AsyncActivityTest.java (rev 0)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/async/activity/AsyncActivityTest.java 2009-05-20 09:10:17 UTC (rev 4854)
@@ -0,0 +1,53 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY 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 along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jbpm.examples.async.activity;
+
+import org.jbpm.api.Execution;
+import org.jbpm.test.JbpmTestCase;
+
+
+/**
+ * @author Tom Baeyens
+ */
+public class AsyncActivityTest extends JbpmTestCase {
+
+ long deploymentDbid;
+
+ protected void setUp() throws Exception {
+ super.setUp();
+
+ deploymentDbid = repositoryService.createDeployment()
+ .addResourceFromClasspath("org/jbpm/examples/async/activity/process.jpdl.xml")
+ .deploy();
+ }
+
+ protected void tearDown() throws Exception {
+ repositoryService.deleteDeploymentCascade(deploymentDbid);
+
+ super.tearDown();
+ }
+
+ public void testJavaInstantiate() {
+ Execution execution = executionService.startProcessInstanceByKey("AsyncActivity");
+ String executionId = execution.getId();
+ }
+}
Property changes on: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/async/activity/AsyncActivityTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/async/activity/process.jpdl.xml
===================================================================
--- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/async/activity/process.jpdl.xml (rev 0)
+++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/async/activity/process.jpdl.xml 2009-05-20 09:10:17 UTC (rev 4854)
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<process name="AsyncActivity" xmlns="http://jbpm.org/4.0/jpdl">
+
+ <start>
+ <transition to="generate pdf" />
+ </start>
+
+ <java name="generate pdf"
+ class="org.jbpm.examples.async.activity.Application"
+ method="generatePdf"
+ async="true">
+ <transition to="calculate primes" />
+ </java>
+
+ <java name="calculate primes"
+ class="org.jbpm.examples.async.activity.Application"
+ method="calculatePrimes"
+ async="true">
+ <transition to="run test suite" />
+ </java>
+
+ <java name="run test suite"
+ class="org.jbpm.examples.async.activity.Application"
+ method="runTestSuite"
+ async="true">
+ <transition to="end" />
+ </java>
+
+ <end name="end" />
+
+</process>
\ No newline at end of file
Property changes on: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/async/activity/process.jpdl.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JavaActivity.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JavaActivity.java 2009-05-20 08:57:25 UTC (rev 4853)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JavaActivity.java 2009-05-20 09:10:17 UTC (rev 4854)
@@ -24,7 +24,11 @@
import java.lang.reflect.Method;
import java.util.List;
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.env.Environment;
import org.jbpm.api.model.OpenExecution;
+import org.jbpm.pvm.internal.env.EnvironmentDefaults;
+import org.jbpm.pvm.internal.script.ScriptManager;
import org.jbpm.pvm.internal.util.ReflectUtil;
import org.jbpm.pvm.internal.wire.Descriptor;
import org.jbpm.pvm.internal.wire.WireContext;
@@ -41,15 +45,30 @@
private static final long serialVersionUID = 1L;
+ protected String expression;
+ protected String language;
protected Descriptor descriptor;
protected String methodName;
protected String variableName;
protected InvokeOperation invokeOperation;
public void perform(OpenExecution execution) throws Exception {
+
+ Object target = null;
+
WireContext wireContext = new WireContext();
- Object target = wireContext.create(descriptor, false);
+ if (descriptor!=null) {
+ target = wireContext.create(descriptor, false);
+
+ } else if (expression!=null) {
+ ScriptManager scriptManager = EnvironmentDefaults.getScriptManager();
+ target = scriptManager.evaluateExpression(expression, execution, language);
+
+ } else {
+ throw new JbpmException("no target specified");
+ }
+
try {
List<ArgDescriptor> argDescriptors = null;
Object[] args = null;
@@ -89,4 +108,10 @@
public void setInvokeOperation(InvokeOperation invokeOperation) {
this.invokeOperation = invokeOperation;
}
+ public void setExpression(String expression) {
+ this.expression = expression;
+ }
+ public void setLanguage(String language) {
+ this.language = language;
+ }
}
Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JavaBinding.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JavaBinding.java 2009-05-20 08:57:25 UTC (rev 4853)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JavaBinding.java 2009-05-20 09:10:17 UTC (rev 4854)
@@ -64,6 +64,14 @@
if (element.hasAttribute("class")) {
ObjectDescriptor objectDescriptor = JpdlParser.parseObjectDescriptor(element, parse);
javaActivity.setDescriptor(objectDescriptor);
+
+ } else if (element.hasAttribute("expr")) {
+ String expression = element.getAttribute("expr");
+ javaActivity.setExpression(expression);
+ javaActivity.setLanguage(XmlUtil.attribute(element, "language"));
+
+ } else {
+ // parse.addProblem("no target specified in "+TAG+": must specify attribute 'class' or 'expr'", element);
}
return javaActivity;
15 years, 4 months
- 1
- 0
JBoss JBPM SVN: r4853 - in projects/gwt-console/trunk/gui: workspace-api and 1 other directories.
by do-not-reply＠jboss.org
Author: heiko.braun(a)jboss.com
Date: 2009-05-20 04:57:25 -0400 (Wed, 20 May 2009)
New Revision: 4853
Modified:
projects/gwt-console/trunk/gui/war/gui-war.iml
projects/gwt-console/trunk/gui/workspace-api/workspace-api.iml
projects/gwt-console/trunk/gui/workspace-example/workspace-example.iml
Log:
Fix IDE settings
Modified: projects/gwt-console/trunk/gui/war/gui-war.iml
===================================================================
--- projects/gwt-console/trunk/gui/war/gui-war.iml 2009-05-20 07:49:38 UTC (rev 4852)
+++ projects/gwt-console/trunk/gui/war/gui-war.iml 2009-05-20 08:57:25 UTC (rev 4853)
@@ -11,6 +11,7 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="module" module-name="gwt-rpc" />
<orderEntry type="module" module-name="gwt-parent" />
<orderEntry type="module" module-name="workspace-api" />
<orderEntry type="module-library" exported="">
@@ -208,7 +209,6 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module" module-name="gwt-rpc" />
<orderEntryProperties />
</component>
</module>
Modified: projects/gwt-console/trunk/gui/workspace-api/workspace-api.iml
===================================================================
--- projects/gwt-console/trunk/gui/workspace-api/workspace-api.iml 2009-05-20 07:49:38 UTC (rev 4852)
+++ projects/gwt-console/trunk/gui/workspace-api/workspace-api.iml 2009-05-20 08:57:25 UTC (rev 4853)
@@ -6,6 +6,7 @@
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/target/generated-sources" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
Modified: projects/gwt-console/trunk/gui/workspace-example/workspace-example.iml
===================================================================
--- projects/gwt-console/trunk/gui/workspace-example/workspace-example.iml 2009-05-20 07:49:38 UTC (rev 4852)
+++ projects/gwt-console/trunk/gui/workspace-example/workspace-example.iml 2009-05-20 08:57:25 UTC (rev 4853)
@@ -10,8 +10,6 @@
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="toplevel" />
- <orderEntry type="module" module-name="plugin-api" />
- <orderEntry type="module" module-name="plugin" />
<orderEntry type="module" module-name="gwt-parent" />
<orderEntry type="module" module-name="workspace-api" />
<orderEntry type="module-library">
@@ -72,111 +70,111 @@
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic-gwtx:jar:0.1.9:compile">
+ <library name="M2 Dep: commons-collections:commons-collections:jar:3.2.1:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic-gwtx/0.1.9/gwt-mosaic-gwtx-0.1.9.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic-dnd:jar:0.1.9:compile">
+ <library name="M2 Dep: commons-logging:commons-logging:jar:1.1.1:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic-dnd/0.1.9/gwt-mosaic-dnd-0.1.9.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic:jar:0.1.9:compile">
+ <library name="M2 Dep: commons-lang:commons-lang:jar:2.4:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic/0.1.9/gwt-mosaic-0.1.9.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-lang/commons-lang/2.4/commons-lang-2.4.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic-incubator:jar:0.1.9:compile">
+ <library name="M2 Dep: commons-digester:commons-digester:jar:1.8:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic-incubator/0.1.9/gwt-mosaic-incubator-0.1.9.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-digester/commons-digester/1.8/commons-digester-1.8.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="M2 Dep: commons-collections:commons-collections:jar:3.2.1:compile">
+ <library name="M2 Dep: com.googlecode.mvc4g:mvc4g:jar:1.0.0-jboss:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/com/googlecode/mvc4g/mvc4g/1.0.0-jboss/mvc4g-1.0.0-jboss.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="M2 Dep: commons-logging:commons-logging:jar:1.1.1:compile">
+ <library name="M2 Dep: commons-beanutils:commons-beanutils:jar:1.7.0:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar!/" />
</CLASSES>
<JAVADOC />
- <SOURCES />
+ <SOURCES>
+ <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0-sources.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0-sources.jar!/" />
+ </SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="M2 Dep: commons-lang:commons-lang:jar:2.4:compile">
+ <library name="M2 Dep: commons-configuration:commons-configuration:jar:1.6:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-lang/commons-lang/2.4/commons-lang-2.4.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-configuration/commons-configuration/1.6/commons-configuration-1.6.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="M2 Dep: commons-digester:commons-digester:jar:1.8:compile">
+ <library name="M2 Dep: commons-beanutils:commons-beanutils-core:jar:1.8.0:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-digester/commons-digester/1.8/commons-digester-1.8.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-beanutils/commons-beanutils-core/1.8.0/commons-beanutils-core-1.8.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="M2 Dep: com.googlecode.mvc4g:mvc4g:jar:1.0.0-jboss:compile">
+ <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic-dnd:jar:0.1.9:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/com/googlecode/mvc4g/mvc4g/1.0.0-jboss/mvc4g-1.0.0-jboss.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic-dnd/0.1.9/gwt-mosaic-dnd-0.1.9.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="M2 Dep: commons-beanutils:commons-beanutils:jar:1.7.0:compile">
+ <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic-incubator:jar:0.1.9:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic-incubator/0.1.9/gwt-mosaic-incubator-0.1.9.jar!/" />
</CLASSES>
<JAVADOC />
- <SOURCES>
- <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0-sources.jar!/" />
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0-sources.jar!/" />
- </SOURCES>
+ <SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="M2 Dep: commons-configuration:commons-configuration:jar:1.6:compile">
+ <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic-gwtx:jar:0.1.9:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-configuration/commons-configuration/1.6/commons-configuration-1.6.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic-gwtx/0.1.9/gwt-mosaic-gwtx-0.1.9.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="M2 Dep: commons-beanutils:commons-beanutils-core:jar:1.8.0:compile">
+ <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic:jar:0.1.9:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-beanutils/commons-beanutils-core/1.8.0/commons-beanutils-core-1.8.0.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic/0.1.9/gwt-mosaic-0.1.9.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
15 years, 4 months
- 1
- 0
JBoss JBPM SVN: r4852 - in jbpm4/branches/jimma/modules/migration: src/main/java/org/jbpm/jpdl/internal/convert and 3 other directories.
by do-not-reply＠jboss.org
Author: jim.ma
Date: 2009-05-20 03:49:38 -0400 (Wed, 20 May 2009)
New Revision: 4852
Added:
jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/util/
jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/util/EndStateConverter.java
jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/util/StartStateConverter.java
jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/util/StateConverter.java
jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/util/TaskNodeConverter.java
jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/util/TransitionConverter.java
jbpm4/branches/jimma/modules/migration/src/test/resources/assignment.xml
jbpm4/branches/jimma/modules/migration/src/test/resources/simple.xml
Removed:
jbpm4/branches/jimma/modules/migration/src/test/resources/processdefinition.xml
Modified:
jbpm4/branches/jimma/modules/migration/pom.xml
jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/Jpdl4Writer.java
jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/JpdlConverter.java
jbpm4/branches/jimma/modules/migration/src/test/java/org/jbpm/jpdl/internal/convert/JpdlConverterTest.java
Log:
Converted <TaskNode> to jpdl4
Modified: jbpm4/branches/jimma/modules/migration/pom.xml
===================================================================
--- jbpm4/branches/jimma/modules/migration/pom.xml 2009-05-19 15:48:44 UTC (rev 4851)
+++ jbpm4/branches/jimma/modules/migration/pom.xml 2009-05-20 07:49:38 UTC (rev 4852)
@@ -99,6 +99,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
+ <version>4.4</version>
<scope>test</scope>
</dependency>
Modified: jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/Jpdl4Writer.java
===================================================================
--- jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/Jpdl4Writer.java 2009-05-19 15:48:44 UTC (rev 4851)
+++ jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/Jpdl4Writer.java 2009-05-20 07:49:38 UTC (rev 4852)
@@ -26,8 +26,6 @@
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
import javax.xml.bind.Marshaller;
-import javax.xml.bind.PropertyException;
-
import org.jbpm.jpdl4.model.ObjectFactory;
import org.jbpm.jpdl4.model.Process;
public class Jpdl4Writer {
Modified: jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/JpdlConverter.java
===================================================================
--- jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/JpdlConverter.java 2009-05-19 15:48:44 UTC (rev 4851)
+++ jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/JpdlConverter.java 2009-05-20 07:49:38 UTC (rev 4852)
@@ -22,33 +22,24 @@
package org.jbpm.jpdl.internal.convert;
import java.net.URL;
-import java.util.Iterator;
-import java.util.List;
import java.util.Map;
+import java.util.Set;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Marshaller;
-
-import org.jbpm.graph.def.Action;
-import org.jbpm.graph.def.Event;
import org.jbpm.graph.def.Node;
import org.jbpm.graph.def.ProcessDefinition;
-import org.jbpm.graph.def.Transition;
import org.jbpm.graph.node.EndState;
import org.jbpm.graph.node.StartState;
import org.jbpm.graph.node.State;
-import org.jbpm.jpdl4.model.JavaType;
-import org.jbpm.jpdl4.model.ObjectFactory;
+import org.jbpm.graph.node.TaskNode;
+import org.jbpm.jpdl.internal.convert.util.EndStateConverter;
+import org.jbpm.jpdl.internal.convert.util.StartStateConverter;
+import org.jbpm.jpdl.internal.convert.util.StateConverter;
+import org.jbpm.jpdl.internal.convert.util.TaskNodeConverter;
import org.jbpm.jpdl4.model.Process;
-import org.jbpm.jpdl4.model.TransitionType;
import org.xml.sax.InputSource;
public class JpdlConverter {
private ConverterContext context;
- private ObjectFactory objectFactory = new ObjectFactory();
-
public JpdlConverter(ConverterContext ctx) {
context = ctx;
}
@@ -62,7 +53,6 @@
// TODO:handle the exception
}
return mapProcessDef(processDef);
-
}
public Process mapProcessDef(ProcessDefinition def) {
@@ -73,91 +63,32 @@
// map start state node
if (node.getNodeType().equals(Node.NodeType.StartState)) {
StartState jpdl3start = (StartState) node;
- Process.Start start = mapStartState(jpdl3start);
+ Process.Start start = StartStateConverter.run(jpdl3start);
process.getSwimlaneAndOnAndTimer().add(start);
- }
-
- if (node.getNodeType().equals(Node.NodeType.State)) {
+ } else if (node.getNodeType().equals(Node.NodeType.State)) {
State jpdl3state = (State) node;
- Process.State state = mapState(jpdl3state);
+ Process.State state = StateConverter.run(jpdl3state);
process.getSwimlaneAndOnAndTimer().add(state);
- }
-
- if (node.getNodeType().equals(Node.NodeType.EndState)) {
+ } else if (node.getNodeType().equals(Node.NodeType.EndState)) {
EndState jpdl3end = (EndState) node;
- Process.End end = mapEndState(jpdl3end);
+ Process.End end = EndStateConverter.run(jpdl3end);
process.getSwimlaneAndOnAndTimer().add(end);
+ } else if (node.getNodeType().equals(Node.NodeType.Task)) {
+ //TaskNode
+ if (node instanceof TaskNode) {
+ TaskNode taskNode = (TaskNode)node;
+ Set<Process.Task> tasks = TaskNodeConverter.run(taskNode);
+ process.getSwimlaneAndOnAndTimer().addAll(tasks);
+ }
}
}
-
return process;
}
- public Process.Start mapStartState(StartState jpdl3start) {
- Process.Start start = new Process.Start();
- start.setName(jpdl3start.getName());
- Iterator iterator = jpdl3start.getLeavingTransitionsMap().entrySet()
- .iterator();
- while (iterator.hasNext()) {
- Map.Entry entry = (Map.Entry) iterator.next();
- Transition trans = (Transition) entry.getValue();
- start.getTransition().add(mapTranisition(trans, false));
- }
- return start;
- }
+
- public TransitionType mapTranisition(Transition transition, boolean state) {
- TransitionType transType = null;
- if (state) {
- transType = new Process.State.Transition();
- } else {
- transType = new TransitionType();
- }
- transType.setName(transition.getName());
- // get the actions
- Iterator ite = transition.getEvents().entrySet().iterator();
- while (ite.hasNext()) {
- Map.Entry<Object, Event> entry = (Map.Entry<Object, Event>) ite.next();
- if (entry.getValue().getEventType().equals(Event.EVENTTYPE_TRANSITION)) {
- if (entry.getValue().getActions() != null) {
- for (Action action : (List<Action>) entry.getValue().getActions()) {
- JavaType javaType = new JavaType();
- javaType.setClazz(action.getActionDelegation()
- .getClassName());
- //TODO:Check this java method
- javaType.setMethod("execute");
- transType.getEventListenerGroup().add(
- objectFactory.createOnJava(javaType));
- }
-
- }
- }
- }
- transType.setTo(transition.getTo().getName());
-
- return transType;
- }
-
- public Process.State mapState(State jpdl3state) {
- Process.State state = new Process.State();
- state.setName(jpdl3state.getName());
- Iterator iterator = jpdl3state.getLeavingTransitionsMap().entrySet().iterator();
- while (iterator.hasNext()) {
- Map.Entry entry = (Map.Entry)iterator.next();
- Transition trans = (Transition)entry.getValue();
- state.getTransition().add((Process.State.Transition)mapTranisition(trans, true));
- }
-
- return state;
-
- }
-
- public Process.End mapEndState(EndState endState) {
- Process.End end = new Process.End();
- end.setName(endState.getName());
- return end;
- }
+
}
Added: jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/util/EndStateConverter.java
===================================================================
--- jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/util/EndStateConverter.java (rev 0)
+++ jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/util/EndStateConverter.java 2009-05-20 07:49:38 UTC (rev 4852)
@@ -0,0 +1,33 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY 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 along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jbpm.jpdl.internal.convert.util;
+
+import org.jbpm.graph.node.EndState;
+import org.jbpm.jpdl4.model.Process;
+
+public class EndStateConverter {
+ public static Process.End run(EndState endState) {
+ Process.End end = new Process.End();
+ end.setName(endState.getName());
+ return end;
+ }
+}
Added: jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/util/StartStateConverter.java
===================================================================
--- jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/util/StartStateConverter.java (rev 0)
+++ jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/util/StartStateConverter.java 2009-05-20 07:49:38 UTC (rev 4852)
@@ -0,0 +1,45 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY 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 along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jbpm.jpdl.internal.convert.util;
+
+import java.util.Iterator;
+import java.util.Map;
+
+import org.jbpm.graph.def.Transition;
+import org.jbpm.graph.node.StartState;
+import org.jbpm.jpdl4.model.Process;
+import org.jbpm.jpdl4.model.TransitionType;
+
+public class StartStateConverter {
+ public static Process.Start run(StartState jpdl3start) {
+ Process.Start start = new Process.Start();
+ start.setName(jpdl3start.getName());
+ Iterator iterator = jpdl3start.getLeavingTransitionsMap().entrySet()
+ .iterator();
+ while (iterator.hasNext()) {
+ Map.Entry entry = (Map.Entry) iterator.next();
+ Transition trans = (Transition) entry.getValue();
+ start.getTransition().add(TransitionConverter.run(trans, TransitionType.class));
+ }
+ return start;
+ }
+}
Added: jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/util/StateConverter.java
===================================================================
--- jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/util/StateConverter.java (rev 0)
+++ jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/util/StateConverter.java 2009-05-20 07:49:38 UTC (rev 4852)
@@ -0,0 +1,47 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY 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 along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jbpm.jpdl.internal.convert.util;
+
+import java.util.Iterator;
+import java.util.Map;
+
+import org.jbpm.graph.def.Transition;
+import org.jbpm.graph.node.State;
+import org.jbpm.jpdl4.model.Process;
+
+public class StateConverter {
+
+ public static Process.State run(State jpdl3state) {
+ Process.State state = new Process.State();
+ state.setName(jpdl3state.getName());
+ Iterator iterator = jpdl3state.getLeavingTransitionsMap().entrySet().iterator();
+ while (iterator.hasNext()) {
+ Map.Entry entry = (Map.Entry)iterator.next();
+ Transition trans = (Transition)entry.getValue();
+ state.getTransition().add((Process.State.Transition)TransitionConverter.run(trans, Process.State.Transition.class));
+ }
+
+ return state;
+
+ }
+
+}
Added: jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/util/TaskNodeConverter.java
===================================================================
--- jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/util/TaskNodeConverter.java (rev 0)
+++ jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/util/TaskNodeConverter.java 2009-05-20 07:49:38 UTC (rev 4852)
@@ -0,0 +1,58 @@
+package org.jbpm.jpdl.internal.convert.util;
+
+import java.util.Set;
+
+import org.jbpm.graph.node.TaskNode;
+import org.jbpm.instantiation.Delegation;
+import org.jbpm.jpdl4.model.Process;
+import org.jbpm.jpdl4.model.WireObjectType;
+import org.jbpm.taskmgmt.def.Task;
+import org.jbpm.graph.def.Transition;
+
+public class TaskNodeConverter {
+ public static Set<Process.Task> run(TaskNode taskNode) {
+ String taskNodeName = taskNode.getName();
+ Set<Process.Task> result = new java.util.HashSet<Process.Task>();
+ Set<Task> tasks = taskNode.getTasks();
+ Task[] taskArray = tasks.toArray(new org.jbpm.taskmgmt.def.Task[0]);
+
+ if (taskArray != null && taskArray.length > 0) {
+ for (int i = 0 ; i < taskArray.length; i++) {
+ Task tmpTask =taskArray[i];
+ Process.Task tmpNewTask = convert(tmpTask);
+ if (i ==0 ) {
+ tmpNewTask.setName(taskNodeName);
+ }
+ if (i+1 < taskArray.length) {
+ Process.Task.Transition transition = new Process.Task.Transition();
+ transition.setTo(taskArray[i+1].getName());
+ tmpNewTask.getTransition().add(transition);
+ } else {
+ //The last task node
+ for (Transition trans : taskNode.getLeavingTransitions()) {
+ tmpNewTask.getTransition().add(TransitionConverter.run(trans, Process.Task.Transition.class));
+ }
+
+ }
+ result.add(tmpNewTask);
+
+ }
+ }
+
+ return result;
+ }
+
+ private static Process.Task convert(Task task) {
+ Process.Task newTask = new Process.Task();
+ Delegation delegation = task.getAssignmentDelegation();
+ if (delegation != null) {
+ WireObjectType object = new WireObjectType();
+ object.setClazz(delegation.getClassName());
+ newTask.setAssignmentHandler(object);
+ }
+ newTask.setName(task.getName());
+ return newTask;
+
+ }
+
+}
Added: jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/util/TransitionConverter.java
===================================================================
--- jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/util/TransitionConverter.java (rev 0)
+++ jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/util/TransitionConverter.java 2009-05-20 07:49:38 UTC (rev 4852)
@@ -0,0 +1,71 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY 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 along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jbpm.jpdl.internal.convert.util;
+
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import org.jbpm.graph.def.Action;
+import org.jbpm.graph.def.Event;
+import org.jbpm.graph.def.Transition;
+import org.jbpm.jpdl4.model.JavaType;
+import org.jbpm.jpdl4.model.ObjectFactory;
+import org.jbpm.jpdl4.model.TransitionType;
+
+public class TransitionConverter {
+ public static ObjectFactory objectFactory = new ObjectFactory();
+ public static <T extends TransitionType> T run(Transition transition, Class<T> claz) {
+ TransitionType transType = null;
+ try {
+ transType = claz.newInstance();
+ } catch (Exception e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ // get the actions
+ if (transition.getEvents() != null) {
+ Iterator ite = transition.getEvents().entrySet().iterator();
+ while (ite.hasNext()) {
+ Map.Entry<Object, Event> entry = (Map.Entry<Object, Event>) ite.next();
+ if (entry.getValue().getEventType().equals(
+ Event.EVENTTYPE_TRANSITION)) {
+ if (entry.getValue().getActions() != null) {
+ for (Action action : (List<Action>) entry.getValue()
+ .getActions()) {
+ JavaType javaType = new JavaType();
+ javaType.setClazz(action.getActionDelegation()
+ .getClassName());
+ // TODO:Check this java method
+ javaType.setMethod("execute");
+ transType.getEventListenerGroup().add(
+ objectFactory.createOnJava(javaType));
+ }
+
+ }
+ }
+ }
+ }
+ transType.setTo(transition.getTo().getName());
+ return (T)transType;
+ }
+}
Modified: jbpm4/branches/jimma/modules/migration/src/test/java/org/jbpm/jpdl/internal/convert/JpdlConverterTest.java
===================================================================
--- jbpm4/branches/jimma/modules/migration/src/test/java/org/jbpm/jpdl/internal/convert/JpdlConverterTest.java 2009-05-19 15:48:44 UTC (rev 4851)
+++ jbpm4/branches/jimma/modules/migration/src/test/java/org/jbpm/jpdl/internal/convert/JpdlConverterTest.java 2009-05-20 07:49:38 UTC (rev 4852)
@@ -26,11 +26,25 @@
import org.jbpm.api.Problem;
import org.jbpm.jpdl.internal.xml.JpdlParser;
+import org.junit.Assert;
+import org.junit.Test;
-public class JpdlConverterTest extends junit.framework.TestCase {
- public void testSimpleProcessFile() throws Exception {
+public class JpdlConverterTest {
+
+ @Test
+ public void runSimpleProcessFile() throws Exception {
+ testConvert("simple.xml");
+ }
+
+ @Test
+ public void runAssignmentProcessFile() throws Exception {
+ testConvert("assignment.xml");
+ }
+
+
+ public void testConvert(String resourcefile) throws Exception {
+ URL url = getClass().getClassLoader().getResource(resourcefile);
ConverterContext context = new ConverterContext();
- URL url = getClass().getClassLoader().getResource("processdefinition.xml");
context.put(ConverterContext.PROCESS_FILE_URL, url);
//Convert to process file to jpdl4
JpdlConverter converter = new JpdlConverter(context);
@@ -38,12 +52,12 @@
Jpdl4Writer writer = new Jpdl4Writer();
java.io.ByteArrayOutputStream bout = new java.io.ByteArrayOutputStream();
writer.write(process, bout, false);
-
+
//Validate it with Jpdl4Parser
String jpdl4xml = new String(bout.toByteArray());
- List<Problem> problems = new JpdlParser().createParse().setString(
- jpdl4xml).execute().getProblems();
- assertEquals(problems.toString(), 0, problems.size());
+ List<Problem> problems = new JpdlParser().createParse().setString(jpdl4xml).execute().getProblems();
+ Assert.assertEquals(problems.toString(), 0, problems.size());
}
+
}
Added: jbpm4/branches/jimma/modules/migration/src/test/resources/assignment.xml
===================================================================
--- jbpm4/branches/jimma/modules/migration/src/test/resources/assignment.xml (rev 0)
+++ jbpm4/branches/jimma/modules/migration/src/test/resources/assignment.xml 2009-05-20 07:49:38 UTC (rev 4852)
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<process-definition
+ xmlns="urn:jbpm.org:jpdl-3.2" name="RulesAssignment">
+ <start-state name="start">
+ <transition name="" to="Approve Order Node"></transition>
+ </start-state>
+ <end-state name="end1"></end-state>
+ <task-node name="Approve Order Node">
+ <task name="ApproveOrder1">
+ <assignment class="org.jbpm.examples.assignment.RulesAssignmentHandler" >
+ <group>reviewers</group>
+ <objectNames>
+ <element>order</element>
+ </objectNames>
+ <ruleFile>/assignment/Assignment.drl</ruleFile>
+ </assignment>
+ </task>
+
+ <task name="ApproveOrder2">
+ <assignment class="org.jbpm.examples.assignment.RulesAssignmentHandler" >
+ <group>reviewers</group>
+ <objectNames>
+ <element>order</element>
+ </objectNames>
+ <ruleFile>/assignment/Assignment.drl</ruleFile>
+ </assignment>
+ </task>
+
+ <transition name="" to="end1"></transition>
+ </task-node>
+</process-definition>
Deleted: jbpm4/branches/jimma/modules/migration/src/test/resources/processdefinition.xml
===================================================================
--- jbpm4/branches/jimma/modules/migration/src/test/resources/processdefinition.xml 2009-05-19 15:48:44 UTC (rev 4851)
+++ jbpm4/branches/jimma/modules/migration/src/test/resources/processdefinition.xml 2009-05-20 07:49:38 UTC (rev 4852)
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<process-definition
- xmlns="urn:jbpm.org:jpdl-3.2"
- name="simple">
- <start-state name="start">
- <transition name="to_state" to="first">
- <action name="action" class="com.sample.action.MessageActionHandler">
- <message>Going to the first state!</message>
- </action>
- </transition>
- </start-state>
- <state name="first">
- <transition name="to_end" to="end">
- <action name="action" class="com.sample.action.MessageActionHandler">
- <message>About to finish!</message>
- </action>
- </transition>
- </state>
- <end-state name="end"></end-state>
-</process-definition>
\ No newline at end of file
Added: jbpm4/branches/jimma/modules/migration/src/test/resources/simple.xml
===================================================================
--- jbpm4/branches/jimma/modules/migration/src/test/resources/simple.xml (rev 0)
+++ jbpm4/branches/jimma/modules/migration/src/test/resources/simple.xml 2009-05-20 07:49:38 UTC (rev 4852)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<process-definition
+ xmlns="urn:jbpm.org:jpdl-3.2"
+ name="simple">
+ <start-state name="start">
+ <transition name="to_state" to="first">
+ <action name="action" class="com.sample.action.MessageActionHandler">
+ <message>Going to the first state!</message>
+ </action>
+ </transition>
+ </start-state>
+ <state name="first">
+ <transition name="to_end" to="end">
+ <action name="action" class="com.sample.action.MessageActionHandler">
+ <message>About to finish!</message>
+ </action>
+ </transition>
+ </state>
+ <end-state name="end"></end-state>
+</process-definition>
\ No newline at end of file
15 years, 4 months
- 1
- 0
JBoss JBPM SVN: r4851 - in projects/gwt-console/trunk/gui/war: src/main/java/org/jboss/bpm/console/client/process and 2 other directories.
by do-not-reply＠jboss.org
Author: heiko.braun(a)jboss.com
Date: 2009-05-19 11:48:44 -0400 (Tue, 19 May 2009)
New Revision: 4851
Modified:
projects/gwt-console/trunk/gui/war/gui-war.iml
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/DefinitionListView.java
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/InstanceListView.java
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/LoadDefinitionsAction.java
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/LoadInstancesAction.java
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/AssignedTasksView.java
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/LoadTasksAction.java
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/LoadTasksParticipationAction.java
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/OpenTasksView.java
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/ParticipantPanel.java
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/TaskDetailView.java
projects/gwt-console/trunk/gui/war/src/main/resources/org/jboss/bpm/console/public/console.css
Log:
Fix date format NPE
Modified: projects/gwt-console/trunk/gui/war/gui-war.iml
===================================================================
--- projects/gwt-console/trunk/gui/war/gui-war.iml 2009-05-19 14:39:28 UTC (rev 4850)
+++ projects/gwt-console/trunk/gui/war/gui-war.iml 2009-05-19 15:48:44 UTC (rev 4851)
@@ -208,6 +208,7 @@
<SOURCES />
</library>
</orderEntry>
+ <orderEntry type="module" module-name="gwt-rpc" />
<orderEntryProperties />
</component>
</module>
Modified: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/DefinitionListView.java
===================================================================
--- projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/DefinitionListView.java 2009-05-19 14:39:28 UTC (rev 4850)
+++ projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/DefinitionListView.java 2009-05-19 15:48:44 UTC (rev 4851)
@@ -213,7 +213,10 @@
model.add(def);
}
-
+ // clear details
+ controller.handleEvent(
+ new Event(UpdateProcessDetailAction.ID, null)
+ );
}
public ProcessDefinitionRef getSelection()
Modified: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/InstanceListView.java
===================================================================
--- projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/InstanceListView.java 2009-05-19 14:39:28 UTC (rev 4850)
+++ projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/InstanceListView.java 2009-05-19 15:48:44 UTC (rev 4851)
@@ -37,9 +37,9 @@
import org.jboss.bpm.console.client.icons.ConsoleIconBundle;
import org.jboss.bpm.console.client.model.ProcessDefinitionRef;
import org.jboss.bpm.console.client.model.ProcessInstanceRef;
+import org.jboss.bpm.console.client.model.util.SimpleDateFormat;
import java.util.List;
-import java.text.SimpleDateFormat;
/**
* @author Heiko.Braun <heiko.braun(a)jboss.com>
@@ -99,8 +99,9 @@
case 1:
listBox.setText(row, column, item.getState().toString());
break;
- case 2:
- listBox.setText(row, column, dateFormat.format(item.getStartDate()));
+ case 2:
+ String d = item.getStartDate() != null ? dateFormat.format(item.getStartDate()) : "";
+ listBox.setText(row, column, d);
break;
default:
throw new RuntimeException("Unexpected column size");
@@ -121,9 +122,10 @@
controller.handleEvent(
new Event(UpdateInstanceDetailAction.ID, item)
);
- }
+ }
}
});
+
// toolbar
final LayoutPanel toolBox = new LayoutPanel();
toolBox.setPadding(0);
@@ -308,6 +310,12 @@
if(isInitialized())
{
bindData(instances);
+
+ // clear details
+ controller.handleEvent(
+ new Event(UpdateInstanceDetailAction.ID, null)
+ );
+
}
}
Modified: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/LoadDefinitionsAction.java
===================================================================
--- projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/LoadDefinitionsAction.java 2009-05-19 14:39:28 UTC (rev 4850)
+++ projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/LoadDefinitionsAction.java 2009-05-19 15:48:44 UTC (rev 4851)
@@ -73,11 +73,6 @@
DefinitionListView view = (DefinitionListView) controller.getView(DefinitionListView.ID);
view.update(definitions);
- // clear details
- controller.handleEvent(
- new Event(UpdateProcessDetailAction.ID, null)
- );
-
ConsoleLog.info("Loaded " + definitions.size() + " process definitions");
}
else
Modified: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/LoadInstancesAction.java
===================================================================
--- projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/LoadInstancesAction.java 2009-05-19 14:39:28 UTC (rev 4850)
+++ projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/LoadInstancesAction.java 2009-05-19 15:48:44 UTC (rev 4851)
@@ -76,13 +76,8 @@
InstanceListView view = (InstanceListView) controller.getView(InstanceListView.ID);
view.update(def, instances);
- // clear details
- controller.handleEvent(
- new Event(UpdateInstanceDetailAction.ID, null)
- );
+ ConsoleLog.info("Loaded " + instances.size() + " process instance(s)");
- ConsoleLog.info("Loaded " + instances.size() + " process instances");
-
}
}
Modified: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/AssignedTasksView.java
===================================================================
--- projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/AssignedTasksView.java 2009-05-19 14:39:28 UTC (rev 4850)
+++ projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/AssignedTasksView.java 2009-05-19 15:48:44 UTC (rev 4851)
@@ -269,6 +269,11 @@
model.add(task);
}
+ // clear details
+ controller.handleEvent(
+ new Event(UpdateDetailsAction.ID, new DetailViewEvent("AssignedDetailView", null))
+ );
+
this.invalidate();
}
Modified: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/LoadTasksAction.java
===================================================================
--- projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/LoadTasksAction.java 2009-05-19 14:39:28 UTC (rev 4850)
+++ projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/LoadTasksAction.java 2009-05-19 15:48:44 UTC (rev 4851)
@@ -74,12 +74,9 @@
List<TaskRef> tasks = DTOParser.parseTaskReferenceList(response.getText());
AssignedTasksView view = (AssignedTasksView)controller.getView(AssignedTasksView.ID);
- ConsoleLog.info("Loaded " + tasks.size() + " tasks");
view.update(identity, tasks);
+
+ ConsoleLog.info("Loaded " + tasks.size() + " tasks");
- // clear details
- controller.handleEvent(
- new Event(UpdateDetailsAction.ID, new DetailViewEvent("AssignedDetailView", null))
- );
}
}
Modified: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/LoadTasksParticipationAction.java
===================================================================
--- projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/LoadTasksParticipationAction.java 2009-05-19 14:39:28 UTC (rev 4850)
+++ projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/LoadTasksParticipationAction.java 2009-05-19 15:48:44 UTC (rev 4851)
@@ -77,9 +77,5 @@
ConsoleLog.info("Loaded " + tasks.size() + " tasks");
view.update(identity, tasks);
- // details
- controller.handleEvent(
- new Event(UpdateDetailsAction.ID, new DetailViewEvent("OpenDetailView", null))
- );
}
}
Modified: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/OpenTasksView.java
===================================================================
--- projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/OpenTasksView.java 2009-05-19 14:39:28 UTC (rev 4850)
+++ projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/OpenTasksView.java 2009-05-19 15:48:44 UTC (rev 4851)
@@ -30,12 +30,12 @@
import org.gwt.mosaic.ui.client.list.DefaultListModel;
import org.jboss.bpm.console.client.icons.ConsoleIconBundle;
import org.jboss.bpm.console.client.model.TaskRef;
+import org.jboss.bpm.console.client.model.util.SimpleDateFormat;
import org.jboss.bpm.console.client.task.events.TaskIdentityEvent;
import org.jboss.bpm.console.client.task.events.DetailViewEvent;
import org.jboss.bpm.console.client.ApplicationContext;
import java.util.List;
-import java.text.SimpleDateFormat;
/**
* @author Heiko.Braun <heiko.braun(a)jboss.com>
@@ -92,7 +92,8 @@
listBox.setText(row, column, String.valueOf(item.getCurrentState()));
break;
case 3:
- listBox.setText(row, column, dateFormat.format(item.getDueDate()));
+ String d = item.getDueDate() != null ? dateFormat.format(item.getDueDate()):"";
+ listBox.setText(row, column, d);
break;
default:
throw new RuntimeException("Unexpected column size");
@@ -195,6 +196,10 @@
model.add(task);
}
+ // details
+ controller.handleEvent(
+ new Event(UpdateDetailsAction.ID, new DetailViewEvent("OpenDetailView", null))
+ );
}
Modified: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/ParticipantPanel.java
===================================================================
--- projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/ParticipantPanel.java 2009-05-19 14:39:28 UTC (rev 4850)
+++ projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/ParticipantPanel.java 2009-05-19 15:48:44 UTC (rev 4851)
@@ -109,7 +109,8 @@
}
}
);
-
+
+ assignmentBtn.setStyleName("bpm-operation-ui");
assignmentBtn.setEnabled(false);
add(assignmentBtn);
}
Modified: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/TaskDetailView.java
===================================================================
--- projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/TaskDetailView.java 2009-05-19 14:39:28 UTC (rev 4850)
+++ projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/TaskDetailView.java 2009-05-19 15:48:44 UTC (rev 4851)
@@ -92,6 +92,7 @@
// selection
final com.google.gwt.user.client.ui.ListBox dropBox = new com.google.gwt.user.client.ui.ListBox(false);
+ dropBox.setStyleName("bpm-operation-ui");
dropBox.addItem("Properties");
dropBox.addItem("Participants");
dropBox.addChangeListener(new ChangeListener() {
Modified: projects/gwt-console/trunk/gui/war/src/main/resources/org/jboss/bpm/console/public/console.css
===================================================================
--- projects/gwt-console/trunk/gui/war/src/main/resources/org/jboss/bpm/console/public/console.css 2009-05-19 14:39:28 UTC (rev 4850)
+++ projects/gwt-console/trunk/gui/war/src/main/resources/org/jboss/bpm/console/public/console.css 2009-05-19 15:48:44 UTC (rev 4851)
@@ -123,6 +123,10 @@
}
+.bpm-operation-ui {
+ font-size: 10px;
+}
+
.bpm-tools-icon {
background-image: url( images/icons/36.png)
}
15 years, 4 months
- 1
- 0
JBoss JBPM SVN: r4850 - in jbpm4/branches/idm/modules/distro: src/main/files/jboss and 1 other directory.
by do-not-reply＠jboss.org
Author: jeff.yuchang
Date: 2009-05-19 10:39:28 -0400 (Tue, 19 May 2009)
New Revision: 4850
Modified:
jbpm4/branches/idm/modules/distro/pom.xml
jbpm4/branches/idm/modules/distro/src/main/files/jboss/build.xml
Log:
update the idm groupid and build file.
Modified: jbpm4/branches/idm/modules/distro/pom.xml
===================================================================
--- jbpm4/branches/idm/modules/distro/pom.xml 2009-05-19 14:29:46 UTC (rev 4849)
+++ jbpm4/branches/idm/modules/distro/pom.xml 2009-05-19 14:39:28 UTC (rev 4850)
@@ -117,9 +117,13 @@
</dependency>
<dependency>
- <groupId>org.jboss.identity</groupId>
- <artifactId>idm</artifactId>
+ <groupId>org.jboss.identity.idm</groupId>
+ <artifactId>idm-core</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.jboss.identity.idm</groupId>
+ <artifactId>idm-hibernate</artifactId>
+ </dependency>
<!-- Please sort by groupid -->
<dependency>
Modified: jbpm4/branches/idm/modules/distro/src/main/files/jboss/build.xml
===================================================================
--- jbpm4/branches/idm/modules/distro/src/main/files/jboss/build.xml 2009-05-19 14:29:46 UTC (rev 4849)
+++ jbpm4/branches/idm/modules/distro/src/main/files/jboss/build.xml 2009-05-19 14:39:28 UTC (rev 4850)
@@ -48,6 +48,10 @@
<equals arg1="${jboss.version}" arg2="5.1.0.CR1" />
</or>
</condition>
+
+ <condition property="jbpm.identity.idm">
+ <equals arg1="${identity.component}" arg2="jboss.idm"/>
+ </condition>
<!-- ### DEMO SETUP ##################################################### -->
<target name="demo.setup"
@@ -104,6 +108,7 @@
description="installs jbpm into jboss">
<antcall target="internal.install.jbpm.into.jboss.common" />
<antcall target="internal.install.jbpm.into.jboss.500specifics" />
+ <antcall target="internal.install.jbpm.into.jboss.identity" />
<antcall target="internal.install.jbpm.into.jboss.db.${database}" />
</target>
@@ -186,6 +191,14 @@
</fileset>
</copy>
</target>
+
+ <target name="internal.install.jbpm.into.jboss.identity" if="jbpm.identity.idm">
+ <copy todir="${jboss.server.config.dir}/deploy/jbpm/jbpm-service.sar" overwrite="true">
+ <fileset dir="${jbpm.home}/jbpm.cfg.idm">
+ <include name="jbpm.cfg.xml"/>
+ </fileset>
+ </copy>
+ </target>
<!-- ### THE JBOSS INTEGRATION TEST SPECIFICS ####################### -->
<target name="internal.install.jbpm.into.jboss.integrationtestspecifics">
15 years, 4 months
- 1
- 0
JBoss JBPM SVN: r4849 - in jbpm4/trunk/modules: devguide/src/main/docbook/en/modules and 16 other directories.
by do-not-reply＠jboss.org
Author: tom.baeyens(a)jboss.com
Date: 2009-05-19 10:29:46 -0400 (Tue, 19 May 2009)
New Revision: 4849
Added:
jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch08-AdvancedJpdl.xml
jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch09-Persistence.xml
jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/examples/
jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/examples/goup/
jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/examples/goup/concurrency/
jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/examples/goup/concurrency/GroupConcurrencyTest.java
jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/examples/goup/multipleentries/
jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/examples/goup/multipleentries/MultipleEntriesTest.java
jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/examples/goup/simple/
jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/examples/goup/simple/GroupSimpleTest.java
jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/examples/goup/timer/
jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/examples/goup/timer/GroupTimerTest.java
jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/examples/
jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/examples/group/
jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/examples/group/concurrency/
jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/examples/group/concurrency/process.jpdl.xml
jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/examples/group/multipleentries/
jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/examples/group/multipleentries/process.jpdl.xml
jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/examples/group/simple/
jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/examples/group/simple/process.jpdl.xml
jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/examples/group/timer/
jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/examples/group/timer/process.jpdl.xml
Removed:
jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch08-Persistence.xml
Modified:
jbpm4/trunk/modules/devguide/src/main/docbook/en/master.xml
jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch03-Configuration.xml
jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JpdlBinding.java
jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/xml/JpdlParser.java
Log:
JBPM-2026 documented group activity in the devguide
Modified: jbpm4/trunk/modules/devguide/src/main/docbook/en/master.xml
===================================================================
--- jbpm4/trunk/modules/devguide/src/main/docbook/en/master.xml 2009-05-19 14:28:27 UTC (rev 4848)
+++ jbpm4/trunk/modules/devguide/src/main/docbook/en/master.xml 2009-05-19 14:29:46 UTC (rev 4849)
@@ -8,7 +8,8 @@
<!ENTITY ch05-ImplementingBasicActivities SYSTEM "modules/ch05-ImplementingBasicActivities.xml">
<!ENTITY ch06-ProcessAnatomy SYSTEM "modules/ch06-ProcessAnatomy.xml">
<!ENTITY ch07-ImplementingAdvancedActivities SYSTEM "modules/ch07-ImplementingAdvancedActivities.xml">
- <!ENTITY ch08-Persistence SYSTEM "modules/ch08-Persistence.xml">
+ <!ENTITY ch08-AdvancedJpdl SYSTEM "modules/ch08-AdvancedJpdl.xml">
+ <!ENTITY ch09-Persistence SYSTEM "modules/ch09-Persistence.xml">
<!ENTITY ch10-SoftwareLogging SYSTEM "modules/ch10-SoftwareLogging.xml">
<!ENTITY ch11-History SYSTEM "modules/ch11-History.xml">
]>
@@ -28,7 +29,8 @@
&ch05-ImplementingBasicActivities;
&ch06-ProcessAnatomy;
&ch07-ImplementingAdvancedActivities;
- &ch08-Persistence;
+ &ch08-AdvancedJpdl;
+ &ch09-Persistence;
&ch10-SoftwareLogging;
&ch11-History;
Modified: jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch03-Configuration.xml
===================================================================
--- jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch03-Configuration.xml 2009-05-19 14:28:27 UTC (rev 4848)
+++ jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch03-Configuration.xml 2009-05-19 14:29:46 UTC (rev 4849)
@@ -1,6 +1,13 @@
<chapter id="configuration">
<title>Configuration</title>
+ <para>The userguide explains how to install jBPM into the most
+ common runtime environments. That is the most simple and convenient
+ way to get started with jBPM. Please use those instructions.
+ These docs provide some background information for developers
+ that want to understand more about the way how configurations are
+ handled. Use at your own risk :-)
+ </para>
<para>The jbpm.jar contains a number of default configuration
files that can be imported by the user configuration file.
</para>
Added: jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch08-AdvancedJpdl.xml
===================================================================
--- jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch08-AdvancedJpdl.xml (rev 0)
+++ jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch08-AdvancedJpdl.xml 2009-05-19 14:29:46 UTC (rev 4849)
@@ -0,0 +1,314 @@
+<chapter id="advancedjpdl">
+ <title>Advanced jPDL</title>
+
+ <para>This section documents some of the more advanced activities and
+ features of jPDL that are still in incubation. Meaning these features
+ and activities are not supported yet. But they are available for you
+ to try and use. We don't give any stability guarantees on these
+ activities and features. So use at your own risk.
+ </para>
+
+ <!-- ### GROUP ########################################################## -->
+ <section id="group">
+ <title><literal>group</literal></title>
+
+ <para>A group groups a set of activities in a process. Contained groups must
+ be hierarchically nested. A group corresponds to a BPMN expanded sub process.
+ </para>
+
+ <table><title><literal>group</literal> elements:</title>
+ <tgroup cols="3" rowsep="1" colsep="1">
+ <thead>
+ <row>
+ <entry>Element</entry>
+ <entry>Multiplicity</entry>
+ <entry>Description</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>any activity</entry>
+ <entry>0..*</entry>
+ <entry>Contained activities.
+ </entry>
+ </row>
+ <row>
+ <entry><literal>transition</literal></entry>
+ <entry>0..*</entry>
+ <entry>Outgoing transitions for the group activity.
+ </entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+
+ <!-- ~~~ GROUP SIMPLE ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
+ <section id="groupsimple">
+ <title><literal>group</literal> simple</title>
+ <para>This example scenario shows the basic operations of a <literal>group</literal>.
+ </para>
+ <figure id="process.group.simple">
+ <title>The simple group example process</title>
+ <mediaobject><imageobject><imagedata align="center" fileref="images/process.group.simple.png"/></imageobject></mediaobject>
+ </figure>
+ <programlisting><process name="GroupSimple" xmlns="http://jbpm.org/4.0/jpdl">
+
+ <start>
+ <transition to="evaluate document" />
+ </start>
+
+ <emphasis role="bold"><group name="evaluate document"></emphasis>
+ <start>
+ <transition to="distribute document" />
+ </start>
+ <state name="distribute document">
+ <transition to="collect feedback" />
+ </state>
+ <state name="collect feedback">
+ <transition name="approved" to="done" />
+ <transition name="rejected" to="update document" />
+ </state>
+ <state name="update document">
+ <transition to="distribute document" />
+ </state>
+ <end name="done" />
+ <transition to="publish document" />
+ <emphasis role="bold"></group></emphasis>
+
+ <state name="publish document" />
+
+</process></programlisting>
+ <para>The next code snippet shows a test scenario that rejects a document
+ when it comes in the <literal>collect feedback</literal> first time round.
+ Then it goes through <literal>update document</literal>, <literal>distribute document</literal>
+ and back to <literal>collect feedback</literal>. The second time,
+ it will be approved. All activities involved are wait <literal>state</literal>s.
+ </para>
+ <programlisting>ProcessInstance processInstance = executionService
+ .startProcessInstanceByKey("GroupSimple");
+String pid = processInstance.getId();
+assertEquals("distribute document", processInstance.getActivityName());
+
+processInstance = executionService.signalExecutionById(pid);
+assertEquals("collect feedback", processInstance.getActivityName());
+
+processInstance = executionService.signalExecutionById(pid, "rejected");
+assertEquals("update document", processInstance.getActivityName());
+
+processInstance = executionService.signalExecutionById(pid);
+assertEquals("distribute document", processInstance.getActivityName());
+
+processInstance = executionService.signalExecutionById(pid);
+assertEquals("collect feedback", processInstance.getActivityName());
+
+processInstance = executionService.signalExecutionById(pid, "approved");
+assertEquals("publish document", processInstance.getActivityName());</programlisting>
+ </section>
+
+ <!-- ~~~ GROUP TIMER ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
+ <section id="grouptimer">
+ <title><literal>group</literal> timer</title>
+ <figure id="process.group.timer">
+ <title>The group timer example process</title>
+ <mediaobject><imageobject><imagedata align="center" fileref="images/process.group.timer.png"/></imageobject></mediaobject>
+ </figure>
+ <programlisting><process name="GroupTimer" xmlns="http://jbpm.org/4.0/jpdl">
+
+ <start>
+ <transition to="evaluate document" />
+ </start>
+
+ <emphasis role="bold"><group name="evaluate document"></emphasis>
+ <start>
+ <transition to="approve" />
+ </start>
+ <state name="approve">
+ <transition to="done" />
+ </state>
+ <end name="done" />
+
+ <transition to="publish document" />
+ <emphasis role="bold"><transition name="timeout" to="escalate">
+ <timer duedate="2 business hours" />
+ </transition></emphasis>
+
+ <emphasis role="bold"></group></emphasis>
+
+ <state name="escalate" />
+ <state name="publish document" />
+
+</process></programlisting>
+ <para>The next code snippet shows a test scenario in which the timer will
+ fire before the group activity <literal>evaluate document</literal> completes.
+ </para>
+ <programlisting>ProcessInstance processInstance = executionService
+ .startProcessInstanceByKey("GroupTimer");
+Execution approveExecution = processInstance
+ .findActiveExecutionIn("approve");
+assertNotNull(approveExecution);
+
+List<Job> jobs = managementService
+ .createJobQuery()
+ .processInstanceId(processInstance.getId())
+ .list();
+
+assertEquals(1, jobs.size());
+
+Timer timer = (Timer) jobs.get(0);
+
+managementService.executeJob(timer.getDbid());
+
+processInstance = executionService
+ .findProcessInstanceById(processInstance.getId());
+assertNotNull(processInstance.findActiveExecutionIn("escalate") );</programlisting>
+ </section>
+
+ <!-- ~~~ GROUP MULTIPLE ENTRIES ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
+ <section id="groupmultipleentries">
+ <title><literal>group</literal> multiple entries</title>
+ <para>This shows how a group can have multiple exclusive entry points.</para>
+ <para>Analogue to multiple entry points, a group can also have
+ multiple exit points.</para>
+ <figure id="process.group.multipleentries">
+ <title>The group multiple entries example process</title>
+ <mediaobject><imageobject><imagedata align="center" fileref="images/process.group.multipleentries.png"/></imageobject></mediaobject>
+ </figure>
+ <programlisting><process name="GroupMultipleEntries" xmlns="http://jbpm.org/4.0/jpdl">
+
+ <start>
+ <transition to="choose strategy" />
+ </start>
+
+ <decision name="choose strategy" expr="#{time}">
+ <emphasis role="bold"><transition name="plenty" to="play" />
+ <transition name="running out" to="plan" /></emphasis>
+ </decision>
+
+ <group name="evaluate project">
+ <emphasis role="bold"><start name="play">
+ <transition to="distribute document" />
+ </start></emphasis>
+ <state name="distribute document" />
+
+ <emphasis role="bold"><start name="plan">
+ <transition to="make planning" />
+ </start></emphasis>
+ <state name="make planning" />
+ </group>
+
+</process></programlisting>
+ <para>The following scenario will be when there is plenty of time:
+ </para>
+ <programlisting>Map<String, Object> variables = new HashMap<String, Object>();
+variables.put("time", "plenty");
+
+ProcessInstance pi = executionService
+ .startProcessInstanceByKey("GroupMultipleEntries", variables);
+
+assertNotNull(pi.findActiveExecutionIn("distribute document"));</programlisting>
+ <para>The following scenario will be when there is time is running out:
+ </para>
+ <programlisting>Map<String, Object> variables = new HashMap<String, Object>();
+variables.put("time", "running out");
+
+ProcessInstance pi = executionService
+ .startProcessInstanceByKey("GroupMultipleEntries", variables);
+
+assertNotNull(pi.findActiveExecutionIn("make planning"));</programlisting>
+ </section>
+
+ <!-- ~~~ GROUP CONCURRENCY ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
+ <section id="groupconcurrency">
+ <title><literal>group</literal> concurrency</title>
+ <para>This scenario shows how a group can be used to create concurrent paths
+ of execution. When an execution arrives in a group, each activity that doesn't
+ have incoming transitions is started. So the first activities don't have to be
+ start activities. The group takes the default transition out when all contained
+ work is done.
+ </para>
+ <figure id="process.group.concurrency">
+ <title>The group concurrency example process</title>
+ <mediaobject><imageobject><imagedata align="center" fileref="images/process.group.concurrency.png"/></imageobject></mediaobject>
+ </figure>
+ <programlisting>
+
+<process name="GroupConcurrency" xmlns="http://jbpm.org/4.0/jpdl">
+
+ <start>
+ <transition to="evaluate project" />
+ </start>
+
+ <group name="evaluate project">
+ <emphasis role="bold"><start>
+ <transition to="distribute document" />
+ </start></emphasis>
+ <state name="distribute document">
+ <transition to="collect feedback" />
+ </state>
+ <state name="collect feedback">
+ <transition to="document finished" />
+ </state>
+ <end name="document finished" />
+
+ <emphasis role="bold"><start>
+ <transition to="make planning" />
+ </start></emphasis>
+ <state name="make planning">
+ <transition to="estimate budget" />
+ </state>
+ <state name="estimate budget">
+ <transition to="planning finished" />
+ </state>
+ <end name="planning finished" />
+
+ <transition to="public project announcement" />
+ </group>
+
+ <state name="public project announcement" />
+
+</process></programlisting>
+ <para>The following scenario will show a scenario in which all
+ wait <literal>state</literal> acitivities are signalled in some random
+ order till all work is done:
+ </para>
+ <programlisting>ProcessInstance pi = executionService
+ .startProcessInstanceByKey("GroupConcurrency");
+
+String documentExecutionId = pi
+ .findActiveExecutionIn("distribute document").getId();
+
+String planningExecutionId = pi
+ .findActiveExecutionIn("make planning").getId();
+
+pi = executionService.signalExecutionById(documentExecutionId);
+assertNotNull(pi.findActiveExecutionIn("collect feedback"));
+assertNotNull(pi.findActiveExecutionIn("make planning"));
+
+pi = executionService.signalExecutionById(planningExecutionId);
+assertNotNull(pi.findActiveExecutionIn("collect feedback"));
+assertNotNull(pi.findActiveExecutionIn("estimate budget"));
+
+pi = executionService.signalExecutionById(planningExecutionId);
+assertNotNull(pi.findActiveExecutionIn("collect feedback"));
+
+pi = executionService.signalExecutionById(documentExecutionId);
+assertNotNull(pi.findActiveExecutionIn("public project announcement"));</programlisting>
+
+ </section>
+
+ <!-- ~~~ GROUP SECRET ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
+ <section id="groupsecret">
+ <title><literal>group</literal> secret</title>
+ <para>Groups also support that you create transitions over group
+ boundaries. So it's possible to have a tranition from an activity
+ outside the group directly to an activity inside the group without
+ modelling a start activity on the border of the group. Similarly
+ with transitions from activities inside the group to activities
+ outside the group. But shhhhhhhhh!
+ Don't tell anyone cause this is not BPMN compliant.
+ </para>
+ </section>
+
+ </section>
+
+</chapter>
Property changes on: jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch08-AdvancedJpdl.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Deleted: jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch08-Persistence.xml
===================================================================
--- jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch08-Persistence.xml 2009-05-19 14:28:27 UTC (rev 4848)
+++ jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch08-Persistence.xml 2009-05-19 14:29:46 UTC (rev 4849)
@@ -1,15 +0,0 @@
-<chapter id="persistence">
- <title>Persistence</title>
-
- <para>Currently jBPM's persistence is based on hibernate. But in the future we might
- switch to JPA. That is why we recommend to stick with the API as much as possible as
- the API will hide you from those changes.
- </para>
-
- <para>TODO: leveraging the db for managing concurrent access
- </para>
- <para>TODO: hibernate-session and the standard transaction
- </para>
- <para>TODO: process definition caching
- </para>
-</chapter>
\ No newline at end of file
Copied: jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch09-Persistence.xml (from rev 4838, jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch08-Persistence.xml)
===================================================================
--- jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch09-Persistence.xml (rev 0)
+++ jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch09-Persistence.xml 2009-05-19 14:29:46 UTC (rev 4849)
@@ -0,0 +1,15 @@
+<chapter id="persistence">
+ <title>Persistence</title>
+
+ <para>Currently jBPM's persistence is based on hibernate. But in the future we might
+ switch to JPA. That is why we recommend to stick with the API as much as possible as
+ the API will hide you from those changes.
+ </para>
+
+ <para>TODO: leveraging the db for managing concurrent access
+ </para>
+ <para>TODO: hibernate-session and the standard transaction
+ </para>
+ <para>TODO: process definition caching
+ </para>
+</chapter>
\ No newline at end of file
Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JpdlBinding.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JpdlBinding.java 2009-05-19 14:28:27 UTC (rev 4848)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JpdlBinding.java 2009-05-19 14:29:46 UTC (rev 4849)
@@ -21,14 +21,9 @@
*/
package org.jbpm.jpdl.internal.activity;
-import java.util.List;
-import org.jbpm.api.model.Event;
import org.jbpm.jpdl.internal.xml.JpdlParser;
-import org.jbpm.jpdl.internal.xml.UnresolvedTransitions;
import org.jbpm.pvm.internal.model.ActivityImpl;
-import org.jbpm.pvm.internal.model.TimerDefinitionImpl;
-import org.jbpm.pvm.internal.model.TransitionImpl;
import org.jbpm.pvm.internal.util.TagBinding;
import org.jbpm.pvm.internal.util.XmlUtil;
import org.jbpm.pvm.internal.wire.xml.WireParser;
@@ -66,29 +61,4 @@
public boolean isNameRequired() {
return true;
}
-
- public void parseTransitions(Element element, ActivityImpl activity, Parse parse, JpdlParser jpdlParser) {
- List<Element> transitionElements = XmlUtil.elements(element, "transition");
- UnresolvedTransitions unresolvedTransitions = parse.findObject(UnresolvedTransitions.class);
- for (Element transitionElement: transitionElements) {
- String transitionName = XmlUtil.attribute(transitionElement, "name", false, parse);
-
- Element timerElement = XmlUtil.element(transitionElement, "timer");
- if (timerElement!=null) {
- if (transitionName!=null) {
- TimerDefinitionImpl timerDefinitionImpl = jpdlParser.parseTimerDefinition(timerElement, parse, activity);
- timerDefinitionImpl.setSignalName(transitionName);
- } else {
- parse.addProblem("a transition name is required when a timer is placed on a transition", null, "error", element);
- }
- }
-
- TransitionImpl transition = activity.createOutgoingTransition();
- transition.setName(transitionName);
-
- unresolvedTransitions.add(transition, transitionElement);
-
- jpdlParser.parseOnEvent(transitionElement, transition, Event.TAKE, parse);
- }
- }
}
Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/xml/JpdlParser.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/xml/JpdlParser.java 2009-05-19 14:28:27 UTC (rev 4848)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/xml/JpdlParser.java 2009-05-19 14:29:46 UTC (rev 4849)
@@ -34,6 +34,7 @@
import org.jbpm.api.activity.ActivityBehaviour;
import org.jbpm.api.env.Environment;
import org.jbpm.api.listener.EventListener;
+import org.jbpm.api.model.Event;
import org.jbpm.internal.log.Log;
import org.jbpm.jpdl.internal.activity.JpdlBinding;
import org.jbpm.jpdl.internal.model.JpdlProcessDefinition;
@@ -235,7 +236,7 @@
try {
activity.setType(activityBinding.getTagName());
activityBinding.parseName(nestedElement, activity, parse);
- activityBinding.parseTransitions(nestedElement, activity, parse, this);
+ parseTransitions(nestedElement, activity, parse);
if (XmlUtil.attributeBoolean(nestedElement, "async", false, parse, Boolean.FALSE)) {
activity.setAsync(true);
@@ -360,6 +361,27 @@
}
}
+ public void parseTransitions(Element element, ActivityImpl activity, Parse parse) {
+ List<Element> transitionElements = XmlUtil.elements(element, "transition");
+ UnresolvedTransitions unresolvedTransitions = parse.findObject(UnresolvedTransitions.class);
+ for (Element transitionElement: transitionElements) {
+ String transitionName = XmlUtil.attribute(transitionElement, "name", false, parse);
+
+ Element timerElement = XmlUtil.element(transitionElement, "timer");
+ if (timerElement!=null) {
+ TimerDefinitionImpl timerDefinitionImpl = parseTimerDefinition(timerElement, parse, activity);
+ timerDefinitionImpl.setSignalName(transitionName);
+ }
+
+ TransitionImpl transition = activity.createOutgoingTransition();
+ transition.setName(transitionName);
+
+ unresolvedTransitions.add(transition, transitionElement);
+
+ parseOnEvent(transitionElement, transition, Event.TAKE, parse);
+ }
+ }
+
public static void parseAssignmentAttributes(Element element, AssignableDefinitionImpl assignableDefinition, Parse parse) {
Element descriptionElement = XmlUtil.element(element, "description");
if (descriptionElement!=null) {
Added: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/examples/goup/concurrency/GroupConcurrencyTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/examples/goup/concurrency/GroupConcurrencyTest.java (rev 0)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/examples/goup/concurrency/GroupConcurrencyTest.java 2009-05-19 14:29:46 UTC (rev 4849)
@@ -0,0 +1,73 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY 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 along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jbpm.examples.goup.concurrency;
+
+import org.jbpm.api.ProcessInstance;
+import org.jbpm.test.JbpmTestCase;
+
+
+/**
+ * @author Tom Baeyens
+ */
+public class GroupConcurrencyTest extends JbpmTestCase {
+
+ long deploymentDbid;
+
+ protected void setUp() throws Exception {
+ super.setUp();
+
+ deploymentDbid = repositoryService.createDeployment()
+ .addResourceFromClasspath("org/jbpm/examples/group/concurrency/process.jpdl.xml")
+ .deploy();
+ }
+
+ protected void tearDown() throws Exception {
+ repositoryService.deleteDeploymentCascade(deploymentDbid);
+
+ super.tearDown();
+ }
+
+ public void testOneFeedbackLoop() {
+ ProcessInstance pi = executionService
+ .startProcessInstanceByKey("GroupConcurrency");
+
+ String documentExecutionId = pi
+ .findActiveExecutionIn("distribute document").getId();
+
+ String planningExecutionId = pi
+ .findActiveExecutionIn("make planning").getId();
+
+ pi = executionService.signalExecutionById(documentExecutionId);
+ assertNotNull(pi.findActiveExecutionIn("collect feedback"));
+ assertNotNull(pi.findActiveExecutionIn("make planning"));
+
+ pi = executionService.signalExecutionById(planningExecutionId);
+ assertNotNull(pi.findActiveExecutionIn("collect feedback"));
+ assertNotNull(pi.findActiveExecutionIn("estimate budget"));
+
+ pi = executionService.signalExecutionById(planningExecutionId);
+ assertNotNull(pi.findActiveExecutionIn("collect feedback"));
+
+ pi = executionService.signalExecutionById(documentExecutionId);
+ assertNotNull(pi.findActiveExecutionIn("public project announcement"));
+ }
+}
Property changes on: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/examples/goup/concurrency/GroupConcurrencyTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/examples/goup/multipleentries/MultipleEntriesTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/examples/goup/multipleentries/MultipleEntriesTest.java (rev 0)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/examples/goup/multipleentries/MultipleEntriesTest.java 2009-05-19 14:29:46 UTC (rev 4849)
@@ -0,0 +1,72 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY 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 along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jbpm.examples.goup.multipleentries;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.jbpm.api.ProcessInstance;
+import org.jbpm.test.JbpmTestCase;
+
+
+/**
+ * @author Tom Baeyens
+ */
+public class MultipleEntriesTest extends JbpmTestCase {
+
+
+ long deploymentDbid;
+
+ protected void setUp() throws Exception {
+ super.setUp();
+
+ deploymentDbid = repositoryService.createDeployment()
+ .addResourceFromClasspath("org/jbpm/examples/group/multipleentries/process.jpdl.xml")
+ .deploy();
+ }
+
+ protected void tearDown() throws Exception {
+ repositoryService.deleteDeploymentCascade(deploymentDbid);
+
+ super.tearDown();
+ }
+
+ public void testPlentyOfTime() {
+ Map<String, Object> variables = new HashMap<String, Object>();
+ variables.put("time", "plenty");
+
+ ProcessInstance pi = executionService
+ .startProcessInstanceByKey("GroupMultipleEntries", variables);
+
+ assertNotNull(pi.findActiveExecutionIn("distribute document"));
+ }
+
+ public void testTimeIsRunningOut() {
+ Map<String, Object> variables = new HashMap<String, Object>();
+ variables.put("time", "running out");
+
+ ProcessInstance pi = executionService
+ .startProcessInstanceByKey("GroupMultipleEntries", variables);
+
+ assertNotNull(pi.findActiveExecutionIn("make planning"));
+ }
+}
Property changes on: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/examples/goup/multipleentries/MultipleEntriesTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/examples/goup/simple/GroupSimpleTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/examples/goup/simple/GroupSimpleTest.java (rev 0)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/examples/goup/simple/GroupSimpleTest.java 2009-05-19 14:29:46 UTC (rev 4849)
@@ -0,0 +1,72 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY 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 along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jbpm.examples.goup.simple;
+
+import org.jbpm.api.ProcessInstance;
+import org.jbpm.test.JbpmTestCase;
+
+
+/**
+ * @author Tom Baeyens
+ */
+/**
+ * @author Tom Baeyens
+ */
+public class GroupSimpleTest extends JbpmTestCase {
+
+ long deploymentDbid;
+
+ protected void setUp() throws Exception {
+ super.setUp();
+
+ deploymentDbid = repositoryService.createDeployment()
+ .addResourceFromClasspath("org/jbpm/examples/group/simple/process.jpdl.xml")
+ .deploy();
+ }
+
+ protected void tearDown() throws Exception {
+ repositoryService.deleteDeploymentCascade(deploymentDbid);
+
+ super.tearDown();
+ }
+
+ public void testOneFeedbackLoop() {
+ ProcessInstance processInstance = executionService.startProcessInstanceByKey("GroupSimple");
+ String pid = processInstance.getId();
+ assertEquals("distribute document", processInstance.getActivityName());
+
+ processInstance = executionService.signalExecutionById(pid);
+ assertEquals("collect feedback", processInstance.getActivityName());
+
+ processInstance = executionService.signalExecutionById(pid, "rejected");
+ assertEquals("update document", processInstance.getActivityName());
+
+ processInstance = executionService.signalExecutionById(pid);
+ assertEquals("distribute document", processInstance.getActivityName());
+
+ processInstance = executionService.signalExecutionById(pid);
+ assertEquals("collect feedback", processInstance.getActivityName());
+
+ processInstance = executionService.signalExecutionById(pid, "approved");
+ assertEquals("publish document", processInstance.getActivityName());
+ }
+}
Property changes on: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/examples/goup/simple/GroupSimpleTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/examples/goup/timer/GroupTimerTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/examples/goup/timer/GroupTimerTest.java (rev 0)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/examples/goup/timer/GroupTimerTest.java 2009-05-19 14:29:46 UTC (rev 4849)
@@ -0,0 +1,74 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY 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 along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jbpm.examples.goup.timer;
+
+import java.util.List;
+
+import org.jbpm.api.Execution;
+import org.jbpm.api.ProcessInstance;
+import org.jbpm.api.job.Job;
+import org.jbpm.api.job.Timer;
+import org.jbpm.test.JbpmTestCase;
+
+
+/**
+ * @author Tom Baeyens
+ */
+public class GroupTimerTest extends JbpmTestCase {
+
+ long deploymentDbid;
+
+ protected void setUp() throws Exception {
+ super.setUp();
+
+ deploymentDbid = repositoryService.createDeployment()
+ .addResourceFromClasspath("org/jbpm/examples/group/timer/process.jpdl.xml")
+ .deploy();
+ }
+
+ protected void tearDown() throws Exception {
+ repositoryService.deleteDeploymentCascade(deploymentDbid);
+
+ super.tearDown();
+ }
+
+ public void testGroupTimerFires() {
+ ProcessInstance processInstance = executionService.startProcessInstanceByKey("GroupTimer");
+ Execution approveExecution = processInstance.findActiveExecutionIn("approve");
+ assertNotNull(approveExecution);
+
+ List<Job> jobs = managementService
+ .createJobQuery()
+ .processInstanceId(processInstance.getId())
+ .list();
+
+ assertEquals(1, jobs.size());
+
+ Timer timer = (Timer) jobs.get(0);
+
+ managementService.executeJob(timer.getDbid());
+
+ processInstance = executionService.findProcessInstanceById(processInstance.getId());
+ assertNotNull(processInstance.findActiveExecutionIn("escalate") );
+ }
+
+}
Property changes on: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/examples/goup/timer/GroupTimerTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/examples/group/concurrency/process.jpdl.xml
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/examples/group/concurrency/process.jpdl.xml (rev 0)
+++ jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/examples/group/concurrency/process.jpdl.xml 2009-05-19 14:29:46 UTC (rev 4849)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<process name="GroupConcurrency" xmlns="http://jbpm.org/4.0/jpdl">
+
+ <start>
+ <transition to="evaluate project" />
+ </start>
+
+ <group name="evaluate project">
+ <start>
+ <transition to="distribute document" />
+ </start>
+ <state name="distribute document">
+ <transition to="collect feedback" />
+ </state>
+ <state name="collect feedback">
+ <transition to="document finished" />
+ </state>
+ <end name="document finished" />
+
+ <start>
+ <transition to="make planning" />
+ </start>
+ <state name="make planning">
+ <transition to="estimate budget" />
+ </state>
+ <state name="estimate budget">
+ <transition to="planning finished" />
+ </state>
+ <end name="planning finished" />
+
+ <transition to="public project announcement" />
+ </group>
+
+ <state name="public project announcement" />
+
+</process>
Property changes on: jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/examples/group/concurrency/process.jpdl.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/examples/group/multipleentries/process.jpdl.xml
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/examples/group/multipleentries/process.jpdl.xml (rev 0)
+++ jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/examples/group/multipleentries/process.jpdl.xml 2009-05-19 14:29:46 UTC (rev 4849)
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<process name="GroupMultipleEntries" xmlns="http://jbpm.org/4.0/jpdl">
+
+ <start>
+ <transition to="choose strategy" />
+ </start>
+
+ <decision name="choose strategy" expr="#{time}">
+ <transition name="plenty" to="play" />
+ <transition name="running out" to="plan" />
+ </decision>
+
+ <group name="evaluate project">
+ <start name="play">
+ <transition to="distribute document" />
+ </start>
+ <state name="distribute document" />
+
+ <start name="plan">
+ <transition to="make planning" />
+ </start>
+ <state name="make planning" />
+ </group>
+
+</process>
Property changes on: jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/examples/group/multipleentries/process.jpdl.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/examples/group/simple/process.jpdl.xml
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/examples/group/simple/process.jpdl.xml (rev 0)
+++ jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/examples/group/simple/process.jpdl.xml 2009-05-19 14:29:46 UTC (rev 4849)
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<process name="GroupSimple" xmlns="http://jbpm.org/4.0/jpdl">
+
+ <start>
+ <transition to="evaluate document" />
+ </start>
+
+ <group name="evaluate document">
+ <start>
+ <transition to="distribute document" />
+ </start>
+ <state name="distribute document">
+ <transition to="collect feedback" />
+ </state>
+ <state name="collect feedback">
+ <transition name="approved" to="done" />
+ <transition name="rejected" to="update document" />
+ </state>
+ <state name="update document">
+ <transition to="distribute document" />
+ </state>
+ <end name="done" />
+ <transition to="publish document" />
+ </group>
+
+ <state name="publish document" />
+
+</process>
Property changes on: jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/examples/group/simple/process.jpdl.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/examples/group/timer/process.jpdl.xml
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/examples/group/timer/process.jpdl.xml (rev 0)
+++ jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/examples/group/timer/process.jpdl.xml 2009-05-19 14:29:46 UTC (rev 4849)
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<process name="GroupTimer" xmlns="http://jbpm.org/4.0/jpdl">
+
+ <start>
+ <transition to="evaluate document" />
+ </start>
+
+ <group name="evaluate document">
+ <start>
+ <transition to="approve" />
+ </start>
+ <state name="approve">
+ <transition to="done" />
+ </state>
+ <end name="done" />
+
+ <transition to="publish document" />
+ <transition name="timeout" to="escalate">
+ <timer duedate="2 business hours" />
+ </transition>
+ </group>
+
+ <state name="escalate" />
+ <state name="publish document" />
+
+</process>
Property changes on: jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/examples/group/timer/process.jpdl.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
15 years, 4 months
- 1
- 0
JBoss JBPM SVN: r4848 - in projects/gwt-console/trunk: gui/war/src/main/java/org/jboss/bpm/console/client/process and 1 other directories.
by do-not-reply＠jboss.org
Author: heiko.braun(a)jboss.com
Date: 2009-05-19 10:28:27 -0400 (Tue, 19 May 2009)
New Revision: 4848
Modified:
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/DefinitionListView.java
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/InstanceListView.java
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/AssignedTasksView.java
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/OpenTasksView.java
projects/gwt-console/trunk/gwt-parent.iml
Log:
Cleanup detail panel event handling
Modified: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/DefinitionListView.java
===================================================================
--- projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/DefinitionListView.java 2009-05-19 14:04:18 UTC (rev 4847)
+++ projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/DefinitionListView.java 2009-05-19 14:28:27 UTC (rev 4848)
@@ -122,18 +122,7 @@
item
)
);
- }
- else
- {
- if(isInitialized())
- {
- // clear details
- controller.handleEvent(
- new Event(UpdateProcessDetailAction.ID, null)
- );
- }
- }
-
+ }
}
});
Modified: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/InstanceListView.java
===================================================================
--- projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/InstanceListView.java 2009-05-19 14:04:18 UTC (rev 4847)
+++ projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/InstanceListView.java 2009-05-19 14:28:27 UTC (rev 4848)
@@ -121,17 +121,7 @@
controller.handleEvent(
new Event(UpdateInstanceDetailAction.ID, item)
);
- }
- else
- {
- if(isInitialized()) // first call don't have a controller association
- {
- controller.handleEvent(
- new Event(UpdateInstanceDetailAction.ID, null)
- );
- }
- }
-
+ }
}
});
// toolbar
Modified: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/AssignedTasksView.java
===================================================================
--- projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/AssignedTasksView.java 2009-05-19 14:04:18 UTC (rev 4847)
+++ projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/AssignedTasksView.java 2009-05-19 14:28:27 UTC (rev 4848)
@@ -115,14 +115,7 @@
controller.handleEvent(
new Event(UpdateDetailsAction.ID, new DetailViewEvent("AssignedDetailView", task))
);
- }
- else
- {
- // clear details
- controller.handleEvent(
- new Event(UpdateDetailsAction.ID, new DetailViewEvent("AssignedDetailView", null))
- );
- }
+ }
}
}
);
Modified: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/OpenTasksView.java
===================================================================
--- projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/OpenTasksView.java 2009-05-19 14:04:18 UTC (rev 4847)
+++ projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/OpenTasksView.java 2009-05-19 14:28:27 UTC (rev 4848)
@@ -112,16 +112,7 @@
controller.handleEvent(
new Event(UpdateDetailsAction.ID, new DetailViewEvent("OpenDetailView", task))
);
- }
- else
- {
- if(isInitialized())
- {
- controller.handleEvent(
- new Event(UpdateDetailsAction.ID, new DetailViewEvent("OpenDetailView", null))
- );
- }
- }
+ }
}
}
);
Modified: projects/gwt-console/trunk/gwt-parent.iml
===================================================================
--- projects/gwt-console/trunk/gwt-parent.iml 2009-05-19 14:04:18 UTC (rev 4847)
+++ projects/gwt-console/trunk/gwt-parent.iml 2009-05-19 14:28:27 UTC (rev 4848)
@@ -87,15 +87,6 @@
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic-dnd:jar:0.1.9:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic-dnd/0.1.9/gwt-mosaic-dnd-0.1.9.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
<library name="M2 Dep: com.google.gwt:gwt-user:jar:1.5.3:provided">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/google/gwt/gwt-user/1.5.3/gwt-user-1.5.3.jar!/" />
@@ -114,33 +105,6 @@
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic-incubator:jar:0.1.9:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic-incubator/0.1.9/gwt-mosaic-incubator-0.1.9.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic:jar:0.1.9:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic/0.1.9/gwt-mosaic-0.1.9.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic-gwtx:jar:0.1.9:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic-gwtx/0.1.9/gwt-mosaic-gwtx-0.1.9.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
<library name="M2 Dep: com.googlecode.mvc4g:mvc4g:jar:1.0.0-jboss:compile">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/googlecode/mvc4g/mvc4g/1.0.0-jboss/mvc4g-1.0.0-jboss.jar!/" />
15 years, 4 months
- 1
- 0
JBoss JBPM SVN: r4847 - in projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client: task and 1 other directory.
by do-not-reply＠jboss.org
Author: heiko.braun(a)jboss.com
Date: 2009-05-19 10:04:18 -0400 (Tue, 19 May 2009)
New Revision: 4847
Modified:
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/DefinitionListView.java
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/DeleteInstanceAction.java
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/InstanceDetailView.java
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/LoadDefinitionsAction.java
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/LoadInstancesAction.java
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/ProcessDetailView.java
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/StateChangeAction.java
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/UpdateInstanceDetailAction.java
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/UpdateProcessDetailAction.java
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/AssignedTasksView.java
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/LoadTasksAction.java
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/LoadTasksParticipationAction.java
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/OpenTasksView.java
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/ParticipantPanel.java
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/TaskDetailView.java
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/UpdateDetailsAction.java
Log:
Replace clear() with clearView(). Use controller to clear detail panels
Modified: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/DefinitionListView.java
===================================================================
--- projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/DefinitionListView.java 2009-05-19 10:32:53 UTC (rev 4846)
+++ projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/DefinitionListView.java 2009-05-19 14:04:18 UTC (rev 4847)
@@ -21,24 +21,21 @@
*/
package org.jboss.bpm.console.client.process;
+import com.google.gwt.core.client.GWT;
import com.google.gwt.user.client.ui.ChangeListener;
import com.google.gwt.user.client.ui.ClickListener;
import com.google.gwt.user.client.ui.Widget;
-import com.google.gwt.core.client.GWT;
import com.mvc4g.client.Controller;
import com.mvc4g.client.Event;
-import com.mvc4g.client.ViewInterface;
import org.gwt.mosaic.ui.client.ListBox;
+import org.gwt.mosaic.ui.client.MessageBox;
import org.gwt.mosaic.ui.client.ToolBar;
import org.gwt.mosaic.ui.client.ToolButton;
-import org.gwt.mosaic.ui.client.MessageBox;
import org.gwt.mosaic.ui.client.layout.*;
import org.gwt.mosaic.ui.client.list.DefaultListModel;
-import org.jboss.bpm.console.client.model.ProcessDefinitionRef;
-import org.jboss.bpm.console.client.LazyPanel;
-import org.jboss.bpm.console.client.util.ConsoleLog;
-import org.jboss.bpm.console.client.icons.ConsoleIconBundle;
import org.jboss.bpm.console.client.common.AbstractView;
+import org.jboss.bpm.console.client.icons.ConsoleIconBundle;
+import org.jboss.bpm.console.client.model.ProcessDefinitionRef;
import java.util.List;
@@ -130,7 +127,7 @@
{
if(isInitialized())
{
- // update details
+ // clear details
controller.handleEvent(
new Event(UpdateProcessDetailAction.ID, null)
);
@@ -226,6 +223,8 @@
{
model.add(def);
}
+
+
}
public ProcessDefinitionRef getSelection()
Modified: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/DeleteInstanceAction.java
===================================================================
--- projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/DeleteInstanceAction.java 2009-05-19 10:32:53 UTC (rev 4846)
+++ projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/DeleteInstanceAction.java 2009-05-19 14:04:18 UTC (rev 4847)
@@ -61,14 +61,14 @@
public void handleSuccessfulResponse(final Controller controller, final Object event, Response response)
{
- DefinitionListView view = (DefinitionListView)controller.getView(DefinitionListView.ID);
- ProcessDefinitionRef proc = view.getSelection();
+ InstanceListView view = (InstanceListView) controller.getView(InstanceListView.ID);
+ ProcessDefinitionRef def = view.getCurrentDefinition();
// refresh instances
controller.handleEvent(
new Event(
LoadInstancesAction.ID,
- proc
+ def
)
);
}
Modified: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/InstanceDetailView.java
===================================================================
--- projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/InstanceDetailView.java 2009-05-19 10:32:53 UTC (rev 4846)
+++ projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/InstanceDetailView.java 2009-05-19 14:04:18 UTC (rev 4847)
@@ -71,7 +71,7 @@
grid.update(values);
}
- public void clear()
+ public void clearView()
{
grid.clear();
this.currentInstance = null;
Modified: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/LoadDefinitionsAction.java
===================================================================
--- projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/LoadDefinitionsAction.java 2009-05-19 10:32:53 UTC (rev 4846)
+++ projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/LoadDefinitionsAction.java 2009-05-19 14:04:18 UTC (rev 4847)
@@ -26,6 +26,7 @@
import com.google.gwt.json.client.JSONParser;
import com.google.gwt.json.client.JSONValue;
import com.mvc4g.client.Controller;
+import com.mvc4g.client.Event;
import org.jboss.bpm.console.client.ApplicationContext;
import org.jboss.bpm.console.client.util.ConsoleLog;
import org.jboss.bpm.console.client.common.AbstractRESTAction;
@@ -72,6 +73,11 @@
DefinitionListView view = (DefinitionListView) controller.getView(DefinitionListView.ID);
view.update(definitions);
+ // clear details
+ controller.handleEvent(
+ new Event(UpdateProcessDetailAction.ID, null)
+ );
+
ConsoleLog.info("Loaded " + definitions.size() + " process definitions");
}
else
Modified: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/LoadInstancesAction.java
===================================================================
--- projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/LoadInstancesAction.java 2009-05-19 10:32:53 UTC (rev 4846)
+++ projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/LoadInstancesAction.java 2009-05-19 14:04:18 UTC (rev 4847)
@@ -26,6 +26,7 @@
import com.google.gwt.json.client.JSONParser;
import com.google.gwt.json.client.JSONValue;
import com.mvc4g.client.Controller;
+import com.mvc4g.client.Event;
import org.jboss.bpm.console.client.ApplicationContext;
import org.jboss.bpm.console.client.util.ConsoleLog;
import org.jboss.bpm.console.client.common.AbstractRESTAction;
@@ -75,6 +76,11 @@
InstanceListView view = (InstanceListView) controller.getView(InstanceListView.ID);
view.update(def, instances);
+ // clear details
+ controller.handleEvent(
+ new Event(UpdateInstanceDetailAction.ID, null)
+ );
+
ConsoleLog.info("Loaded " + instances.size() + " process instances");
}
Modified: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/ProcessDetailView.java
===================================================================
--- projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/ProcessDetailView.java 2009-05-19 10:32:53 UTC (rev 4846)
+++ projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/ProcessDetailView.java 2009-05-19 14:04:18 UTC (rev 4847)
@@ -72,7 +72,7 @@
grid.update(values);
}
- public void clear()
+ public void clearView()
{
grid.clear();
this.currentProcess = null;
Modified: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/StateChangeAction.java
===================================================================
--- projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/StateChangeAction.java 2009-05-19 10:32:53 UTC (rev 4846)
+++ projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/StateChangeAction.java 2009-05-19 14:04:18 UTC (rev 4847)
@@ -65,8 +65,7 @@
public void handleSuccessfulResponse(final Controller controller, final Object event, Response response)
{
- InstanceListView view = (InstanceListView)
- controller.getView(InstanceListView.ID);
+ InstanceListView view = (InstanceListView) controller.getView(InstanceListView.ID);
ProcessDefinitionRef def = view.getCurrentDefinition();
// force reload instance list
Modified: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/UpdateInstanceDetailAction.java
===================================================================
--- projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/UpdateInstanceDetailAction.java 2009-05-19 10:32:53 UTC (rev 4846)
+++ projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/UpdateInstanceDetailAction.java 2009-05-19 14:04:18 UTC (rev 4847)
@@ -40,6 +40,6 @@
if(instance!=null)
view.update(instance);
else
- view.clear();
+ view.clearView();
}
}
Modified: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/UpdateProcessDetailAction.java
===================================================================
--- projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/UpdateProcessDetailAction.java 2009-05-19 10:32:53 UTC (rev 4846)
+++ projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/UpdateProcessDetailAction.java 2009-05-19 14:04:18 UTC (rev 4847)
@@ -40,6 +40,6 @@
if(process!=null)
view.update(process);
else
- view.clear();
+ view.clearView();
}
}
Modified: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/AssignedTasksView.java
===================================================================
--- projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/AssignedTasksView.java 2009-05-19 10:32:53 UTC (rev 4846)
+++ projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/AssignedTasksView.java 2009-05-19 14:04:18 UTC (rev 4847)
@@ -63,7 +63,7 @@
super();
this.appContext = appContext;
ConsoleIconBundle icons = GWT.create(ConsoleIconBundle.class);
- setTitle("Your Tasks");
+ setTitle("Personal Tasks");
setIcon(icons.userIcon());
this.detailsView = detailsView;
@@ -118,6 +118,7 @@
}
else
{
+ // clear details
controller.handleEvent(
new Event(UpdateDetailsAction.ID, new DetailViewEvent("AssignedDetailView", null))
);
@@ -273,7 +274,9 @@
{
if(TaskRef.STATE.ASSIGNED ==task.getCurrentState())
model.add(task);
- }
+ }
+
+ this.invalidate();
}
}
Modified: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/LoadTasksAction.java
===================================================================
--- projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/LoadTasksAction.java 2009-05-19 10:32:53 UTC (rev 4846)
+++ projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/LoadTasksAction.java 2009-05-19 14:04:18 UTC (rev 4847)
@@ -23,12 +23,14 @@
import org.jboss.bpm.console.client.common.AbstractRESTAction;
import org.jboss.bpm.console.client.ApplicationContext;
+import org.jboss.bpm.console.client.task.events.DetailViewEvent;
import org.jboss.bpm.console.client.util.ConsoleLog;
import org.jboss.bpm.console.client.model.DTOParser;
import org.jboss.bpm.console.client.model.TaskRef;
import com.google.gwt.http.client.RequestBuilder;
import com.google.gwt.http.client.Response;
import com.mvc4g.client.Controller;
+import com.mvc4g.client.Event;
import java.util.List;
@@ -74,5 +76,10 @@
ConsoleLog.info("Loaded " + tasks.size() + " tasks");
view.update(identity, tasks);
+
+ // clear details
+ controller.handleEvent(
+ new Event(UpdateDetailsAction.ID, new DetailViewEvent("AssignedDetailView", null))
+ );
}
}
Modified: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/LoadTasksParticipationAction.java
===================================================================
--- projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/LoadTasksParticipationAction.java 2009-05-19 10:32:53 UTC (rev 4846)
+++ projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/LoadTasksParticipationAction.java 2009-05-19 14:04:18 UTC (rev 4847)
@@ -23,12 +23,14 @@
import org.jboss.bpm.console.client.common.AbstractRESTAction;
import org.jboss.bpm.console.client.ApplicationContext;
+import org.jboss.bpm.console.client.task.events.DetailViewEvent;
import org.jboss.bpm.console.client.util.ConsoleLog;
import org.jboss.bpm.console.client.model.DTOParser;
import org.jboss.bpm.console.client.model.TaskRef;
import com.google.gwt.http.client.RequestBuilder;
import com.google.gwt.http.client.Response;
import com.mvc4g.client.Controller;
+import com.mvc4g.client.Event;
import java.util.List;
@@ -73,6 +75,11 @@
OpenTasksView view = (OpenTasksView)controller.getView(OpenTasksView.ID);
ConsoleLog.info("Loaded " + tasks.size() + " tasks");
- view.update(identity, tasks);
+ view.update(identity, tasks);
+
+ // details
+ controller.handleEvent(
+ new Event(UpdateDetailsAction.ID, new DetailViewEvent("OpenDetailView", null))
+ );
}
}
Modified: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/OpenTasksView.java
===================================================================
--- projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/OpenTasksView.java 2009-05-19 10:32:53 UTC (rev 4846)
+++ projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/OpenTasksView.java 2009-05-19 14:04:18 UTC (rev 4847)
@@ -57,7 +57,7 @@
this.appContext = appContext;
ConsoleIconBundle icons = GWT.create(ConsoleIconBundle.class);
- setTitle("Open Tasks");
+ setTitle("Group Tasks");
setIcon(icons.taskIcon());
this.detailsView = detailView;
Modified: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/ParticipantPanel.java
===================================================================
--- projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/ParticipantPanel.java 2009-05-19 10:32:53 UTC (rev 4846)
+++ projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/ParticipantPanel.java 2009-05-19 14:04:18 UTC (rev 4847)
@@ -147,7 +147,7 @@
this.invalidate();
}
- public void clear()
+ public void clearView()
{
tree.clear();
currentTask = null;
Modified: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/TaskDetailView.java
===================================================================
--- projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/TaskDetailView.java 2009-05-19 10:32:53 UTC (rev 4846)
+++ projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/TaskDetailView.java 2009-05-19 14:04:18 UTC (rev 4847)
@@ -30,6 +30,7 @@
import org.gwt.mosaic.ui.client.DeckLayoutPanel;
import org.gwt.mosaic.ui.client.layout.BoxLayout;
import org.gwt.mosaic.ui.client.layout.BoxLayoutData;
+import org.gwt.mosaic.ui.client.layout.LayoutPanel;
import org.jboss.bpm.console.client.common.PropertyGrid;
import org.jboss.bpm.console.client.model.TaskRef;
import org.jboss.bpm.console.client.LazyPanel;
@@ -57,8 +58,7 @@
{
// render
- super("Task details");
- this.setLayout(new BoxLayout(BoxLayout.Orientation.VERTICAL));
+ super("Task details");
super.setStyleName("bpm-detail-panel");
@@ -110,7 +110,9 @@
}
else
{
- this.add(grid);
+ LayoutPanel p = new LayoutPanel();
+ p.add(grid);
+ this.add(p);
}
this.initialzed = true;
@@ -139,13 +141,14 @@
participantPanel.update(task);
}
- public void clear()
+ public void clearView()
{
- currentTask = null;
grid.clear();
if(openView && participantPanel !=null) // event handling is broken. The change listener fires too early
- participantPanel.clear();
+ participantPanel.clearView();
+
+ currentTask = null;
}
}
Modified: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/UpdateDetailsAction.java
===================================================================
--- projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/UpdateDetailsAction.java 2009-05-19 10:32:53 UTC (rev 4846)
+++ projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/UpdateDetailsAction.java 2009-05-19 14:04:18 UTC (rev 4847)
@@ -43,6 +43,6 @@
if(task!=null)
view.update(task);
else
- view.clear();
+ view.clearView();
}
}
15 years, 4 months
- 1
- 0
JBoss JBPM SVN: r4846 - in jbpm4/trunk/modules: examples and 7 other directories.
by do-not-reply＠jboss.org
Author: heiko.braun(a)jboss.com
Date: 2009-05-19 06:32:53 -0400 (Tue, 19 May 2009)
New Revision: 4846
Modified:
jbpm4/trunk/modules/db/jbpm4-db.iml
jbpm4/trunk/modules/examples/jbpm4-examples.iml
jbpm4/trunk/modules/integration/console/integration-console.iml
jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/ProcessManagementImpl.java
jbpm4/trunk/modules/integration/form-plugin/form-plugin.iml
jbpm4/trunk/modules/integration/jboss4/integration-jboss4.iml
jbpm4/trunk/modules/test-base/test-base.iml
jbpm4/trunk/modules/test-db/jbpm4-test-db.iml
jbpm4/trunk/modules/userguide/userguide.iml
Log:
Add separate delete/end operation on instances
Modified: jbpm4/trunk/modules/db/jbpm4-db.iml
===================================================================
--- jbpm4/trunk/modules/db/jbpm4-db.iml 2009-05-19 10:31:12 UTC (rev 4845)
+++ jbpm4/trunk/modules/db/jbpm4-db.iml 2009-05-19 10:32:53 UTC (rev 4846)
@@ -10,9 +10,10 @@
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="jpdl" />
- <orderEntry type="module" module-name="test-base" />
<orderEntry type="module" module-name="pvm" />
+ <orderEntry type="module" module-name="api" />
<orderEntry type="module" module-name="toplevel" />
+ <orderEntry type="module" module-name="test-base" />
<orderEntry type="module-library" exported="">
<library name="M2 Dep: junit:junit:jar:3.8.1:compile">
<CLASSES>
Modified: jbpm4/trunk/modules/examples/jbpm4-examples.iml
===================================================================
--- jbpm4/trunk/modules/examples/jbpm4-examples.iml 2009-05-19 10:31:12 UTC (rev 4845)
+++ jbpm4/trunk/modules/examples/jbpm4-examples.iml 2009-05-19 10:32:53 UTC (rev 4846)
@@ -9,10 +9,11 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="module" module-name="test-base" exported="" />
<orderEntry type="module" module-name="jpdl" exported="" />
<orderEntry type="module" module-name="pvm" exported="" />
- <orderEntry type="module" module-name="toplevel" />
+ <orderEntry type="module" module-name="toplevel" exported="" />
+ <orderEntry type="module" module-name="api" exported="" />
+ <orderEntry type="module" module-name="test-base" exported="" />
<orderEntry type="module-library" exported="">
<library name="M2 Dep: jboss:jboss-j2ee:jar:4.2.2.GA:compile">
<CLASSES>
@@ -199,7 +200,7 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <orderEntry type="module-library" exported="">
<library name="M2 Dep: org.apache.ant:ant:jar:1.7.0:runtime">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/apache/ant/ant/1.7.0/ant-1.7.0.jar!/" />
@@ -208,7 +209,7 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <orderEntry type="module-library" exported="">
<library name="M2 Dep: org.subethamail:subethasmtp-wiser:jar:1.2:compile">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/subethamail/subethasmtp-wiser/1.2/subethasmtp-wiser-1.2.jar!/" />
@@ -217,7 +218,7 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <orderEntry type="module-library" exported="">
<library name="M2 Dep: logkit:logkit:jar:1.0.1:compile">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/logkit/logkit/1.0.1/logkit-1.0.1.jar!/" />
@@ -226,7 +227,7 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <orderEntry type="module-library" exported="">
<library name="M2 Dep: antlr:antlr:jar:2.7.6:test">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/antlr/antlr/2.7.6/antlr-2.7.6.jar!/" />
@@ -235,7 +236,7 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <orderEntry type="module-library" exported="">
<library name="M2 Dep: commons-collections:commons-collections:jar:3.1:test">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-collections/commons-collections/3.1/commons-collections-3.1.jar!/" />
@@ -246,7 +247,7 @@
</SOURCES>
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <orderEntry type="module-library" exported="">
<library name="M2 Dep: javax.servlet:servlet-api:jar:2.5:compile">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/servlet/servlet-api/2.5/servlet-api-2.5.jar!/" />
@@ -255,7 +256,7 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <orderEntry type="module-library" exported="">
<library name="M2 Dep: javax.activation:activation:jar:1.1.1:compile">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/activation/activation/1.1.1/activation-1.1.1.jar!/" />
@@ -264,7 +265,7 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <orderEntry type="module-library" exported="">
<library name="M2 Dep: avalon-framework:avalon-framework:jar:4.1.3:compile">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/avalon-framework/avalon-framework/4.1.3/avalon-framework-4.1.3.jar!/" />
@@ -273,7 +274,7 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <orderEntry type="module-library" exported="">
<library name="M2 Dep: org.hibernate:hibernate-entitymanager:jar:3.4.0.GA:runtime">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate-entitymanager/3.4.0.GA/hibernate-entitymanager-3.4.0.GA.jar!/" />
@@ -284,7 +285,7 @@
</SOURCES>
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <orderEntry type="module-library" exported="">
<library name="M2 Dep: org.slf4j:slf4j-jdk14:jar:1.5.2:runtime">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/slf4j/slf4j-jdk14/1.5.2/slf4j-jdk14-1.5.2.jar!/" />
@@ -293,7 +294,7 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <orderEntry type="module-library" exported="">
<library name="M2 Dep: org.hibernate:ejb3-persistence:jar:1.0.2.GA:runtime">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/ejb3-persistence/1.0.2.GA/ejb3-persistence-1.0.2.GA.jar!/" />
@@ -304,7 +305,7 @@
</SOURCES>
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <orderEntry type="module-library" exported="">
<library name="M2 Dep: commons-logging:commons-logging:jar:1.1:compile">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-logging/commons-logging/1.1/commons-logging-1.1.jar!/" />
@@ -313,7 +314,7 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <orderEntry type="module-library" exported="">
<library name="M2 Dep: org.slf4j:slf4j-api:jar:1.5.2:runtime">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/slf4j/slf4j-api/1.5.2/slf4j-api-1.5.2.jar!/" />
@@ -322,7 +323,7 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <orderEntry type="module-library" exported="">
<library name="M2 Dep: org.jbpm.jbpm4.dependencies.esb:test-util:jar:4.4.0.GA:compile">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jbpm/jbpm4/dependencies/esb/test-util/4.4.0.GA/test-util-4.4.0.GA.jar!/" />
@@ -331,7 +332,7 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <orderEntry type="module-library" exported="">
<library name="M2 Dep: org.subethamail:subethasmtp-smtp:jar:1.2:compile">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/subethamail/subethasmtp-smtp/1.2/subethasmtp-smtp-1.2.jar!/" />
@@ -340,7 +341,7 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <orderEntry type="module-library" exported="">
<library name="M2 Dep: org.hibernate:hibernate-commons-annotations:jar:3.1.0.GA:runtime">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate-commons-annotations/3.1.0.GA/hibernate-commons-annotations-3.1.0.GA.jar!/" />
@@ -351,7 +352,7 @@
</SOURCES>
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <orderEntry type="module-library" exported="">
<library name="M2 Dep: xml-apis:xml-apis:jar:1.0.b2:runtime">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar!/" />
@@ -360,7 +361,7 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <orderEntry type="module-library" exported="">
<library name="M2 Dep: org.hibernate:hibernate-core:jar:3.3.1.GA:test">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate-core/3.3.1.GA/hibernate-core-3.3.1.GA.jar!/" />
@@ -371,7 +372,7 @@
</SOURCES>
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <orderEntry type="module-library" exported="">
<library name="M2 Dep: javax.mail:mail:jar:1.4.1:compile">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/mail/mail/1.4.1/mail-1.4.1.jar!/" />
@@ -380,7 +381,7 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <orderEntry type="module-library" exported="">
<library name="M2 Dep: log4j:log4j:jar:1.2.14:compile">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14.jar!/" />
@@ -391,7 +392,7 @@
</SOURCES>
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <orderEntry type="module-library" exported="">
<library name="M2 Dep: org.apache.ant:ant-launcher:jar:1.7.0:runtime">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/apache/ant/ant-launcher/1.7.0/ant-launcher-1.7.0.jar!/" />
@@ -400,7 +401,7 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <orderEntry type="module-library" exported="">
<library name="M2 Dep: org.hibernate:hibernate-annotations:jar:3.4.0.GA:runtime">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate-annotations/3.4.0.GA/hibernate-annotations-3.4.0.GA.jar!/" />
Modified: jbpm4/trunk/modules/integration/console/integration-console.iml
===================================================================
--- jbpm4/trunk/modules/integration/console/integration-console.iml 2009-05-19 10:31:12 UTC (rev 4845)
+++ jbpm4/trunk/modules/integration/console/integration-console.iml 2009-05-19 10:32:53 UTC (rev 4846)
@@ -11,10 +11,8 @@
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="toplevel" exported="" />
<orderEntry type="module" module-name="api" exported="" />
- <orderEntry type="module" module-name="gwt-rpc" exported="" />
- <orderEntry type="module" module-name="test-base" exported="" />
<orderEntry type="module" module-name="gwt-parent" exported="" />
- <orderEntry type="module" module-name="pvm" exported="" />
+ <orderEntry type="module" module-name="test-base" exported="" />
<orderEntry type="module-library" exported="">
<library name="M2 Dep: com.google.code.gson:gson:jar:1.2.2:provided">
<CLASSES>
@@ -72,42 +70,6 @@
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.hibernate:hibernate-commons-annotations:jar:3.0.0.ga:provided">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/hibernate/hibernate-commons-annotations/3.0.0.ga/hibernate-commons-annotations-3.0.0.ga.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.hibernate:hibernate:jar:3.2.6.ga:provided">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/hibernate/hibernate/3.2.6.ga/hibernate-3.2.6.ga.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: commons-logging:commons-logging:jar:1.0.4:provided">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.jboss.cache:jbosscache-core:jar:3.0.2.GA:provided">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/cache/jbosscache-core/3.0.2.GA/jbosscache-core-3.0.2.GA.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
<library name="M2 Dep: juel:juel-engine:jar:2.1.0:provided">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/juel/juel-engine/2.1.0/juel-engine-2.1.0.jar!/" />
@@ -126,260 +88,237 @@
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: asm:asm:jar:1.5.3:provided">
+ <library name="M2 Dep: javassist:javassist:jar:3.4.GA:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/asm/asm/1.5.3/asm-1.5.3.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javassist/javassist/3.4.GA/javassist-3.4.GA.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: javassist:javassist:jar:3.4.GA:provided">
+ <library name="M2 Dep: juel:juel:jar:2.1.0:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javassist/javassist/3.4.GA/javassist-3.4.GA.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/juel/juel/2.1.0/juel-2.1.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: javax.persistence:persistence-api:jar:1.0:provided">
+ <library name="M2 Dep: jboss:jboss-j2ee:jar:4.2.2.GA:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/persistence/persistence-api/1.0/persistence-api-1.0.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/jboss/jboss-j2ee/4.2.2.GA/jboss-j2ee-4.2.2.GA.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: juel:juel:jar:2.1.0:provided">
+ <library name="M2 Dep: juel:juel-impl:jar:2.1.0:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/juel/juel/2.1.0/juel-2.1.0.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/juel/juel-impl/2.1.0/juel-impl-2.1.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.hibernate:ejb3-persistence:jar:1.0.1.GA:provided">
+ <library name="M2 Dep: org.livetribe:livetribe-jsr223:jar:2.0.5:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/hibernate/ejb3-persistence/1.0.1.GA/ejb3-persistence-1.0.1.GA.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/livetribe/livetribe-jsr223/2.0.5/livetribe-jsr223-2.0.5.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: jgroups:jgroups:jar:2.6.7.GA:provided">
+ <library name="M2 Dep: dom4j:dom4j:jar:1.6.1:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/jgroups/jgroups/2.6.7.GA/jgroups-2.6.7.GA.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/jgroups/jgroups/2.6.7.GA/jgroups-2.6.7.GA-sources.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/dom4j/dom4j/1.6.1/dom4j-1.6.1-sources.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: jboss:jboss-j2ee:jar:4.2.2.GA:provided">
+ <library name="M2 Dep: log4j:log4j:jar:1.2.14:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/jboss/jboss-j2ee/4.2.2.GA/jboss-j2ee-4.2.2.GA.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14.jar!/" />
</CLASSES>
<JAVADOC />
- <SOURCES />
+ <SOURCES>
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar!/" />
+ </SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: com.sun.xml.bind:jaxb-impl:jar:2.1.8:provided">
+ <library name="M2 Dep: javax.transaction:jta:jar:1.1:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/com/sun/xml/bind/jaxb-impl/2.1.8/jaxb-impl-2.1.8.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/transaction/jta/1.1/jta-1.1.jar!/" />
</CLASSES>
<JAVADOC />
- <SOURCES />
+ <SOURCES>
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/transaction/jta/1.1/jta-1.1-sources.jar!/" />
+ </SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: net.sf.ehcache:ehcache:jar:1.2.3:provided">
+ <library name="M2 Dep: org.jboss.identity:idm-common:jar:1.0.0.Alpha2:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/net/sf/ehcache/ehcache/1.2.3/ehcache-1.2.3.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/identity/idm-common/1.0.0.Alpha2/idm-common-1.0.0.Alpha2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.hibernate:hibernate-annotations:jar:3.3.1.GA:provided">
+ <library name="M2 Dep: org.jboss.identity:idm:jar:1.0.0.Alpha2:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/hibernate/hibernate-annotations/3.3.1.GA/hibernate-annotations-3.3.1.GA.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/identity/idm/1.0.0.Alpha2/idm-1.0.0.Alpha2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: juel:juel-impl:jar:2.1.0:provided">
+ <library name="M2 Dep: org.jboss.identity:idm-spi:jar:1.0.0.Alpha2:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/juel/juel-impl/2.1.0/juel-impl-2.1.0.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/identity/idm-spi/1.0.0.Alpha2/idm-spi-1.0.0.Alpha2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.livetribe:livetribe-jsr223:jar:2.0.5:provided">
+ <library name="M2 Dep: org.jboss.identity:idm-api:jar:1.0.0.Alpha2:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/livetribe/livetribe-jsr223/2.0.5/livetribe-jsr223-2.0.5.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/identity/idm-api/1.0.0.Alpha2/idm-api-1.0.0.Alpha2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: dom4j:dom4j:jar:1.6.1:provided">
+ <library name="M2 Dep: org.apache.ant:ant:jar:1.7.0:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/apache/ant/ant/1.7.0/ant-1.7.0.jar!/" />
</CLASSES>
<JAVADOC />
- <SOURCES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/dom4j/dom4j/1.6.1/dom4j-1.6.1-sources.jar!/" />
- </SOURCES>
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: cglib:cglib:jar:2.1_3:provided">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/cglib/cglib/2.1_3/cglib-2.1_3.jar!/" />
- </CLASSES>
- <JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: asm:asm-attrs:jar:1.5.3:provided">
+ <library name="M2 Dep: commons-collections:commons-collections:jar:3.1:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/asm/asm-attrs/1.5.3/asm-attrs-1.5.3.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-collections/commons-collections/3.1/commons-collections-3.1.jar!/" />
</CLASSES>
<JAVADOC />
- <SOURCES />
+ <SOURCES>
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-collections/commons-collections/3.1/commons-collections-3.1-sources.jar!/" />
+ </SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.jboss:jboss-common-core:jar:2.2.10.GA:provided">
+ <library name="M2 Dep: org.hibernate:hibernate-entitymanager:jar:3.4.0.GA:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/jboss-common-core/2.2.10.GA/jboss-common-core-2.2.10.GA.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/hibernate/hibernate-entitymanager/3.4.0.GA/hibernate-entitymanager-3.4.0.GA.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/jboss-common-core/2.2.10.GA/jboss-common-core-2.2.10.GA-sources.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/hibernate/hibernate-entitymanager/3.4.0.GA/hibernate-entitymanager-3.4.0.GA-sources.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: commons-collections:commons-collections:jar:2.1.1:provided">
+ <library name="M2 Dep: org.slf4j:slf4j-jdk14:jar:1.5.2:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-collections/commons-collections/2.1.1/commons-collections-2.1.1.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/slf4j/slf4j-jdk14/1.5.2/slf4j-jdk14-1.5.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.hibernate:hibernate-entitymanager:jar:3.3.2.GA:provided">
+ <library name="M2 Dep: org.hibernate:ejb3-persistence:jar:1.0.2.GA:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/hibernate/hibernate-entitymanager/3.3.2.GA/hibernate-entitymanager-3.3.2.GA.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/hibernate/ejb3-persistence/1.0.2.GA/ejb3-persistence-1.0.2.GA.jar!/" />
</CLASSES>
<JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.jboss.logging:jboss-logging-spi:jar:2.0.5.GA:provided">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA.jar!/" />
- </CLASSES>
- <JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA-sources.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/hibernate/ejb3-persistence/1.0.2.GA/ejb3-persistence-1.0.2.GA-sources.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: log4j:log4j:jar:1.2.14:provided">
+ <library name="M2 Dep: org.slf4j:slf4j-api:jar:1.5.2:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/slf4j/slf4j-api/1.5.2/slf4j-api-1.5.2.jar!/" />
</CLASSES>
<JAVADOC />
- <SOURCES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar!/" />
- </SOURCES>
+ <SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: javax.transaction:jta:jar:1.1:provided">
+ <library name="M2 Dep: org.hibernate:hibernate-commons-annotations:jar:3.1.0.GA:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/transaction/jta/1.1/jta-1.1.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/hibernate/hibernate-commons-annotations/3.1.0.GA/hibernate-commons-annotations-3.1.0.GA.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/transaction/jta/1.1/jta-1.1-sources.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/hibernate/hibernate-commons-annotations/3.1.0.GA/hibernate-commons-annotations-3.1.0.GA-sources.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.jboss.identity:idm-common:jar:1.0.0.Alpha2:provided">
+ <library name="M2 Dep: xml-apis:xml-apis:jar:1.0.b2:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/identity/idm-common/1.0.0.Alpha2/idm-common-1.0.0.Alpha2.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.jboss.identity:idm:jar:1.0.0.Alpha2:provided">
+ <library name="M2 Dep: org.hibernate:hibernate-core:jar:3.3.1.GA:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/identity/idm/1.0.0.Alpha2/idm-1.0.0.Alpha2.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/hibernate/hibernate-core/3.3.1.GA/hibernate-core-3.3.1.GA.jar!/" />
</CLASSES>
<JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: javax.mail:mail:jar:1.4:provided">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/mail/mail/1.4/mail-1.4.jar!/" />
- </CLASSES>
- <JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/mail/mail/1.4/mail-1.4-sources.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/hibernate/hibernate-core/3.3.1.GA/hibernate-core-3.3.1.GA-sources.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.jboss.identity:idm-spi:jar:1.0.0.Alpha2:provided">
+ <library name="M2 Dep: javax.mail:mail:jar:1.4.1:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/identity/idm-spi/1.0.0.Alpha2/idm-spi-1.0.0.Alpha2.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/mail/mail/1.4.1/mail-1.4.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.jboss.identity:idm-api:jar:1.0.0.Alpha2:provided">
+ <library name="M2 Dep: org.apache.ant:ant-launcher:jar:1.7.0:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/identity/idm-api/1.0.0.Alpha2/idm-api-1.0.0.Alpha2.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/apache/ant/ant-launcher/1.7.0/ant-launcher-1.7.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: commons-email:commons-email:jar:1.2-SNAPSHOT:provided">
+ <library name="M2 Dep: org.hibernate:hibernate-annotations:jar:3.4.0.GA:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-email/commons-email/1.2-SNAPSHOT/commons-email-1.2-SNAPSHOT.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/hibernate/hibernate-annotations/3.4.0.GA/hibernate-annotations-3.4.0.GA.jar!/" />
</CLASSES>
<JAVADOC />
- <SOURCES />
+ <SOURCES>
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/hibernate/hibernate-annotations/3.4.0.GA/hibernate-annotations-3.4.0.GA-sources.jar!/" />
+ </SOURCES>
</library>
</orderEntry>
<orderEntryProperties />
Modified: jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/ProcessManagementImpl.java
===================================================================
--- jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/ProcessManagementImpl.java 2009-05-19 10:31:12 UTC (rev 4845)
+++ jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/ProcessManagementImpl.java 2009-05-19 10:32:53 UTC (rev 4846)
@@ -21,24 +21,20 @@
*/
package org.jbpm.integration.console;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
-
import org.jboss.bpm.console.client.model.ProcessDefinitionRef;
import org.jboss.bpm.console.client.model.ProcessInstanceRef;
import org.jboss.bpm.console.server.integration.ProcessManagement;
-import org.jbpm.api.Execution;
-import org.jbpm.api.ExecutionService;
-import org.jbpm.api.ProcessDefinition;
-import org.jbpm.api.ProcessDefinitionQuery;
-import org.jbpm.api.ProcessInstance;
-import org.jbpm.api.ProcessInstanceQuery;
-import org.jbpm.api.RepositoryService;
import org.jbpm.api.env.Environment;
import org.jbpm.api.env.EnvironmentFactory;
import org.jbpm.api.model.OpenExecution;
+import org.jbpm.api.*;
+import org.jbpm.api.history.HistoryProcessInstanceQuery;
+import org.jbpm.api.history.HistoryProcessInstance;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+
/**
* @author Heiko.Braun <heiko.braun(a)jboss.com>
*/
@@ -130,6 +126,17 @@
List<ProcessInstanceRef> results = adoptProcessInstances(processInstances);
+ // add history info
+ // TODO: optimize w. batch query
+ HistoryService histService = this.processEngine.getHistoryService();
+ for(ProcessInstanceRef inst : results)
+ {
+ HistoryProcessInstanceQuery hQuery = histService.createHistoryProcessInstanceQuery();
+ hQuery.processInstanceId(inst.getId());
+ HistoryProcessInstance entry = hQuery.uniqueResult();
+ inst.setStartDate(entry.getStartTime());
+ }
+
return results;
}
finally
@@ -146,7 +153,7 @@
{
List<ProcessInstanceRef> results = new ArrayList<ProcessInstanceRef>();
- for(ProcessInstance processInstance : processInstances)
+ for(Execution processInstance : processInstances)
{
if(processInstance.isEnded())
{
@@ -174,14 +181,14 @@
try
{
-
ExecutionService execService = this.processEngine.getExecutionService();
ProcessInstanceQuery query = execService.createProcessInstanceQuery();
query.processInstanceId(instanceId);
List<ProcessInstance> processInstances = query.list();
if(processInstances.size()>1 || processInstances.isEmpty())
- throw new IllegalStateException("No precise match for instanceId " + instanceId +". Num results "+processInstances);
+ throw new IllegalStateException("No precise match for instanceId " + instanceId +
+ ". Num results "+processInstances);
return ModelAdaptor.adoptExecution( (OpenExecution)processInstances.get(0));
}
@@ -206,27 +213,41 @@
}
}
- public void setProcessState(String executionId, ProcessInstanceRef.STATE nextState)
+
+ public void endInstance(String instanceId, ProcessInstanceRef.RESULT result)
{
+ Environment env = ((EnvironmentFactory)processEngine).openEnvironment();
+ try
+ {
+
+ ExecutionService execService = this.processEngine.getExecutionService();
+ Execution exec = execService.findExecutionById(instanceId);
+ if(null==exec)
+ throw new IllegalArgumentException("No such execution with id "+ instanceId);
+
+ ProcessInstanceRef.RESULT actualResult = result!=null ? result : ProcessInstanceRef.RESULT.COMPLETED;
+ execService.endProcessInstance(instanceId, actualResult.toString());
+ }
+ finally
+ {
+ env.close();
+ }
+ }
+
+ public void deleteInstance(String instanceId)
+ {
Environment env = ((EnvironmentFactory)processEngine).openEnvironment();
try
{
- if(ProcessInstanceRef.STATE.ENDED==nextState)
- {
- // TODO: It's actually a delete call. Once we got the 'cancel' notion this should be changed
- ExecutionService execService = this.processEngine.getExecutionService();
- Execution exec = execService.findExecutionById(executionId);
- if(null==exec)
- throw new IllegalArgumentException("No such execution with id "+ executionId);
- execService.deleteProcessInstance(executionId);
- }
- else
- {
- throw new IllegalArgumentException("State " + nextState + " currently not supported");
- }
+ ExecutionService execService = this.processEngine.getExecutionService();
+ Execution exec = execService.findExecutionById(instanceId);
+ if(null==exec)
+ throw new IllegalArgumentException("No such execution with id "+ instanceId);
+
+ execService.deleteProcessInstance(instanceId);
}
finally
{
@@ -234,6 +255,14 @@
}
}
+ public void setProcessState(
+ String executionId,
+ ProcessInstanceRef.STATE nextState
+ )
+ {
+ throw new RuntimeException("Not implemented");
+ }
+
public void signalExecution(String executionId, String signal)
{
Environment env = ((EnvironmentFactory)processEngine).openEnvironment();
@@ -256,10 +285,7 @@
public void deploy(String fileName, String contentType, InputStream deployment)
{
- this.processEngine.getRepositoryService()
- .createDeployment()
- .addResourceFromInputStream(fileName, deployment)
- .deploy();
+ throw new RuntimeException("Not implemented");
}
}
Modified: jbpm4/trunk/modules/integration/form-plugin/form-plugin.iml
===================================================================
--- jbpm4/trunk/modules/integration/form-plugin/form-plugin.iml 2009-05-19 10:31:12 UTC (rev 4845)
+++ jbpm4/trunk/modules/integration/form-plugin/form-plugin.iml 2009-05-19 10:32:53 UTC (rev 4846)
@@ -11,8 +11,9 @@
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="jpdl" exported="" />
<orderEntry type="module" module-name="test-base" exported="" />
- <orderEntry type="module" module-name="gwt-rpc" exported="" />
- <orderEntry type="module" module-name="server-integration" exported="" />
+ <orderEntry type="module" module-name="api" exported="" />
+ <orderEntry type="module" module-name="toplevel" exported="" />
+ <orderEntry type="module" module-name="gwt-parent" exported="" />
<orderEntry type="module-library" exported="">
<library name="M2 Dep: jboss:jboss-j2ee:jar:4.2.2.GA:provided">
<CLASSES>
@@ -41,15 +42,6 @@
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: javax.xml.bind:jaxb-api:jar:2.1:provided">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
<library name="M2 Dep: junit:junit:jar:3.8.1:provided">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/junit/junit/3.8.1/junit-3.8.1.jar!/" />
@@ -59,249 +51,266 @@
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.hibernate:hibernate-commons-annotations:jar:3.0.0.ga:provided">
+ <library name="M2 Dep: juel:juel-engine:jar:2.1.0:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/hibernate/hibernate-commons-annotations/3.0.0.ga/hibernate-commons-annotations-3.0.0.ga.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/juel/juel-engine/2.1.0/juel-engine-2.1.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.hibernate:hibernate:jar:3.2.6.ga:provided">
+ <library name="M2 Dep: antlr:antlr:jar:2.7.6:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/hibernate/hibernate/3.2.6.ga/hibernate-3.2.6.ga.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/antlr/antlr/2.7.6/antlr-2.7.6.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: commons-logging:commons-logging:jar:1.0.4:provided">
+ <library name="M2 Dep: javassist:javassist:jar:3.4.GA:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javassist/javassist/3.4.GA/javassist-3.4.GA.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.jboss.cache:jbosscache-core:jar:3.0.2.GA:provided">
+ <library name="M2 Dep: org.jboss.identity:idm-common:jar:1.0.0.Alpha2:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/cache/jbosscache-core/3.0.2.GA/jbosscache-core-3.0.2.GA.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/identity/idm-common/1.0.0.Alpha2/idm-common-1.0.0.Alpha2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: javax.xml.stream:stax-api:jar:1.0-2:provided">
+ <library name="M2 Dep: juel:juel:jar:2.1.0:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/juel/juel/2.1.0/juel-2.1.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: juel:juel-engine:jar:2.1.0:provided">
+ <library name="M2 Dep: juel:juel-impl:jar:2.1.0:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/juel/juel-engine/2.1.0/juel-engine-2.1.0.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/juel/juel-impl/2.1.0/juel-impl-2.1.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: antlr:antlr:jar:2.7.6:provided">
+ <library name="M2 Dep: org.livetribe:livetribe-jsr223:jar:2.0.5:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/antlr/antlr/2.7.6/antlr-2.7.6.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/livetribe/livetribe-jsr223/2.0.5/livetribe-jsr223-2.0.5.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: asm:asm:jar:1.5.3:provided">
+ <library name="M2 Dep: org.jboss.identity:idm:jar:1.0.0.Alpha2:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/asm/asm/1.5.3/asm-1.5.3.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/identity/idm/1.0.0.Alpha2/idm-1.0.0.Alpha2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: javassist:javassist:jar:3.4.GA:provided">
+ <library name="M2 Dep: org.jboss.identity:idm-spi:jar:1.0.0.Alpha2:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javassist/javassist/3.4.GA/javassist-3.4.GA.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/identity/idm-spi/1.0.0.Alpha2/idm-spi-1.0.0.Alpha2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.jboss.identity:idm-common:jar:1.0.0.Alpha2:provided">
+ <library name="M2 Dep: org.jboss.identity:idm-api:jar:1.0.0.Alpha2:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/identity/idm-common/1.0.0.Alpha2/idm-common-1.0.0.Alpha2.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/identity/idm-api/1.0.0.Alpha2/idm-api-1.0.0.Alpha2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: javax.persistence:persistence-api:jar:1.0:provided">
+ <library name="M2 Dep: org.freemarker:freemarker:jar:2.3.15:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/persistence/persistence-api/1.0/persistence-api-1.0.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/freemarker/freemarker/2.3.15/freemarker-2.3.15.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: juel:juel:jar:2.1.0:provided">
+ <library name="M2 Dep: org.apache.ant:ant:jar:1.7.0:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/juel/juel/2.1.0/juel-2.1.0.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/apache/ant/ant/1.7.0/ant-1.7.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.hibernate:ejb3-persistence:jar:1.0.1.GA:provided">
+ <library name="M2 Dep: javax.transaction:jta:jar:1.1:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/hibernate/ejb3-persistence/1.0.1.GA/ejb3-persistence-1.0.1.GA.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/transaction/jta/1.1/jta-1.1.jar!/" />
</CLASSES>
<JAVADOC />
- <SOURCES />
+ <SOURCES>
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/transaction/jta/1.1/jta-1.1-sources.jar!/" />
+ </SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: com.sun.xml.bind:jaxb-impl:jar:2.1.8:provided">
+ <library name="M2 Dep: commons-collections:commons-collections:jar:3.1:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/com/sun/xml/bind/jaxb-impl/2.1.8/jaxb-impl-2.1.8.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-collections/commons-collections/3.1/commons-collections-3.1.jar!/" />
</CLASSES>
<JAVADOC />
- <SOURCES />
+ <SOURCES>
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-collections/commons-collections/3.1/commons-collections-3.1-sources.jar!/" />
+ </SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: net.sf.ehcache:ehcache:jar:1.2.3:provided">
+ <library name="M2 Dep: javax.activation:activation:jar:1.1.1:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/net/sf/ehcache/ehcache/1.2.3/ehcache-1.2.3.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/activation/activation/1.1.1/activation-1.1.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.hibernate:hibernate-annotations:jar:3.3.1.GA:provided">
+ <library name="M2 Dep: org.hibernate:hibernate-entitymanager:jar:3.4.0.GA:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/hibernate/hibernate-annotations/3.3.1.GA/hibernate-annotations-3.3.1.GA.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/hibernate/hibernate-entitymanager/3.4.0.GA/hibernate-entitymanager-3.4.0.GA.jar!/" />
</CLASSES>
<JAVADOC />
- <SOURCES />
+ <SOURCES>
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/hibernate/hibernate-entitymanager/3.4.0.GA/hibernate-entitymanager-3.4.0.GA-sources.jar!/" />
+ </SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: juel:juel-impl:jar:2.1.0:provided">
+ <library name="M2 Dep: org.slf4j:slf4j-jdk14:jar:1.5.2:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/juel/juel-impl/2.1.0/juel-impl-2.1.0.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/slf4j/slf4j-jdk14/1.5.2/slf4j-jdk14-1.5.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.livetribe:livetribe-jsr223:jar:2.0.5:provided">
+ <library name="M2 Dep: org.hibernate:ejb3-persistence:jar:1.0.2.GA:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/livetribe/livetribe-jsr223/2.0.5/livetribe-jsr223-2.0.5.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/hibernate/ejb3-persistence/1.0.2.GA/ejb3-persistence-1.0.2.GA.jar!/" />
</CLASSES>
<JAVADOC />
- <SOURCES />
+ <SOURCES>
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/hibernate/ejb3-persistence/1.0.2.GA/ejb3-persistence-1.0.2.GA-sources.jar!/" />
+ </SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.jboss.identity:idm:jar:1.0.0.Alpha2:provided">
+ <library name="M2 Dep: org.slf4j:slf4j-api:jar:1.5.2:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/identity/idm/1.0.0.Alpha2/idm-1.0.0.Alpha2.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/slf4j/slf4j-api/1.5.2/slf4j-api-1.5.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: cglib:cglib:jar:2.1_3:provided">
+ <library name="M2 Dep: dom4j:dom4j:jar:1.6.1:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/cglib/cglib/2.1_3/cglib-2.1_3.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar!/" />
</CLASSES>
<JAVADOC />
- <SOURCES />
+ <SOURCES>
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/dom4j/dom4j/1.6.1/dom4j-1.6.1-sources.jar!/" />
+ </SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: asm:asm-attrs:jar:1.5.3:provided">
+ <library name="M2 Dep: org.hibernate:hibernate-commons-annotations:jar:3.1.0.GA:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/asm/asm-attrs/1.5.3/asm-attrs-1.5.3.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/hibernate/hibernate-commons-annotations/3.1.0.GA/hibernate-commons-annotations-3.1.0.GA.jar!/" />
</CLASSES>
<JAVADOC />
- <SOURCES />
+ <SOURCES>
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/hibernate/hibernate-commons-annotations/3.1.0.GA/hibernate-commons-annotations-3.1.0.GA-sources.jar!/" />
+ </SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.jboss.identity:idm-spi:jar:1.0.0.Alpha2:provided">
+ <library name="M2 Dep: xml-apis:xml-apis:jar:1.0.b2:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/identity/idm-spi/1.0.0.Alpha2/idm-spi-1.0.0.Alpha2.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.jboss.identity:idm-api:jar:1.0.0.Alpha2:provided">
+ <library name="M2 Dep: org.hibernate:hibernate-core:jar:3.3.1.GA:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/identity/idm-api/1.0.0.Alpha2/idm-api-1.0.0.Alpha2.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/hibernate/hibernate-core/3.3.1.GA/hibernate-core-3.3.1.GA.jar!/" />
</CLASSES>
<JAVADOC />
- <SOURCES />
+ <SOURCES>
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/hibernate/hibernate-core/3.3.1.GA/hibernate-core-3.3.1.GA-sources.jar!/" />
+ </SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: commons-collections:commons-collections:jar:2.1.1:provided">
+ <library name="M2 Dep: javax.mail:mail:jar:1.4.1:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-collections/commons-collections/2.1.1/commons-collections-2.1.1.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/mail/mail/1.4.1/mail-1.4.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.hibernate:hibernate-entitymanager:jar:3.3.2.GA:provided">
+ <library name="M2 Dep: log4j:log4j:jar:1.2.14:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/hibernate/hibernate-entitymanager/3.3.2.GA/hibernate-entitymanager-3.3.2.GA.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14.jar!/" />
</CLASSES>
<JAVADOC />
- <SOURCES />
+ <SOURCES>
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar!/" />
+ </SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.freemarker:freemarker:jar:2.3.15:compile">
+ <library name="M2 Dep: org.apache.ant:ant-launcher:jar:1.7.0:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/freemarker/freemarker/2.3.15/freemarker-2.3.15.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/apache/ant/ant-launcher/1.7.0/ant-launcher-1.7.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: javax.transaction:jta:jar:1.0.1B:provided">
+ <library name="M2 Dep: org.hibernate:hibernate-annotations:jar:3.4.0.GA:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/transaction/jta/1.0.1B/jta-1.0.1B.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/hibernate/hibernate-annotations/3.4.0.GA/hibernate-annotations-3.4.0.GA.jar!/" />
</CLASSES>
<JAVADOC />
- <SOURCES />
+ <SOURCES>
+ <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/hibernate/hibernate-annotations/3.4.0.GA/hibernate-annotations-3.4.0.GA-sources.jar!/" />
+ </SOURCES>
</library>
</orderEntry>
- <orderEntry type="module" module-name="api" />
<orderEntryProperties />
</component>
</module>
Modified: jbpm4/trunk/modules/integration/jboss4/integration-jboss4.iml
===================================================================
--- jbpm4/trunk/modules/integration/jboss4/integration-jboss4.iml 2009-05-19 10:31:12 UTC (rev 4845)
+++ jbpm4/trunk/modules/integration/jboss4/integration-jboss4.iml 2009-05-19 10:32:53 UTC (rev 4846)
@@ -12,8 +12,9 @@
<orderEntry type="module" module-name="jpdl" exported="" />
<orderEntry type="module" module-name="pvm" exported="" />
<orderEntry type="module" module-name="integration" exported="" />
+ <orderEntry type="module" module-name="api" exported="" />
+ <orderEntry type="module" module-name="toplevel" exported="" />
<orderEntry type="module" module-name="test-base" exported="" />
- <orderEntry type="module" module-name="toplevel" />
<orderEntry type="module-library" exported="">
<library name="M2 Dep: oswego-concurrent:concurrent:jar:1.3.4-jboss-update1:provided">
<CLASSES>
@@ -926,7 +927,7 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <orderEntry type="module-library" exported="">
<library name="M2 Dep: javax.transaction:jta:jar:1.1:compile">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/transaction/jta/1.1/jta-1.1.jar!/" />
@@ -937,7 +938,7 @@
</SOURCES>
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <orderEntry type="module-library" exported="">
<library name="M2 Dep: org.hibernate:hibernate-annotations:jar:3.4.0.GA:compile">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/hibernate/hibernate-annotations/3.4.0.GA/hibernate-annotations-3.4.0.GA.jar!/" />
@@ -948,7 +949,7 @@
</SOURCES>
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <orderEntry type="module-library" exported="">
<library name="M2 Dep: org.jboss:jboss-common-core:jar:2.2.10.GA:provided">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/jboss-common-core/2.2.10.GA/jboss-common-core-2.2.10.GA.jar!/" />
@@ -959,7 +960,7 @@
</SOURCES>
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <orderEntry type="module-library" exported="">
<library name="M2 Dep: org.hibernate:hibernate-commons-annotations:jar:3.1.0.GA:compile">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/hibernate/hibernate-commons-annotations/3.1.0.GA/hibernate-commons-annotations-3.1.0.GA.jar!/" />
@@ -970,7 +971,7 @@
</SOURCES>
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <orderEntry type="module-library" exported="">
<library name="M2 Dep: xml-apis:xml-apis:jar:1.0.b2:compile">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar!/" />
@@ -979,7 +980,7 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <orderEntry type="module-library" exported="">
<library name="M2 Dep: javax.mail:mail:jar:1.4.1:compile">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/mail/mail/1.4.1/mail-1.4.1.jar!/" />
@@ -988,7 +989,7 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <orderEntry type="module-library" exported="">
<library name="M2 Dep: commons-collections:commons-collections:jar:3.1:compile">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-collections/commons-collections/3.1/commons-collections-3.1.jar!/" />
@@ -999,7 +1000,7 @@
</SOURCES>
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <orderEntry type="module-library" exported="">
<library name="M2 Dep: org.hibernate:hibernate-entitymanager:jar:3.4.0.GA:compile">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/hibernate/hibernate-entitymanager/3.4.0.GA/hibernate-entitymanager-3.4.0.GA.jar!/" />
@@ -1010,7 +1011,7 @@
</SOURCES>
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <orderEntry type="module-library" exported="">
<library name="M2 Dep: org.slf4j:slf4j-jdk14:jar:1.5.2:compile">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/slf4j/slf4j-jdk14/1.5.2/slf4j-jdk14-1.5.2.jar!/" />
@@ -1019,7 +1020,7 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <orderEntry type="module-library" exported="">
<library name="M2 Dep: org.hibernate:ejb3-persistence:jar:1.0.2.GA:compile">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/hibernate/ejb3-persistence/1.0.2.GA/ejb3-persistence-1.0.2.GA.jar!/" />
@@ -1030,7 +1031,7 @@
</SOURCES>
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <orderEntry type="module-library" exported="">
<library name="M2 Dep: org.slf4j:slf4j-api:jar:1.5.2:compile">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/slf4j/slf4j-api/1.5.2/slf4j-api-1.5.2.jar!/" />
@@ -1039,7 +1040,7 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <orderEntry type="module-library" exported="">
<library name="M2 Dep: org.hibernate:hibernate-core:jar:3.3.1.GA:compile">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/hibernate/hibernate-core/3.3.1.GA/hibernate-core-3.3.1.GA.jar!/" />
@@ -1050,7 +1051,7 @@
</SOURCES>
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <orderEntry type="module-library" exported="">
<library name="M2 Dep: org.jboss.logging:jboss-logging-spi:jar:2.0.5.GA:provided">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA.jar!/" />
@@ -1061,7 +1062,7 @@
</SOURCES>
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <orderEntry type="module-library" exported="">
<library name="M2 Dep: org.apache.ant:ant-launcher:jar:1.7.0:compile">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/apache/ant/ant-launcher/1.7.0/ant-launcher-1.7.0.jar!/" />
@@ -1070,7 +1071,7 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <orderEntry type="module-library" exported="">
<library name="M2 Dep: org.apache.ant:ant:jar:1.7.0:compile">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/apache/ant/ant/1.7.0/ant-1.7.0.jar!/" />
Modified: jbpm4/trunk/modules/test-base/test-base.iml
===================================================================
--- jbpm4/trunk/modules/test-base/test-base.iml 2009-05-19 10:31:12 UTC (rev 4845)
+++ jbpm4/trunk/modules/test-base/test-base.iml 2009-05-19 10:32:53 UTC (rev 4846)
@@ -9,6 +9,7 @@
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="toplevel" exported="" />
+ <orderEntry type="module" module-name="api" exported="" />
<orderEntry type="module-library" exported="">
<library name="M2 Dep: junit:junit:jar:3.8.1:compile">
<CLASSES>
Modified: jbpm4/trunk/modules/test-db/jbpm4-test-db.iml
===================================================================
--- jbpm4/trunk/modules/test-db/jbpm4-test-db.iml 2009-05-19 10:31:12 UTC (rev 4845)
+++ jbpm4/trunk/modules/test-db/jbpm4-test-db.iml 2009-05-19 10:32:53 UTC (rev 4846)
@@ -9,10 +9,11 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="module" module-name="test-base" exported="" />
<orderEntry type="module" module-name="jpdl" exported="" />
<orderEntry type="module" module-name="pvm" exported="" />
- <orderEntry type="module" module-name="toplevel" />
+ <orderEntry type="module" module-name="toplevel" exported="" />
+ <orderEntry type="module" module-name="api" exported="" />
+ <orderEntry type="module" module-name="test-base" exported="" />
<orderEntry type="module-library" exported="">
<library name="M2 Dep: jboss:jboss-j2ee:jar:4.2.2.GA:compile">
<CLASSES>
@@ -154,7 +155,7 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <orderEntry type="module-library" exported="">
<library name="M2 Dep: org.apache.ant:ant:jar:1.7.0:runtime">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/apache/ant/ant/1.7.0/ant-1.7.0.jar!/" />
@@ -163,7 +164,7 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <orderEntry type="module-library" exported="">
<library name="M2 Dep: antlr:antlr:jar:2.7.6:test">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/antlr/antlr/2.7.6/antlr-2.7.6.jar!/" />
@@ -172,7 +173,7 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <orderEntry type="module-library" exported="">
<library name="M2 Dep: commons-collections:commons-collections:jar:3.1:test">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-collections/commons-collections/3.1/commons-collections-3.1.jar!/" />
@@ -183,7 +184,7 @@
</SOURCES>
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <orderEntry type="module-library" exported="">
<library name="M2 Dep: javax.activation:activation:jar:1.1.1:runtime">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/activation/activation/1.1.1/activation-1.1.1.jar!/" />
@@ -192,7 +193,7 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <orderEntry type="module-library" exported="">
<library name="M2 Dep: org.hibernate:hibernate-entitymanager:jar:3.4.0.GA:runtime">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate-entitymanager/3.4.0.GA/hibernate-entitymanager-3.4.0.GA.jar!/" />
@@ -203,7 +204,7 @@
</SOURCES>
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <orderEntry type="module-library" exported="">
<library name="M2 Dep: org.slf4j:slf4j-jdk14:jar:1.5.2:runtime">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/slf4j/slf4j-jdk14/1.5.2/slf4j-jdk14-1.5.2.jar!/" />
@@ -212,7 +213,7 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <orderEntry type="module-library" exported="">
<library name="M2 Dep: org.hibernate:ejb3-persistence:jar:1.0.2.GA:runtime">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/ejb3-persistence/1.0.2.GA/ejb3-persistence-1.0.2.GA.jar!/" />
@@ -223,7 +224,7 @@
</SOURCES>
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <orderEntry type="module-library" exported="">
<library name="M2 Dep: org.slf4j:slf4j-api:jar:1.5.2:runtime">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/slf4j/slf4j-api/1.5.2/slf4j-api-1.5.2.jar!/" />
@@ -232,7 +233,7 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <orderEntry type="module-library" exported="">
<library name="M2 Dep: org.hibernate:hibernate-commons-annotations:jar:3.1.0.GA:runtime">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate-commons-annotations/3.1.0.GA/hibernate-commons-annotations-3.1.0.GA.jar!/" />
@@ -243,7 +244,7 @@
</SOURCES>
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <orderEntry type="module-library" exported="">
<library name="M2 Dep: xml-apis:xml-apis:jar:1.0.b2:runtime">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar!/" />
@@ -252,7 +253,7 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <orderEntry type="module-library" exported="">
<library name="M2 Dep: org.hibernate:hibernate-core:jar:3.3.1.GA:test">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate-core/3.3.1.GA/hibernate-core-3.3.1.GA.jar!/" />
@@ -263,7 +264,7 @@
</SOURCES>
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <orderEntry type="module-library" exported="">
<library name="M2 Dep: javax.mail:mail:jar:1.4.1:runtime">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/mail/mail/1.4.1/mail-1.4.1.jar!/" />
@@ -272,7 +273,7 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <orderEntry type="module-library" exported="">
<library name="M2 Dep: org.apache.ant:ant-launcher:jar:1.7.0:runtime">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/apache/ant/ant-launcher/1.7.0/ant-launcher-1.7.0.jar!/" />
@@ -281,7 +282,7 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module-library">
+ <orderEntry type="module-library" exported="">
<library name="M2 Dep: org.hibernate:hibernate-annotations:jar:3.4.0.GA:runtime">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate-annotations/3.4.0.GA/hibernate-annotations-3.4.0.GA.jar!/" />
Modified: jbpm4/trunk/modules/userguide/userguide.iml
===================================================================
--- jbpm4/trunk/modules/userguide/userguide.iml 2009-05-19 10:31:12 UTC (rev 4845)
+++ jbpm4/trunk/modules/userguide/userguide.iml 2009-05-19 10:32:53 UTC (rev 4846)
@@ -6,6 +6,15 @@
<content url="file://$MODULE_DIR$" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="module-library">
+ <library name="M2 Dep: hsqldb:hsqldb:jar:1.8.0.7:test">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/hsqldb/hsqldb/1.8.0.7/hsqldb-1.8.0.7.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
<orderEntryProperties />
</component>
</module>
15 years, 4 months
- 1
- 0