Index: modules/api/src/main/resources/jpdl-4.4.xsd =================================================================== --- modules/api/src/main/resources/jpdl-4.4.xsd (revision 6377) +++ modules/api/src/main/resources/jpdl-4.4.xsd (working copy) @@ -375,16 +375,16 @@ - + - - - - - - - - + + + + + + + + @@ -927,6 +927,10 @@ should be automatically wired based on matching the property names and types with the object names and types + + Indicates if the user code should be cache or not + + @@ -934,6 +938,9 @@ Each 'arg' element should have exactly one child element that represents the value of the argument. + + + The java class name representing the type of the method. This is optional and can be used to @@ -1282,36 +1289,40 @@ - - - - - - - - - - - - - - - - URL reference to the attachment - - - Name of the attachment resource on the classpath - - - File reference to the attachment - - - - - - - - + + + + + + + + + + + + + + + + + + URL reference to the attachment + + + Name of the attachment resource on the classpath + + + File reference to the attachment + + + + + + + + + + Index: modules/jpdl/src/main/java/org/jbpm/jpdl/internal/xml/JpdlParser.java =================================================================== --- modules/jpdl/src/main/java/org/jbpm/jpdl/internal/xml/JpdlParser.java (revision 6377) +++ modules/jpdl/src/main/java/org/jbpm/jpdl/internal/xml/JpdlParser.java (working copy) @@ -84,16 +84,18 @@ public static final String NAMESPACE_JPDL_40 = "http://jbpm.org/4.0/jpdl"; public static final String NAMESPACE_JPDL_42 = "http://jbpm.org/4.2/jpdl"; public static final String NAMESPACE_JPDL_43 = "http://jbpm.org/4.3/jpdl"; + public static final String NAMESPACE_JPDL_44 = "http://jbpm.org/4.4/jpdl"; - public static final String CURRENT_VERSION_JBPM = "4.3"; + public static final String CURRENT_VERSION_JBPM = "4.4"; public static final String CURRENT_VERSION_NAMESPACE = "http://jbpm.org/"+CURRENT_VERSION_JBPM+"/jpdl"; public static final String CURRENT_VERSION_PROCESS_LANGUAGE_ID = "jpdl-"+CURRENT_VERSION_JBPM; - + public static final List SCHEMA_RESOURCES = new ArrayList(); static { SCHEMA_RESOURCES.add("jpdl-4.0.xsd"); SCHEMA_RESOURCES.add("jpdl-4.2.xsd"); SCHEMA_RESOURCES.add("jpdl-4.3.xsd"); + SCHEMA_RESOURCES.add("jpdl-4.4.xsd"); } // array elements are mutable, even when final Index: modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/ArgParsingTest.java =================================================================== --- modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/ArgParsingTest.java (revision 0) +++ modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/ArgParsingTest.java (revision 0) @@ -0,0 +1,52 @@ +package org.jbpm.jpdl.parsing; + +import java.util.List; +import org.jbpm.api.activity.ActivityBehaviour; +import org.jbpm.api.model.Activity; +import org.jbpm.api.model.OpenExecution; +import org.jbpm.jpdl.internal.activity.DecisionConditionActivity; +import org.jbpm.pvm.internal.client.ClientProcessDefinition; +import org.jbpm.pvm.internal.el.Expression; +import org.jbpm.pvm.internal.el.StaticTextExpression; +import org.jbpm.pvm.internal.model.ActivityImpl; +import org.jbpm.pvm.internal.model.Condition; +import org.jbpm.pvm.internal.model.ProcessDefinitionImpl; +import org.jbpm.pvm.internal.model.ExecutionImpl; +import org.jbpm.pvm.internal.model.TransitionImpl; +import org.jbpm.pvm.internal.wire.usercode.UserCodeCondition; +import org.jbpm.pvm.internal.xml.Problem; + +/** + * JBPM-2715. + * + * @author Huisheng Xu + */ +public class ArgParsingTest extends JpdlParseTestCase { + + public void testArgParse() { + String xmlString = + "\n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + "\n"; + + List problems = jpdlParser.createParse() + .setString(xmlString) + .execute() + .getProblems(); + + assertEquals("[]", problems.toString()); + } +} Index: modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/CacheParsingTest.java =================================================================== --- modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/CacheParsingTest.java (revision 0) +++ modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/CacheParsingTest.java (revision 0) @@ -0,0 +1,44 @@ +package org.jbpm.jpdl.parsing; + +import java.util.List; +import org.jbpm.api.activity.ActivityBehaviour; +import org.jbpm.api.model.Activity; +import org.jbpm.api.model.OpenExecution; +import org.jbpm.jpdl.internal.activity.DecisionConditionActivity; +import org.jbpm.pvm.internal.client.ClientProcessDefinition; +import org.jbpm.pvm.internal.el.Expression; +import org.jbpm.pvm.internal.el.StaticTextExpression; +import org.jbpm.pvm.internal.model.ActivityImpl; +import org.jbpm.pvm.internal.model.Condition; +import org.jbpm.pvm.internal.model.ProcessDefinitionImpl; +import org.jbpm.pvm.internal.model.ExecutionImpl; +import org.jbpm.pvm.internal.model.TransitionImpl; +import org.jbpm.pvm.internal.wire.usercode.UserCodeCondition; +import org.jbpm.pvm.internal.xml.Problem; + +/** + * JBPM-2849. + * + * @author Huisheng Xu + */ +public class CacheParsingTest extends JpdlParseTestCase { + + public void testCacheParse() { + String xmlString = + "\n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + "\n"; + + List problems = jpdlParser.createParse() + .setString(xmlString) + .execute() + .getProblems(); + + assertEquals("[]", problems.toString()); + } +} Index: modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/MailParsingTest.java =================================================================== --- modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/MailParsingTest.java (revision 0) +++ modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/MailParsingTest.java (revision 0) @@ -0,0 +1,45 @@ +package org.jbpm.jpdl.parsing; + +import java.util.List; +import org.jbpm.api.activity.ActivityBehaviour; +import org.jbpm.api.model.Activity; +import org.jbpm.api.model.OpenExecution; +import org.jbpm.jpdl.internal.activity.DecisionConditionActivity; +import org.jbpm.pvm.internal.client.ClientProcessDefinition; +import org.jbpm.pvm.internal.el.Expression; +import org.jbpm.pvm.internal.el.StaticTextExpression; +import org.jbpm.pvm.internal.model.ActivityImpl; +import org.jbpm.pvm.internal.model.Condition; +import org.jbpm.pvm.internal.model.ProcessDefinitionImpl; +import org.jbpm.pvm.internal.model.ExecutionImpl; +import org.jbpm.pvm.internal.model.TransitionImpl; +import org.jbpm.pvm.internal.wire.usercode.UserCodeCondition; +import org.jbpm.pvm.internal.xml.Problem; + +/** + * JBPM-2843. + * + * @author Huisheng Xu + */ +public class MailParsingTest extends JpdlParseTestCase { + + public void testMailParse() { + String xmlString = + "" + + " " + + " " + + " " + + " " + + " " + + " " + + " " + + ""; + + List problems = jpdlParser.createParse() + .setString(xmlString) + .execute() + .getProblems(); + + assertEquals("[]", problems.toString()); + } +}