rename andChildren tag to includeChildExceptions

modules/activiti-bpmn-converter/src/main/java/org/activiti/bpmn/constants/BpmnXMLConstants.java

@@ -286,6 +286,6 @@ public interface BpmnXMLConstants {
   public static final String FAILED_JOB_RETRY_TIME_CYCLE = "failedJobRetryTimeCycle";
   public static final String MAP_EXCEPTION = "mapException";
   public static final String MAP_EXCEPTION_ERRORCODE = "errorCode";
-  public static final String MAP_EXCEPTION_ANDCHILDREN = "andChildren";
+  public static final String MAP_EXCEPTION_ANDCHILDREN = "includeChildExceptions";
   
 }

modules/activiti-bpmn-converter/src/main/resources/org/activiti/impl/bpmn/parser/activiti-bpmn-extensions-5.15.xsd

@@ -628,7 +628,7 @@
     <complexType>
     	<sequence>
     	   <element name="errorCode" type="string"/>
-    	   <element name="andChildren" type="boolean"/>
+    	   <element name="includeChildExceptions" type="boolean"/>
     	</sequence>
     </complexType>
   </element>

modules/activiti-bpmn-converter/src/test/resources/mapException/mapExceptionInvalidHasChildrenModel.bpmn

@@ -4,7 +4,7 @@
     <startEvent id="startevent1" name="Start"></startEvent>
     <sequenceFlow id="flow1" sourceRef="startevent1" targetRef="servicetaskWithAndTrueAndChildren"></sequenceFlow>
     <serviceTask id="servicetaskWithAndTrueAndChildren" name="Service Task with andChildren Set to True">
-        <activiti:mapException errorCode="myErrorCode1" andChildren="NoTrueOrFalse">com.activiti.Something1</activiti:mapException>
+        <activiti:mapException errorCode="myErrorCode1" includeChildExceptions="NoTrueOrFalse">com.activiti.Something1</activiti:mapException>
     </serviceTask>
     <sequenceFlow id="flow2" sourceRef="servicetaskWithAndTrueAndChildren" targetRef="endevent1"></sequenceFlow>
     

modules/activiti-bpmn-converter/src/test/resources/mapException/mapExceptionModel.bpmn

@@ -4,12 +4,12 @@
     <startEvent id="startevent1" name="Start"></startEvent>
     <sequenceFlow id="flow1" sourceRef="startevent1" targetRef="servicetaskWithAndTrueAndChildren"></sequenceFlow>
     <serviceTask id="servicetaskWithAndTrueAndChildren" name="Service Task with andChildren Set to True">
-        <activiti:mapException errorCode="myErrorCode1" andChildren="true">com.activiti.Something1</activiti:mapException>
-        <activiti:mapException errorCode="myErrorCode2" andChildren="false">com.activiti.Something2</activiti:mapException>
+        <activiti:mapException errorCode="myErrorCode1" includeChildExceptions="true">com.activiti.Something1</activiti:mapException>
+        <activiti:mapException errorCode="myErrorCode2" includeChildExceptions="false">com.activiti.Something2</activiti:mapException>
         <activiti:mapException errorCode="myErrorCode3">com.activiti.Something3</activiti:mapException>
     </serviceTask>
     <sequenceFlow id="flow2" sourceRef="servicetaskWithAndTrueAndChildren" targetRef="servicetaskWithNoMapException"></sequenceFlow>
-    <serviceTask id="servicetaskWithNoMapException" name="Service Task with andChildren Set to True">
+    <serviceTask id="servicetaskWithNoMapException" name="Service Task with includeChildExceptions Set to True">
     </serviceTask>
     <sequenceFlow id="flow3" sourceRef="servicetaskWithNoMapException" targetRef="endevent1"></sequenceFlow>
     

modules/activiti-bpmn-converter/src/test/resources/mapException/mapExceptionNoErrorCode.bpmn

@@ -3,7 +3,7 @@
   <process id="mapExceptionInvalidHasChildrenTestProcess" name="mapException Test Process with Invalid has Children" isExecutable="true">
     <startEvent id="startevent1" name="Start"></startEvent>
     <sequenceFlow id="flow1" sourceRef="startevent1" targetRef="servicetaskWithAndTrueAndChildren"></sequenceFlow>
-    <serviceTask id="servicetaskWithAndTrueAndChildren" name="Service Task with andChildren Set to True">
+    <serviceTask id="servicetaskWithAndTrueAndChildren" name="Service Task with includeChildExceptions Set to True">
         <activiti:mapException >com.activiti.Something1</activiti:mapException>
     </serviceTask>
     <sequenceFlow id="flow2" sourceRef="servicetaskWithAndTrueAndChildren" targetRef="endevent1"></sequenceFlow>

modules/activiti-bpmn-converter/src/test/resources/mapException/mapExceptionNoExceptionClass.bpmn

