diff --git a/modules/activiti-cxf/src/test/resources/activiti.cfg.xml b/modules/activiti-cxf/src/test/resources/activiti.cfg.xml index eb7a9d5c22523b34f14e34c68c07db3c543c5db1..d50b35a602060972f7673cdaa126eb44cdb9310b 100644 --- a/modules/activiti-cxf/src/test/resources/activiti.cfg.xml +++ b/modules/activiti-cxf/src/test/resources/activiti.cfg.xml @@ -1,15 +1,14 @@ - - - - - - - - - - - + + + + + + + + + + + diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/parser/BpmnParse.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/parser/BpmnParse.java index eab8cbe192747965ebd220b9ab8257e4f6a1fcba..b2a7ac6f633f08e96a0cb495cff799bc67b0a0ae 100644 --- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/parser/BpmnParse.java +++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/parser/BpmnParse.java @@ -207,18 +207,23 @@ public class BpmnParse extends Parse { public BpmnParse execute() { super.execute(); // schema validation - parseDefinitionsAttributes(); - parseImports(); - parseItemDefinitions(); - parseMessages(); - parseInterfaces(); - parseProcessDefinitions(); - - if (hasWarnings()) { - logWarnings(); - } - if (hasErrors()) { - throwActivitiExceptionForErrors(); + try { + parseDefinitionsAttributes(); + parseImports(); + parseItemDefinitions(); + parseMessages(); + parseInterfaces(); + parseProcessDefinitions(); + + } catch(Exception e) { + LOG.log(Level.SEVERE, "Uknown exception", e); + } finally { + if (hasWarnings()) { + logWarnings(); + } + if (hasErrors()) { + throwActivitiExceptionForErrors(); + } } return this; diff --git a/modules/activiti-mule/src/test/resources/activiti.cfg.xml b/modules/activiti-mule/src/test/resources/activiti.cfg.xml index 4eeab470d7e6b55bacefe67a67cea06af6d33a41..d50b35a602060972f7673cdaa126eb44cdb9310b 100644 --- a/modules/activiti-mule/src/test/resources/activiti.cfg.xml +++ b/modules/activiti-mule/src/test/resources/activiti.cfg.xml @@ -1,15 +1,14 @@ - - - - - - - - - - - + + + + + + + + + + + diff --git a/modules/activiti-spring/src/test/resources/activiti.cfg.xml b/modules/activiti-spring/src/test/resources/activiti.cfg.xml deleted file mode 100644 index 4eeab470d7e6b55bacefe67a67cea06af6d33a41..0000000000000000000000000000000000000000 --- a/modules/activiti-spring/src/test/resources/activiti.cfg.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - diff --git a/pom.xml b/pom.xml index 9238b3dde7f8a3416e08614ce4bdf0a5d77fea78..e56be87d0b2772796ce0edfc6dbe49aa223f33b1 100644 --- a/pom.xml +++ b/pom.xml @@ -509,6 +509,12 @@ modules/activiti-webapp-rest + + checkmule + + modules/activiti-mule + + checkspring