MARP-616 ATrust refactoring (#41)

* Convert project to ivy 11.3.1 * Update classpath * Update workflow version to the latest
axonivy-market · Aug 30, 2024 · b8c6a37 · b8c6a37
1 parent 39df49e
commit b8c6a37
Show file tree

Hide file tree

Showing 44 changed files with 715 additions and 895 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -8,4 +8,4 @@ on:
 
 jobs:
   build:
-    uses: axonivy-market/github-workflows/.github/workflows/ci.yml@v3
+    uses: axonivy-market/github-workflows/.github/workflows/ci.yml@v4
diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
@@ -8,8 +8,4 @@ on:
 
 jobs:
   build:
-    uses: axonivy-market/github-workflows/.github/workflows/dev.yml@v3
-    with:
-      # temporary: disable script validation ... connector uses a variable not compatible with 11.4!
-      mvnArgs: '-Divy.script.validation.skip=true'
-
+    uses: axonivy-market/github-workflows/.github/workflows/dev.yml@v4
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -4,4 +4,4 @@ on: workflow_dispatch
 
 jobs:
   build:
-    uses: axonivy-market/github-workflows/.github/workflows/release.yml@v2
+    uses: axonivy-market/github-workflows/.github/workflows/release.yml@v4
diff --git a/a-trust-connector-demo/.classpath b/a-trust-connector-demo/.classpath
@@ -4,12 +4,7 @@
 			<attribute name="optional" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry excluding="**/*.ivyClass|**/*.mod|**/*.rddescriptor|**/*.xhtml" kind="src" path="src_hd">
-		<attributes>
-			<attribute name="optional" value="true"/>
-		</attributes>
-	</classpathentry>
-
+
 	<classpathentry kind="src" path="src_wsproc">
 		<attributes>
 			<attribute name="optional" value="true"/>

diff --git a/a-trust-connector-demo/.project b/a-trust-connector-demo/.project
@@ -25,6 +25,11 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>ch.ivyteam.ivy.dialog.form.build.ivyDialogFormBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>ch.ivyteam.ivy.designer.ide.ivyModelValidationBuilder</name>
 			<arguments>

diff --git a/a-trust-connector-demo/.settings/ch.ivyteam.ivy.designer.prefs b/a-trust-connector-demo/.settings/ch.ivyteam.ivy.designer.prefs
@@ -1,5 +1,5 @@
 ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_DATA_CLASS=com.axonivy.connector.atrust.demo.Data
 ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_NAMESPACE=com.axonivy.connector.atrust.demo
-ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=11
-ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=100000
-eclipse.preferences.version=1
+ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=13
+ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=113000
+eclipse.preferences.version=1
diff --git a/a-trust-connector-demo/.settings/org.eclipse.wst.common.component b/a-trust-connector-demo/.settings/org.eclipse.wst.common.component
@@ -1,21 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
-
     <wb-module deploy-name="a-trust-connector-demo">
-
         <wb-resource deploy-path="/" source-path="/webContent" tag="defaultRootSource"/>
-
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
-
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src_hd"/>
-
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src_wsproc"/>
-
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src_dataClasses"/>
-
         <property name="context-root" value="a-trust-connector-demo"/>
-
         <property name="java-output-path" value="/a-trust-connector-demo/classes"/>
-
     </wb-module>
-
-</project-modules>
+</project-modules>
diff --git a/a-trust-connector-demo/pom.xml b/a-trust-connector-demo/pom.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.axonivy.connector.atrust</groupId>
   <artifactId>a-trust-connector-demo</artifactId>
-  <version>10.0.23-SNAPSHOT</version>
+  <version>11.3.1-SNAPSHOT</version>
   <packaging>iar</packaging>
   <properties>
-    <project.build.plugin.version>10.0.16</project.build.plugin.version>
+    <project.build.plugin.version>11.3.0</project.build.plugin.version>
   </properties>
   <pluginRepositories>
     <!-- Snapshot releases are available via sonatype.org -->

diff --git a/a-trust-connector-demo/processes/ATrustIntegration/ATrustDemo.p.json b/a-trust-connector-demo/processes/ATrustIntegration/ATrustDemo.p.json
@@ -1,5 +1,5 @@
 {
-  "format" : "10.0.0",
+  "$schema" : "https://json-schema.axonivy.com/process/11.3.0/process.json",
   "id" : "1798254723F146E3",
   "config" : {
     "data" : "com.axonivy.connector.atrust.demo.Data"
@@ -35,47 +35,55 @@
       "type" : "RequestStart",
       "name" : "StartATrustExample.ivp",
       "config" : {
-        "callSignature" : "StartATrustExample",
-        "case" : {
-          "name" : "Your process"
+        "signature" : "StartATrustExample",
+        "request" : {
+          "name" : "A-Trust HandySignatur Example"
         },
-        "outLink" : "StartATrustExample.ivp",
-        "startName" : "A-Trust HandySignatur Example",
-        "tags" : "demo"
+        "case" : {
+          "name" : "Your process",
+          "customFields" : [
+            { "name" : "embedInFrame", "type" : "STRING", "value" : "\"true\"" }
+          ]
+        }
       },
+      "tags" : [
+        "demo"
+      ],
       "visual" : {
         "at" : { "x" : 96, "y" : 312 },
         "labelOffset" : { "x" : 49, "y" : 37 }
       },
-      "connect" : { "id" : "f6", "to" : "f3" }
+      "connect" : [
+        { "id" : "f6", "to" : "f3" }
+      ]
     }, {
       "id" : "f4",
       "type" : "RequestStart",
       "name" : "AddTemplateATrust.ivp",
       "config" : {
-        "callSignature" : "AddTemplateATrust",
-        "outLink" : "AddTemplateATrust.ivp",
-        "case" : { }
+        "signature" : "AddTemplateATrust"
       },
       "visual" : {
         "at" : { "x" : 96, "y" : 496 },
         "labelOffset" : { "x" : 52, "y" : 37 }
       },
-      "connect" : { "id" : "f26", "to" : "f89" }
+      "connect" : [
+        { "id" : "f26", "to" : "f89" }
+      ]
     }, {
       "id" : "f17",
       "type" : "RequestStart",
       "name" : "GetListTemplate.ivp",
       "config" : {
-        "callSignature" : "GetListTemplate",
-        "outLink" : "GetListTemplate.ivp",
-        "case" : { }
+        "signature" : "GetListTemplate"
       },
       "visual" : {
         "at" : { "x" : 104, "y" : 944 },
         "labelOffset" : { "x" : 17, "y" : 33 }
       },
-      "connect" : { "id" : "f14", "to" : "f7" }
+      "connect" : [
+        { "id" : "f14", "to" : "f7" }
+      ]
     }, {
       "id" : "f21",
       "type" : "ProcessAnnotation",
@@ -87,7 +95,9 @@
         "at" : { "x" : 280, "y" : 424 },
         "size" : { "width" : 432, "height" : 44 }
       },
-      "connect" : { "id" : "f13", "to" : "f4" }
+      "connect" : [
+        { "id" : "f13", "to" : "f4" }
+      ]
     }, {
       "id" : "f22",
       "type" : "ProcessAnnotation",
@@ -99,7 +109,9 @@
         "at" : { "x" : 280, "y" : 608 },
         "size" : { "width" : 432, "height" : 44 }
       },
-      "connect" : { "id" : "f8", "to" : "f34" }
+      "connect" : [
+        { "id" : "f8", "to" : "f34" }
+      ]
     }, {
       "id" : "f18",
       "type" : "ProcessAnnotation",
@@ -131,42 +143,45 @@
         "at" : { "x" : 279, "y" : 832 },
         "size" : { "width" : 430, "height" : 50 }
       },
-      "connect" : { "id" : "f23", "to" : "f17" }
+      "connect" : [
+        { "id" : "f23", "to" : "f17" }
+      ]
     }, {
       "id" : "f3",
       "type" : "UserTask",
       "name" : "Sign a Document",
       "config" : {
-        "dialogId" : "com.axonivy.connector.atrust.demo.DocumentSignature",
-        "startMethod" : "start()",
-        "case" : {
-          "name" : "A-Trust Demo"
-        },
+        "dialog" : "com.axonivy.connector.atrust.demo.DocumentSignature:start()",
         "task" : {
           "name" : "Start A-Trust Demo",
           "skipTasklist" : true
+        },
+        "case" : {
+          "name" : "A-Trust Demo"
         }
       },
       "visual" : {
         "at" : { "x" : 272, "y" : 312 },
-        "size" : { "width" : 128, "height" : 60 },
+        "size" : { "width" : 128 },
         "icon" : "res:/webContent/icons/atrust-icon.png"
       },
-      "connect" : { "id" : "f5", "to" : "f11" }
+      "connect" : [
+        { "id" : "f5", "to" : "f11" }
+      ]
     }, {
       "id" : "f34",
       "type" : "RequestStart",
       "name" : "DeleteSignatureTemplate.ivp",
       "config" : {
-        "callSignature" : "DeleteSignatureTemplate",
-        "outLink" : "DeleteSignatureTemplate.ivp",
-        "case" : { }
+        "signature" : "DeleteSignatureTemplate"
       },
       "visual" : {
         "at" : { "x" : 96, "y" : 704 },
         "labelOffset" : { "x" : 25, "y" : 41 }
       },
-      "connect" : { "id" : "f0", "to" : "f2" }
+      "connect" : [
+        { "id" : "f0", "to" : "f2" }
+      ]
     }, {
       "id" : "f35",
       "type" : "TaskEnd",
@@ -182,34 +197,38 @@
       ],
       "config" : {
         "processCall" : "ATrust/TemplateManagement:DeleteTemplateATrust(Number)",
+        "call" : {
+          "map" : {
+            "param.templateId" : "in.templateId"
+          }
+        },
         "output" : {
           "map" : {
             "out" : "in",
             "out.templateData.resultCode" : "result.resultCode"
           },
           "code" : "ivy.log.info(\"A-Trust: resultCode {0}\", in.templateData.resultCode);"
-        },
-        "call" : {
-          "params" : [
-            { "name" : "templateId", "type" : "Number" }
-          ],
-          "map" : {
-            "param.templateId" : "in.templateId"
-          }
         }
       },
       "visual" : {
         "at" : { "x" : 569, "y" : 704 },
         "size" : { "width" : 223, "height" : 72 },
         "icon" : "res:/webContent/icons/atrust-icon.png"
       },
