From 0246959aeb2bd4cb04e00649a0378a846116fbf9 Mon Sep 17 00:00:00 2001
From: YuanHu <yuan.hu1@zte.com.cn>
Date: Thu, 15 Mar 2018 16:17:00 +0800
Subject: Generate bpmn for extend activities

Modify BPMN Convertor to support conversion of extend activities.
Change copyright year from 2017 to 2017-2018

Issue-ID: SDC-679

Change-Id: I835fee3901302d53a948e50d2c2a03736f524e4b
Signed-off-by: YuanHu <yuan.hu1@zte.com.cn>
---
 .../resources/workflow/template-test.bpmn20.xml    | 23 ++++++------
 .../src/test/resources/workflow/workflow.json      | 42 ++++++++++++++--------
 2 files changed, 38 insertions(+), 27 deletions(-)

(limited to 'sdc-workflow-designer-server/src/test/resources/workflow')

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 589ab715..5c022a2e 100644
--- 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
@@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:activiti="http://activiti.org/bpmn" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI"
-    xmlns:omgdc="http://www.omg.org/spec/DD/20100524/DC" xmlns:omgdi="http://www.omg.org/spec/DD/20100524/DI"
-    typeLanguage="http://www.w3.org/2001/XMLSchema" expressionLanguage="http://www.w3.org/1999/XPath"
-    targetNamespace="http://www.activiti.org/test">
-    <process id="templateTest" isExecutable="true">
-        <!-- dataObjects -->
-        
-        <!-- Perform bpmn elements -->
-        
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:activiti="http://activiti.org/bpmn"
+	xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:omgdc="http://www.omg.org/spec/DD/20100524/DC"
+	xmlns:omgdi="http://www.omg.org/spec/DD/20100524/DI" typeLanguage="http://www.w3.org/2001/XMLSchema"
+	expressionLanguage="http://www.w3.org/1999/XPath" targetNamespace="http://www.activiti.org/test">
+	<process id="templateTest" isExecutable="true">
+		<!-- dataObjects -->
+		
+		<!-- Perform bpmn elements -->
+
 		<!-- Perform bpmn sequence flow -->
-		    </process>
-</definitions>
 
+	</process>
+</definitions>
diff --git a/sdc-workflow-designer-server/src/test/resources/workflow/workflow.json b/sdc-workflow-designer-server/src/test/resources/workflow/workflow.json
index 2042810f..1fa3d10e 100644
--- a/sdc-workflow-designer-server/src/test/resources/workflow/workflow.json
+++ b/sdc-workflow-designer-server/src/test/resources/workflow/workflow.json
@@ -1,16 +1,28 @@
-{"nodes":[
-        {
-            "sequenceFlows":[
-                {"condition":"","sourceRef":"node0","targetRef":"node1"}
-            ],
-            "parameters":[],"id":"node0","name":"startEvent","type":"startEvent","parentId":"root",
-            "position":{"width":30,"height":30,"left":468,"top":55}
-        },
-        {
-            "sequenceFlows":[],
-            "input":[],"output":[],"template":{},"id":"node1","name":"endEvent",
-            "type":"endEvent","parentId":"root",
-            "position":{"width":252.08334350585938,"height":46.66666793823242,"left":432,"top":167}
-        }],
-"configs":{"restConfigs":[]}
+{
+    "id":"id12345",
+    "name":"test",
+    "scene":"abcd",
+    "data":{
+        "nodes":[
+            {
+                "id":"scriptTask",
+                "type":"scriptTask",
+                "typeId":"apds_script",
+                "icon":"apds_script",
+                "name":"Script Task",
+                "parentId":"root",
+                "position":{
+                    "left":328,
+                    "top":134,
+                    "width":56,
+                    "height":56
+                },
+                "connection":[
+
+                ],
+                "scriptFormat":"JavaScript",
+                "script":""
+            }
+        ]
+    }
 }
\ No newline at end of file
-- 
cgit 1.2.3-korg