aboutsummaryrefslogtreecommitdiffstats
path: root/distribution/src
diff options
context:
space:
mode:
authorYuanHu <yuan.hu1@zte.com.cn>2018-04-12 14:02:50 +0800
committerYuanHu <yuan.hu1@zte.com.cn>2018-04-12 14:02:50 +0800
commitd447c76fe62dbbb39e6a2d6f2a2bcb53fc53d01e (patch)
treee23b1cb1ef62fdebc02f08c076f6dc2c7da10819 /distribution/src
parentda8c367fc069efd35d3e8e0aabeea8fc78c8036c (diff)
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>
Diffstat (limited to 'distribution/src')
-rw-r--r--distribution/src/main/assembly/conf/workflow-designer.yml2
-rw-r--r--distribution/src/main/assembly/ext-activities-display-info.json75
-rw-r--r--distribution/src/main/assembly/ext-activities.json18
-rw-r--r--distribution/src/main/assembly/temp_workflow.json22
4 files changed, 57 insertions, 60 deletions
diff --git a/distribution/src/main/assembly/conf/workflow-designer.yml b/distribution/src/main/assembly/conf/workflow-designer.yml
index 56d93f30..42785fb4 100644
--- 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 d6817db2..8a5e10af 100644
--- 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 eae58fce..0eb1f0e1 100644
--- 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 2de95107..f12f892e 100644
--- a/distribution/src/main/assembly/temp_workflow.json
+++ b/distribution/src/main/assembly/temp_workflow.json
@@ -60,7 +60,7 @@
"type": "serviceTask",
"typeId": "apds_serviceA",
"icon": "apds_service",
- "name": "JAVA A",
+ "name": "Java Task",
"parentId": "root",
"position": {
"left": 232,
@@ -74,15 +74,16 @@
"targetRef": "scriptTask"
}
],
- "className": "ddd",
+ "className": "org.onap.sdc.workflowdesigner.JavaTask",
"inputs": [
{
"name": "param1",
"valueSource": "string",
"type": "string",
"required": false,
- "show": false,
- "errorMsg": ""
+ "show": true,
+ "errorMsg": "",
+ "value": "a111"
},
{
"name": "param2",
@@ -90,7 +91,8 @@
"type": "string",
"required": true,
"show": true,
- "errorMsg": ""
+ "errorMsg": "",
+ "value": "b111"
},
{
"name": "param3",
@@ -98,12 +100,14 @@
"type": "string",
"required": true,
"show": true,
- "errorMsg": ""
+ "errorMsg": "",
+ "value": "c111"
}
],
"outputs": [
{
"name": "out1",
+ "value": "",
"valueSource": "string",
"type": "string",
"required": false,
@@ -117,7 +121,7 @@
"type": "scriptTask",
"typeId": "apds_scriptB",
"icon": "apds_script",
- "name": "Groovy",
+ "name": "Groovy Task",
"parentId": "root",
"position": {
"left": 335,
@@ -130,7 +134,9 @@
"sourceRef": "scriptTask",
"targetRef": "node2"
}
- ]
+ ],
+ "scriptFormat": "Groovy",
+ "script": "xyz"
}
]
}