Add data object template

Issue-ID: SDC-417

Change-Id: Ibaa0ec9d716b656eedbe050478bd3e7572baf3e6
Signed-off-by: Lvbo163 <lv.bo163@zte.com.cn>

diff --git a/sdc-workflow-designer-server/src/main/resources/bpmn-templates/bpmn_dataObject_template.xml b/sdc-workflow-designer-server/src/main/resources/bpmn-templates/bpmn_dataObject_template.xml
new file mode 100644 (file)
index 0000000..6e0721e
--- /dev/null
+++ b/sdc-workflow-designer-server/src/main/resources/bpmn-templates/bpmn_dataObject_template.xml
@@ -0,0 +1,5 @@
+<dataObject id="${dataObject.id}" name="${dataObject.name}">\r
+    <extensionElements>\r
+        <activiti:value><![CDATA[${dataObject.value}]]></activiti:value>\r
+    </extensionElements>\r
+</dataObject>\r

diff --git a/sdc-workflow-designer-server/src/main/resources/bpmn-templates/bpmn_template.xml b/sdc-workflow-designer-server/src/main/resources/bpmn-templates/bpmn_template.xml
index c212513..3cb1125 100644 (file)
--- a/sdc-workflow-designer-server/src/main/resources/bpmn-templates/bpmn_template.xml
+++ b/sdc-workflow-designer-server/src/main/resources/bpmn-templates/bpmn_template.xml
@@ -6,6 +6,12 @@
     typeLanguage="http://www.w3.org/2001/XMLSchema" expressionLanguage="http://www.w3.org/1999/XPath"\r
     targetNamespace="http://www.activiti.org/test">\r
     <process id="${process.id}" isExecutable="true">\r
+        <!-- dataObjects -->\r
+        #foreach( $dataObject in $process.dataObjectList)\r
+        #parse(\r
+        "${templatePath}bpmn_dataObject_template.xml"\r
+        )\r
+        #end\r
 \r
         <!-- Perform bpmn elements -->\r
         #foreach( $element in $process.elementList)\r

diff --git a/sdc-workflow-designer-server/src/test/resources/workflow/template-test.bpmn20.xml b/sdc-workflow-designer-server/src/test/resources/workflow/template-test.bpmn20.xml
index 20766b8..44a6d7b 100644 (file)
--- a/sdc-workflow-designer-server/src/test/resources/workflow/template-test.bpmn20.xml
+++ b/sdc-workflow-designer-server/src/test/resources/workflow/template-test.bpmn20.xml
@@ -6,7 +6,8 @@
     typeLanguage="http://www.w3.org/2001/XMLSchema" expressionLanguage="http://www.w3.org/1999/XPath"\r
     targetNamespace="http://www.activiti.org/test">\r
     <process id="templateTest" isExecutable="true">\r
-\r
+        <!-- dataObjects -->\r
+        \r
         <!-- Perform bpmn elements -->\r
         \r
     </process>\r