Fixed the format issue in the sample

Replace unsuitable name of extend activities.
Updata display information for extend activities.

Issue-ID: SDC-1210

Change-Id: Ic038cac340d877947d21c9dc6f1d792c94e9fee7
Signed-off-by: YuanHu <yuan.hu1@zte.com.cn>

diff --git a/distribution/src/main/assembly/conf/workflow-designer.yml b/distribution/src/main/assembly/conf/workflow-designer.yml
index 56d93f3..42785fb 100644 (file)
--- a/distribution/src/main/assembly/conf/workflow-designer.yml
+++ b/distribution/src/main/assembly/conf/workflow-designer.yml
@@ -14,6 +14,8 @@ template: Hello, %s!
 
 defaultName: ${DW_DEFAULT_NAME:-Stranger}
 
+adapterType: DEFAULT
+
 sdcServiceProxy:
   serviceAddr: http://127.0.0.1:8080
   xEcompInstanceId: workflow

diff --git a/distribution/src/main/assembly/ext-activities-display-info.json b/distribution/src/main/assembly/ext-activities-display-info.json
index d6817db..8a5e10a 100644 (file)
--- a/distribution/src/main/assembly/ext-activities-display-info.json
+++ b/distribution/src/main/assembly/ext-activities-display-info.json
@@ -1,45 +1,34 @@
 {
-       "nodes": {
-               "apds_script": {},
-               "apds_service": {},
-               "apds_rest": {},
-               "apds_scriptA": {
-                       "category": "aaa"
-               },
-               "apds_scriptB": {
-                       "category": "aaa"
-               },
-               "apds_serviceA": {
-                       "category": "bbb"
-               },
-               "apds_restA": {
-                       "category": "ccc"
-               },
-               "apds_restB": {
-                       "category": "ccc"
-               }
-       },
-       "categoryData": {
-               "aaa": {
-                       "displayName": {
-                               "zh_CN": "扩展脚本任务",
-                               "en_US": "Extension Script Task"
-                       },
-                       "collapse": true
-               },
-               "bbb": {
-                       "displayName": {
-                               "zh_CN": "扩展Service任务",
-                               "en_US": "Extension Service Task"
-                       },
-                       "collapse": true
-               },
-               "ccc": {
-                       "displayName": {
-                               "zh_CN": "扩展REST任务",
-                               "en_US": "Extension REST Service Task"
-                       },
-                       "collapse": true
-               }
-       }
+    "nodes": {
+        "apds_script": {
+        },
+        "apds_service": {
+        },
+        "apds_rest": {
+        },
+        "apds_scriptA": {
+            "category": "aaa"
+        },
+        "apds_scriptB": {
+            "category": "aaa"
+        },
+        "apds_serviceA": {
+            "category": "aaa"
+        },
+        "apds_restA": {
+            "category": "aaa"
+        },
+        "apds_restB": {
+            "category": "aaa"
+        }
+    },
+    "categoryData": {
+        "aaa": {
+            "displayName": {
+                "zh_CN": "扩展任务",
+                "en_US": "Extension Task"
+            },
+            "collapse": true
+        }
+    }
 }
\ No newline at end of file

diff --git a/distribution/src/main/assembly/ext-activities.json b/distribution/src/main/assembly/ext-activities.json
index eae58fc..0eb1f0e 100644 (file)
--- a/distribution/src/main/assembly/ext-activities.json
+++ b/distribution/src/main/assembly/ext-activities.json
@@ -91,12 +91,12 @@
   {
     "id": "apds_scriptB",
     "displayName": {
-      "zh_CN": "Groovy",
-      "en_US": "Groovy"
+      "zh_CN": "Groovy Task",
+      "en_US": "Groovy Task"
     },
     "description": {
-      "zh_CN": "脚本节点",
-      "en_US": "Script Node"
+      "zh_CN": "Groovy Task",
+      "en_US": "Groovy Task"
     },
     "type": "scriptTask",
     "icon": {
@@ -112,12 +112,12 @@
   {
     "id": "apds_serviceA",
     "displayName": {
-      "zh_CN": "JAVA A",
-      "en_US": "JAVA A"
+      "zh_CN": "Java Task",
+      "en_US": "Java Task"
     },
     "description": {
-      "zh_CN": "JAVA 节点",
-      "en_US": "JAVA Node"
+      "zh_CN": "Java Task",
+      "en_US": "Java Task"
     },
     "type": "serviceTask",
     "icon": {
@@ -136,7 +136,7 @@
             "zh_CN": "参数1",
             "en_US": "Param1"
           },
-          "show": false,
+          "show": true,
           "editable": true
         },
         "param2": {

diff --git a/distribution/src/main/assembly/temp_workflow.json b/distribution/src/main/assembly/temp_workflow.json
index 2de9510..f12f892 100644 (file)
--- a/distribution/src/main/assembly/temp_workflow.json
+++ b/distribution/src/main/assembly/temp_workflow.json
@@ -60,7 +60,7 @@
         "type": "serviceTask",\r
         "typeId": "apds_serviceA",\r
         "icon": "apds_service",\r
-        "name": "JAVA A",\r
+        "name": "Java Task",\r
         "parentId": "root",\r
         "position": {\r
           "left": 232,\r
@@ -74,15 +74,16 @@
             "targetRef": "scriptTask"\r
           }\r
         ],\r
-        "className": "ddd",\r
+        "className": "org.onap.sdc.workflowdesigner.JavaTask",\r
         "inputs": [\r
           {\r
             "name": "param1",\r
             "valueSource": "string",\r
             "type": "string",\r
             "required": false,\r
-            "show": false,\r
-            "errorMsg": ""\r
+            "show": true,\r
+            "errorMsg": "",\r
+            "value": "a111"\r
           },\r
           {\r
             "name": "param2",\r
@@ -90,7 +91,8 @@
             "type": "string",\r
             "required": true,\r
             "show": true,\r
-            "errorMsg": ""\r
+            "errorMsg": "",\r
+            "value": "b111"\r
           },\r
           {\r
             "name": "param3",\r
@@ -98,12 +100,14 @@
             "type": "string",\r
             "required": true,\r
             "show": true,\r
-            "errorMsg": ""\r
+            "errorMsg": "",\r
+            "value": "c111"\r
           }\r
         ],\r
         "outputs": [\r
           {\r
             "name": "out1",\r
+            "value": "",\r
             "valueSource": "string",\r
             "type": "string",\r
             "required": false,\r
@@ -117,7 +121,7 @@
         "type": "scriptTask",\r
         "typeId": "apds_scriptB",\r
         "icon": "apds_script",\r
-        "name": "Groovy",\r
+        "name": "Groovy Task",\r
         "parentId": "root",\r
         "position": {\r
           "left": 335,\r
@@ -130,7 +134,9 @@
             "sourceRef": "scriptTask",\r
             "targetRef": "node2"\r
           }\r
-        ]\r
+        ],\r
+        "scriptFormat": "Groovy",\r
+        "script": "xyz"\r
       }\r
     ]\r
   }\r