@@ -3,7 +3,7 @@
   <process id="mapExceptionInvalidHasChildrenTestProcess" name="mapException Test Process with Invalid has Children" isExecutable="true">
     <startEvent id="startevent1" name="Start"></startEvent>
     <sequenceFlow id="flow1" sourceRef="startevent1" targetRef="servicetaskWithAndTrueAndChildren"></sequenceFlow>
-    <serviceTask id="servicetaskWithAndTrueAndChildren" name="Service Task with andChildren Set to True">
+    <serviceTask id="servicetaskWithAndTrueAndChildren" name="Service Task with includeChildExceptions Set to True">
         <activiti:mapException errorCode="myErrorCode1"></activiti:mapException>
     </serviceTask>
     <sequenceFlow id="flow2" sourceRef="servicetaskWithAndTrueAndChildren" targetRef="endevent1"></sequenceFlow>

modules/activiti-engine/src/test/java/org/activiti/engine/test/bpmn/event/error/mapError/BoundaryErrorMapTest.java

@@ -15,9 +15,10 @@ package org.activiti.engine.test.bpmn.event.error.mapError;
 import java.util.HashMap;
 import java.util.Map;
 
+import javax.xml.bind.JAXBException;
+
 import org.activiti.engine.impl.test.PluggableActivitiTestCase;
 import org.activiti.engine.test.Deployment;
-import org.activiti.engine.test.mock.MockServiceTask;
 import org.activiti.standalone.testing.helpers.ServiceTaskTestMock;
 
 /**
@@ -43,7 +44,7 @@ public class BoundaryErrorMapTest extends PluggableActivitiTestCase{
     FlagDelegate.reset();
     
     Map<String, Object> vars = new HashMap<String, Object>();
-    vars.put("exceptionClass", BoundaryEventChildException.class.getName());
+    vars.put("exceptionClass", JAXBException.class.getName());
     assertEquals(0, ServiceTaskTestMock.CALL_COUNT.get());
     
     try {

modules/activiti-engine/src/test/resources/org/activiti/engine/test/bpmn/event/error/mapError/BoundaryErrorMapTest.testDefaultMap.bpmn20.xml

@@ -6,7 +6,7 @@
     <sequenceFlow id="flow1" sourceRef="theStart" targetRef="serviceTask"></sequenceFlow>
     <serviceTask id="serviceTask" activiti:class="org.activiti.engine.test.bpmn.event.error.mapError.ThrowCustomExceptionDelegate">
       <extensionElements>
-        <activiti:mapException xmlns:activiti="http://activiti.org/bpmn" errorCode="myErrorCode1" withChildren="true"></activiti:mapException>
+        <activiti:mapException xmlns:activiti="http://activiti.org/bpmn" errorCode="myErrorCode1" includeChildExceptions="true"></activiti:mapException>
       </extensionElements>
     </serviceTask>
     <boundaryEvent id="catchError" attachedToRef="serviceTask">

modules/activiti-engine/src/test/resources/org/activiti/engine/test/bpmn/event/error/mapError/BoundaryErrorMapTest.testSingleDirectMap.bpmn20.xml

@@ -6,7 +6,7 @@
     <sequenceFlow id="flow1" sourceRef="theStart" targetRef="serviceTask"></sequenceFlow>
     <serviceTask id="serviceTask" activiti:class="org.activiti.engine.test.bpmn.event.error.mapError.ThrowCustomExceptionDelegate">
       <extensionElements>
-        <activiti:mapException xmlns:activiti="http://activiti.org/bpmn" errorCode="myErrorCode1" withChildren="true">org.activiti.engine.test.bpmn.event.error.mapError.BoundaryErrorParentException</activiti:mapException>
+        <activiti:mapException xmlns:activiti="http://activiti.org/bpmn" errorCode="myErrorCode1" includeChildExceptions="true">org.activiti.engine.test.bpmn.event.error.mapError.BoundaryErrorParentException</activiti:mapException>
       </extensionElements>
     </serviceTask>
     <boundaryEvent id="catchError" attachedToRef="serviceTask">

modules/activiti-engine/src/test/resources/org/activiti/engine/test/bpmn/event/error/mapError/BoundaryErrorMapTest.testSingleInheritedMap.bpmn20.xml

@@ -6,7 +6,7 @@
     <sequenceFlow id="flow1" sourceRef="theStart" targetRef="serviceTask"></sequenceFlow>
     <serviceTask id="serviceTask" activiti:class="org.activiti.engine.test.bpmn.event.error.mapError.ThrowCustomExceptionDelegate">
       <extensionElements>
-        <activiti:mapException xmlns:activiti="http://activiti.org/bpmn" errorCode="myErrorCode1" andChildren="true">org.activiti.engine.test.bpmn.event.error.mapError.BoundaryErrorParentException</activiti:mapException>
+        <activiti:mapException xmlns:activiti="http://activiti.org/bpmn" errorCode="myErrorCode1" includeChildExceptions="true">org.activiti.engine.test.bpmn.event.error.mapError.BoundaryErrorParentException</activiti:mapException>
       </extensionElements>
     </serviceTask>
     <boundaryEvent id="catchError" attachedToRef="serviceTask">