Porting https://github.com/Activiti/Activiti/commit/74b57bfb203ff52d3a00c4b4e070aedf6d3ad66d to v6

modules/activiti-bpmn-converter/src/test/java/org/activiti/editor/language/xml/MessageConverterTest.java

@@ -8,35 +8,35 @@ import org.activiti.bpmn.model.Message;
 import org.junit.Test;
 
 public class MessageConverterTest extends AbstractConverterTest {
-
+  
   @Test
   public void connvertXMLToModel() throws Exception {
     BpmnModel bpmnModel = readXMLFile();
     validateModel(bpmnModel);
   }
-
+  
   @Test
   public void convertModelToXML() throws Exception {
     BpmnModel bpmnModel = readXMLFile();
     BpmnModel parsedModel = exportAndReadXMLFile(bpmnModel);
     validateModel(parsedModel);
   }
-
+  
   private void validateModel(BpmnModel model) {
-    Message message = model.getMessage("writeReportId");
+    Message message = model.getMessage("writeReport");
     assertNotNull(message);
-    assertEquals("writeReportItem", message.getItemRef());
-    assertEquals("writeReportName", message.getName());
-    assertEquals("writeReportId", message.getId());
+    assertEquals("Examples:writeReportItem", message.getItemRef());
+    assertEquals("newWriteReport", message.getName());
+    assertEquals("writeReport", message.getId());
 
-    Message message2 = model.getMessage("writeReport2Id");
+    Message message2 = model.getMessage("writeReport2");
     assertNotNull(message2);
-    assertEquals("writeReportItem2", message2.getItemRef());
-    assertEquals("writeReport2Name", message2.getName());
-    assertEquals("writeReport2Id", message2.getId());
+    assertEquals("http://foo.bar.com/Examples:writeReportItem2", message2.getItemRef());
+    assertEquals("newWriteReport2", message2.getName());
+    assertEquals("writeReport2", message2.getId());
   }
-
+  
   protected String getResource() {
-    return "message.bpmn";
+        return "message.bpmn";
   }
 }
\ No newline at end of file

modules/activiti-bpmn-converter/src/test/resources/message.bpmn

@@ -7,16 +7,16 @@
   xmlns:tns2="http://foo.bar.com/Examples"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" >
  
-	<message id="writeReportId" name="writeReportName" itemRef="writeReportItem"/>
-  <message id="writeReport2Id" name="writeReport2Name" itemRef="writeReportItem2"/>
- 
-	<process id="process01" isExecutable="true">
+  <message id="writeReport" name="newWriteReport" itemRef="tns:writeReportItem"/>
+  <message id="writeReport2" name="newWriteReport2" itemRef="tns2:writeReportItem2"/>
+
+  <process id="process01" isExecutable="true">
  
         <startEvent id="theStart">
-            <messageEventDefinition messageRef="writeReportId" />
+            <messageEventDefinition messageRef="tns:writeReport" />
         </startEvent>
  
         <sequenceFlow id="flow1" sourceRef="theStart" targetRef="theEnd" />
  
-	</process>
+  </process>
 </definitions>
\ No newline at end of file