5:17 p.m.
Author: jbarrez
Date: 2009-12-02 18:17:00 -0500 (Wed, 02 Dec 2009)
New Revision: 5903
Modified:
jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/deployer/BpmnDeployer.java
jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/parser/BpmnParser.java
Log:
Small adjustments to get the basic example running
Modified: jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/deployer/BpmnDeployer.java
===================================================================
---
jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/deployer/BpmnDeployer.java 2009-12-02
22:10:20 UTC (rev 5902)
+++
jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/deployer/BpmnDeployer.java 2009-12-02
23:17:00 UTC (rev 5903)
@@ -30,11 +30,11 @@
*/
public class BpmnDeployer extends ProcessDeployer {
- static BpmnParser bpmnParser = new BpmnParser();
- static final String bpmnExtension = ".bpmn.xml";
+ static final BpmnParser BPMN_PARSER = new BpmnParser();
+ static final String BPMN_EXTENSION = ".bpmn.xml";
public BpmnDeployer() {
- super(bpmnExtension, bpmnParser);
+ super(BPMN_EXTENSION, BPMN_PARSER);
}
}
Modified: jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/parser/BpmnParser.java
===================================================================
--- jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/parser/BpmnParser.java 2009-12-02
22:10:20 UTC (rev 5902)
+++ jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/parser/BpmnParser.java 2009-12-02
23:17:00 UTC (rev 5903)
@@ -64,19 +64,21 @@
static ObjectBinding objectBinding = new ObjectBinding();
public static final WireParser wireParser = WireParser.getInstance();
- // array elements are mutable, even when final
- // never make a static array public
static final String[] DEFAULT_ACTIVITIES_RESOURCES = {
"jbpm.bpmn.flownodes.xml" };
static final String CATEGORY_ACTIVITY = "activity";
static BindingsParser bindingsParser = new BindingsParser();
public BpmnParser() {
- initialize();
- parseBindings();
+
+ initialize(); // initialises underlying SAX parser
+ parseBindings(); // initialises bindings
+
+ // Setting BPMN2 xsd schema
List<String> schemaResources = new ArrayList<String>();
schemaResources.add("BPMN20.xsd");
setSchemaResources(schemaResources);
+
}
public Object parseDocumentElement(Element documentElement, Parse parse) {
@@ -130,7 +132,7 @@
parseActivities(processElement, parse, processDefinition);
// bind activities to their destinations
- parseTransitions(processElement, parse, processDefinition);
+ parseSequenceFlows(processElement, parse, processDefinition);
} finally {
parse.contextStackPop();
@@ -160,7 +162,7 @@
}
}
} else {
- log.trace("skipping unavailable jpdl activities resource: " +
activityResource);
+ log.trace("skipping unavailable activities resource: " +
activityResource);
}
}
}
@@ -224,11 +226,11 @@
}
}
- public void parseTransitions(Element element, Parse parse, CompositeElementImpl
compositeElement) {
+ public void parseSequenceFlows(Element element, Parse parse, CompositeElementImpl
compositeElement) {
List<Element> transitionElements = XmlUtil.elements(element,
"sequenceFlow");
for (Element transitionElement : transitionElements) {
String transitionName = XmlUtil.attribute(transitionElement, "name",
false, parse);
- String transitionId = XmlUtil.attribute(transitionElement, "id", true,
parse);
+ String transitionId = XmlUtil.attribute(transitionElement, "id", false,
parse); // id is not required
String sourceRef = XmlUtil.attribute(transitionElement, "sourceRef",
true, parse);
String targetRef = XmlUtil.attribute(transitionElement, "targetRef",
true, parse);
@@ -352,7 +354,7 @@
if (potentialOwner != null) {
String potentialOwnerRef = XmlUtil.attribute(potentialOwner,
"resourceRef");
// set to fixed expression, more evaluation needed for real BPMN 2.0
- //
taskDefinition.setCandidateGroupsExpression(processDefinition.getResource(potentialOwnerRef));
+
taskDefinition.setAssigneeExpression(processDefinition.getResource(potentialOwnerRef).getName());
}
return taskDefinition;
}