-      "connect" : { "id" : "f36", "to" : "f35" }
+      "connect" : [
+        { "id" : "f36", "to" : "f35" }
+      ]
     }, {
       "id" : "f12",
       "type" : "SubProcessCall",
       "name" : "ATrust/TemplateManagement",
       "config" : {
         "processCall" : "ATrust/TemplateManagement:AddTemplateATrust(File)",
+        "call" : {
+          "map" : {
+            "param.templateFile" : "in.myIvyFile"
+          }
+        },
         "output" : {
           "map" : {
             "out" : "in",
@@ -219,22 +238,16 @@
             "ivy.log.info(\"A-Trust call result code {0}\", out.templateData.resultCode);",
             "ivy.log.info(\"A-Trust call template id {0}\", out.templateData.sigTemplateId);"
           ]
-        },
-        "call" : {
-          "params" : [
-            { "name" : "templateFile", "type" : "File" }
-          ],
-          "map" : {
-            "param.templateFile" : "in.myIvyFile"
-          }
         }
       },
       "visual" : {
         "at" : { "x" : 568, "y" : 496 },
-        "size" : { "width" : 176, "height" : 60 },
+        "size" : { "width" : 176 },
         "icon" : "res:/webContent/icons/atrust-icon.png"
       },
-      "connect" : { "id" : "f9", "to" : "f10" }
+      "connect" : [
+        { "id" : "f9", "to" : "f10" }
+      ]
     }, {
       "id" : "f7",
       "type" : "SubProcessCall",
@@ -259,10 +272,12 @@
       },
       "visual" : {
         "at" : { "x" : 272, "y" : 944 },
-        "size" : { "width" : 176, "height" : 60 },
+        "size" : { "width" : 176 },
         "icon" : "res:/webContent/icons/atrust-icon.png"
       },
-      "connect" : { "id" : "f19", "to" : "f20" }
+      "connect" : [
+        { "id" : "f19", "to" : "f20" }
+      ]
     }, {
       "id" : "f2",
       "type" : "SubProcessCall",
@@ -288,7 +303,9 @@
         "at" : { "x" : 272, "y" : 704 },
         "size" : { "width" : 194, "height" : 78 }
       },
-      "connect" : { "id" : "f1", "to" : "f40" }
+      "connect" : [
+        { "id" : "f1", "to" : "f40" }
+      ]
     }, {
       "id" : "f89",
       "type" : "Script",
@@ -314,9 +331,11 @@
       },
       "visual" : {
         "at" : { "x" : 272, "y" : 496 },
-        "size" : { "width" : 208, "height" : 60 }
+        "size" : { "width" : 208 }
       },
-      "connect" : { "id" : "f27", "to" : "f12" }
+      "connect" : [
+        { "id" : "f27", "to" : "f12" }
+      ]
     } ],
   "layout" : {
     "lanes" : [ {
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,4 +8,4 @@ on: @@
     jobs:
       build:
-        uses: axonivy-market/github-workflows/.github/workflows/ci.yml@v3
+        uses: axonivy-market/github-workflows/.github/workflows/ci.yml@v4