diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 87d78f0..bd4b9c4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,4 +9,4 @@ on: jobs: build: - uses: axonivy-market/github-workflows/.github/workflows/ci.yml@v4 + uses: axonivy-market/github-workflows/.github/workflows/ci.yml@v5 diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index c2fee37..ae5e6c3 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -8,4 +8,4 @@ on: jobs: build: - uses: axonivy-market/github-workflows/.github/workflows/dev.yml@v4 + uses: axonivy-market/github-workflows/.github/workflows/dev.yml@v5 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ab5b0d7..bc801b4 100644 --- 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@v4 + uses: axonivy-market/github-workflows/.github/workflows/release.yml@v5 diff --git a/pom.xml b/pom.xml index 2205884..e3d663e 100644 --- a/pom.xml +++ b/pom.xml @@ -1,46 +1,49 @@ - - 4.0.0 - com.axonivy.connector.threema - threema-connector - threema-connector-modules - 10.0.5-SNAPSHOT - pom + pom - - ${project.name} - ${project.name}-demo - ${project.name}-test - ${project.name}-product - ${project.name}-webtest - + + ${project.name} + ${project.name}-demo + ${project.name}-test + ${project.name}-product + ${project.name}-webtest + - - scm:git:https://github.com/axonivy-market/${project.name}.git - HEAD - + + + scm:git:https://github.com/axonivy-market/${project.name}.git + HEAD + - - - - - maven-deploy-plugin - 3.0.0-M1 - - true - - - - org.apache.maven.plugins - maven-release-plugin - 3.0.0-M4 - - v@{project.version} - - - - - + + + + + maven-deploy-plugin + 3.0.0-M1 + + true + + + + org.apache.maven.plugins + maven-release-plugin + 3.0.0-M4 + + v@{project.version} + + + + + diff --git a/threema-connector-demo/.project b/threema-connector-demo/.project index 7289f72..8091215 100644 --- a/threema-connector-demo/.project +++ b/threema-connector-demo/.project @@ -1,49 +1,53 @@ - threema-connector-demo - - - - - - ch.ivyteam.ivy.designer.dataClasses.ui.ivyDataClassBuilder - - - - - ch.ivyteam.ivy.designer.process.ui.ivyWebServiceProcessClassBuilder - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.wst.common.project.facet.core.builder - - - - - ch.ivyteam.ivy.designer.ide.ivyModelValidationBuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - ch.ivyteam.ivy.project.IvyProjectNature - org.eclipse.wst.common.modulecore.ModuleCoreNature - org.eclipse.jem.workbench.JavaEMFNature - org.eclipse.jdt.core.javanature - org.eclipse.m2e.core.maven2Nature - org.eclipse.jem.beaninfo.BeanInfoNature - org.eclipse.wst.common.project.facet.core.nature - org.eclipse.wst.jsdt.core.jsNature - - + threema-connector-demo + + + + + + ch.ivyteam.ivy.designer.dataClasses.ui.ivyDataClassBuilder + + + + + ch.ivyteam.ivy.designer.process.ui.ivyWebServiceProcessClassBuilder + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.wst.common.project.facet.core.builder + + + + + ch.ivyteam.ivy.dialog.form.build.ivyDialogFormBuilder + + + + + ch.ivyteam.ivy.designer.ide.ivyModelValidationBuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + ch.ivyteam.ivy.project.IvyProjectNature + org.eclipse.wst.common.modulecore.ModuleCoreNature + org.eclipse.jem.workbench.JavaEMFNature + org.eclipse.jdt.core.javanature + org.eclipse.m2e.core.maven2Nature + org.eclipse.jem.beaninfo.BeanInfoNature + org.eclipse.wst.common.project.facet.core.nature + + \ No newline at end of file diff --git a/threema-connector-demo/.settings/.jsdtscope b/threema-connector-demo/.settings/.jsdtscope deleted file mode 100644 index e4ab59a..0000000 --- a/threema-connector-demo/.settings/.jsdtscope +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - diff --git a/threema-connector-demo/.settings/ch.ivyteam.ivy.designer.prefs b/threema-connector-demo/.settings/ch.ivyteam.ivy.designer.prefs index 471c536..4f5980c 100644 --- a/threema-connector-demo/.settings/ch.ivyteam.ivy.designer.prefs +++ b/threema-connector-demo/.settings/ch.ivyteam.ivy.designer.prefs @@ -1,5 +1,4 @@ -ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_DATA_CLASS=threema.connector.demo.Data ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_NAMESPACE=threema.connector.demo -ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=11 -ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=100000 +ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=13 +ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=120001 eclipse.preferences.version=1 diff --git a/threema-connector-demo/.settings/org.eclipse.jdt.core.prefs b/threema-connector-demo/.settings/org.eclipse.jdt.core.prefs index d4540a5..3a79233 100644 --- a/threema-connector-demo/.settings/org.eclipse.jdt.core.prefs +++ b/threema-connector-demo/.settings/org.eclipse.jdt.core.prefs @@ -1,10 +1,10 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 diff --git a/threema-connector-demo/.settings/org.eclipse.wst.common.component b/threema-connector-demo/.settings/org.eclipse.wst.common.component index db6eed0..ed1c089 100644 --- a/threema-connector-demo/.settings/org.eclipse.wst.common.component +++ b/threema-connector-demo/.settings/org.eclipse.wst.common.component @@ -15,4 +15,4 @@ - + \ No newline at end of file diff --git a/threema-connector-demo/.settings/org.eclipse.wst.common.project.facet.core.xml b/threema-connector-demo/.settings/org.eclipse.wst.common.project.facet.core.xml index 3bb273d..ac11c9f 100644 --- a/threema-connector-demo/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/threema-connector-demo/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,8 +1,6 @@ - - + - - + \ No newline at end of file diff --git a/threema-connector-demo/.settings/org.eclipse.wst.jsdt.ui.superType.container b/threema-connector-demo/.settings/org.eclipse.wst.jsdt.ui.superType.container deleted file mode 100644 index 3bd5d0a..0000000 --- a/threema-connector-demo/.settings/org.eclipse.wst.jsdt.ui.superType.container +++ /dev/null @@ -1 +0,0 @@ -org.eclipse.wst.jsdt.launching.baseBrowserLibrary \ No newline at end of file diff --git a/threema-connector-demo/.settings/org.eclipse.wst.jsdt.ui.superType.name b/threema-connector-demo/.settings/org.eclipse.wst.jsdt.ui.superType.name deleted file mode 100644 index 05bd71b..0000000 --- a/threema-connector-demo/.settings/org.eclipse.wst.jsdt.ui.superType.name +++ /dev/null @@ -1 +0,0 @@ -Window \ No newline at end of file diff --git a/threema-connector-demo/config/variables.yaml b/threema-connector-demo/config/variables.yaml index d0f17d7..098962a 100644 --- a/threema-connector-demo/config/variables.yaml +++ b/threema-connector-demo/config/variables.yaml @@ -1,4 +1,4 @@ +# yaml-language-server: $schema=https://json-schema.axonivy.com/app/12.0.0/variables.json Variables: - - \ No newline at end of file + diff --git a/threema-connector-demo/dataclasses/threema/connector/demo/Data.d.json b/threema-connector-demo/dataclasses/threema/connector/demo/Data.d.json new file mode 100644 index 0000000..7e0f21a --- /dev/null +++ b/threema-connector-demo/dataclasses/threema/connector/demo/Data.d.json @@ -0,0 +1,6 @@ +{ + "$schema" : "https://json-schema.axonivy.com/data-class/12.0.0/data-class.json", + "simpleName" : "Data", + "namespace" : "threema.connector.demo", + "isBusinessCaseData" : false +} \ No newline at end of file diff --git a/threema-connector-demo/dataclasses/threema/connector/demo/Data.ivyClass b/threema-connector-demo/dataclasses/threema/connector/demo/Data.ivyClass deleted file mode 100644 index 69ce4a5..0000000 --- a/threema-connector-demo/dataclasses/threema/connector/demo/Data.ivyClass +++ /dev/null @@ -1,2 +0,0 @@ -Data #class -threema.connector.demo #namespace diff --git a/threema-connector-demo/dataclasses/threema/connector/demo/Status.d.json b/threema-connector-demo/dataclasses/threema/connector/demo/Status.d.json new file mode 100644 index 0000000..2fee1a1 --- /dev/null +++ b/threema-connector-demo/dataclasses/threema/connector/demo/Status.d.json @@ -0,0 +1,15 @@ +{ + "$schema" : "https://json-schema.axonivy.com/data-class/12.0.0/data-class.json", + "simpleName" : "Status", + "namespace" : "threema.connector.demo", + "isBusinessCaseData" : false, + "fields" : [ { + "name" : "recipient", + "type" : "String", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "status", + "type" : "String", + "modifiers" : [ "PERSISTENT" ] + } ] +} \ No newline at end of file diff --git a/threema-connector-demo/dataclasses/threema/connector/demo/Status.ivyClass b/threema-connector-demo/dataclasses/threema/connector/demo/Status.ivyClass deleted file mode 100644 index ea4d952..0000000 --- a/threema-connector-demo/dataclasses/threema/connector/demo/Status.ivyClass +++ /dev/null @@ -1,6 +0,0 @@ -Status #class -threema.connector.demo #namespace -recipient String #field -recipient PERSISTENT #fieldModifier -status String #field -status PERSISTENT #fieldModifier diff --git a/threema-connector-demo/dataclasses/threema/connector/demo/sendDemoMessageData.d.json b/threema-connector-demo/dataclasses/threema/connector/demo/sendDemoMessageData.d.json new file mode 100644 index 0000000..41b7510 --- /dev/null +++ b/threema-connector-demo/dataclasses/threema/connector/demo/sendDemoMessageData.d.json @@ -0,0 +1,35 @@ +{ + "$schema" : "https://json-schema.axonivy.com/data-class/12.0.0/data-class.json", + "simpleName" : "sendDemoMessageData", + "namespace" : "threema.connector.demo", + "isBusinessCaseData" : false, + "fields" : [ { + "name" : "receiver", + "type" : "String", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "plainMessage", + "type" : "String", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "type", + "type" : "String", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "apiResponse", + "type" : "List", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "publicKey", + "type" : "String", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "privatekey", + "type" : "String", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "sendAnother", + "type" : "Boolean", + "modifiers" : [ "PERSISTENT" ] + } ] +} \ No newline at end of file diff --git a/threema-connector-demo/dataclasses/threema/connector/demo/sendDemoMessageData.ivyClass b/threema-connector-demo/dataclasses/threema/connector/demo/sendDemoMessageData.ivyClass deleted file mode 100644 index 43c34d8..0000000 --- a/threema-connector-demo/dataclasses/threema/connector/demo/sendDemoMessageData.ivyClass +++ /dev/null @@ -1,16 +0,0 @@ -sendDemoMessageData #class -threema.connector.demo #namespace -receiver String #field -receiver PERSISTENT #fieldModifier -plainMessage String #field -plainMessage PERSISTENT #fieldModifier -type String #field -type PERSISTENT #fieldModifier -apiResponse List #field -apiResponse PERSISTENT #fieldModifier -publicKey String #field -publicKey PERSISTENT #fieldModifier -privatekey String #field -privatekey PERSISTENT #fieldModifier -sendAnother Boolean #field -sendAnother PERSISTENT #fieldModifier diff --git a/threema-connector-demo/pom.xml b/threema-connector-demo/pom.xml index 0110f20..d1f777a 100644 --- a/threema-connector-demo/pom.xml +++ b/threema-connector-demo/pom.xml @@ -1,38 +1,40 @@ - - 4.0.0 - com.axonivy.connector.threema - threema-connector-demo - 10.0.5-SNAPSHOT - iar - - 10.0.16 - - - - sonatype - https://oss.sonatype.org/content/repositories/snapshots - - always - - - - - - com.axonivy.connector.threema - threema-connector - ${project.version} - iar - - - - - - com.axonivy.ivy.ci - project-build-plugin - ${project.build.plugin.version} - true - - - + + 4.0.0 + com.axonivy.connector.threema + threema-connector-demo + 12.0.0-SNAPSHOT + iar + + 12.0.0-SNAPSHOT + + + + sonatype + https://oss.sonatype.org/content/repositories/snapshots + + always + + + + + + com.axonivy.connector.threema + threema-connector + ${project.version} + iar + + + + + + com.axonivy.ivy.ci + project-build-plugin + ${project.build.plugin.version} + true + + + diff --git a/threema-connector-demo/processes/ThreemaDemoProcess.p.json b/threema-connector-demo/processes/ThreemaDemoProcess.p.json index 715015a..6afb48a 100644 --- a/threema-connector-demo/processes/ThreemaDemoProcess.p.json +++ b/threema-connector-demo/processes/ThreemaDemoProcess.p.json @@ -1,5 +1,5 @@ { - "format" : "10.0.0", + "$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json", "id" : "18B8EEA3B9A84FAE", "config" : { "data" : "threema.connector.demo.sendDemoMessageData" @@ -9,14 +9,17 @@ "type" : "RequestStart", "name" : "SendMessageToSingleRecipient.ivp", "config" : { - "callSignature" : "SendMessageToSingleRecipient", - "outLink" : "SendMessageToSingleRecipient.ivp", - "tags" : "demo" + "signature" : "SendMessageToSingleRecipient" }, + "tags" : [ + "demo" + ], "visual" : { "at" : { "x" : 96, "y" : 168 } }, - "connect" : { "id" : "f19", "to" : "f5" } + "connect" : [ + { "id" : "f19", "to" : "f5" } + ] }, { "id" : "f4", "type" : "TaskEnd", @@ -28,20 +31,8 @@ "type" : "DialogCall", "name" : "singleRecipient", "config" : { - "dialogId" : "threema.connector.demo.singleRecipient", - "startMethod" : "start(threema.connector.demo.sendDemoMessageData)", - "output" : { - "map" : { - "out" : [ - "in", - "result.sendDemoMessageData" - ] - } - }, + "dialog" : "threema.connector.demo.singleRecipient:start(threema.connector.demo.sendDemoMessageData)", "call" : { - "params" : [ - { "name" : "sendDemoMessageData", "type" : "threema.connector.demo.sendDemoMessageData" } - ], "map" : { "param.sendDemoMessageData" : "in" } @@ -50,45 +41,48 @@ "visual" : { "at" : { "x" : 272, "y" : 168 } }, - "connect" : { "id" : "f11", "to" : "f6" } + "connect" : [ + { "id" : "f11", "to" : "f6" } + ] }, { "id" : "f6", "type" : "SubProcessCall", "name" : "singleMessage", "config" : { "processCall" : "singleRecipient:call(String,String,util.LookupType)", - "output" : { - "map" : { - "out" : "in", - "out.plainMessage" : "in.plainMessage" - }, - "code" : "out.apiResponse.add(result.apiResponse);" - }, "call" : { - "params" : [ - { "name" : "plainMsg", "type" : "String" }, - { "name" : "receiverID", "type" : "String" }, - { "name" : "lookupType", "type" : "util.LookupType" } - ], "map" : { "param.plainMsg" : "in.plainMessage", "param.receiverID" : "in.receiver", "param.lookupType" : "util.LookupType.getByString(in.type)" } + }, + "output" : { + "map" : { + "out" : "in", + "out.plainMessage" : "in.plainMessage" + }, + "code" : "out.apiResponse.add(result.apiResponse);" } }, "visual" : { "at" : { "x" : 512, "y" : 168 }, "icon" : "res:/webContent/icons/threema-icon_black.png" }, - "connect" : { "id" : "f18", "to" : "f7" } + "connect" : [ + { "id" : "f18", "to" : "f7" } + ] }, { "id" : "f7", "type" : "DialogCall", "name" : "ResultPage", "config" : { - "dialogId" : "threema.connector.demo.ResultPage", - "startMethod" : "start(threema.connector.demo.sendDemoMessageData)", + "dialog" : "threema.connector.demo.ResultPage:start(threema.connector.demo.sendDemoMessageData)", + "call" : { + "map" : { + "param.sendDemoMessageData" : "in" + } + }, "output" : { "map" : { "out" : "result.sendDemoMessageData", @@ -96,33 +90,30 @@ "out.receiver" : "\"\"", "out.type" : "\"\"" } - }, - "call" : { - "params" : [ - { "name" : "sendDemoMessageData", "type" : "threema.connector.demo.sendDemoMessageData" } - ], - "map" : { - "param.sendDemoMessageData" : "in" - } } }, "visual" : { "at" : { "x" : 688, "y" : 168 } }, - "connect" : { "id" : "f24", "to" : "f23" } + "connect" : [ + { "id" : "f24", "to" : "f23" } + ] }, { "id" : "f8", "type" : "RequestStart", "name" : "SendMessageToMultipleRecipients.ivp", "config" : { - "callSignature" : "SendMessageToMultipleRecipients", - "outLink" : "SendMessageToMultipleRecipients.ivp", - "tags" : "demo" + "signature" : "SendMessageToMultipleRecipients" }, + "tags" : [ + "demo" + ], "visual" : { "at" : { "x" : 96, "y" : 280 } }, - "connect" : { "id" : "f20", "to" : "f10" } + "connect" : [ + { "id" : "f20", "to" : "f10" } + ] }, { "id" : "f9", "type" : "TaskEnd", @@ -134,68 +125,51 @@ "type" : "DialogCall", "name" : "multipleRecipients", "config" : { - "dialogId" : "threema.connector.demo.multipleRecipients", - "startMethod" : "start(threema.connector.demo.sendDemoMessageData)", - "output" : { - "map" : { - "out" : [ - "in", - "result.sendDemoMessageData", - "result.sendDemoMessageData" - ] - } - }, - "call" : { - "params" : [ - { "name" : "sendDemoMessageData", "type" : "threema.connector.demo.sendDemoMessageData" } - ], - "map" : { - "param.sendDemoMessageData" : [ - "in", - "in" - ] - } - } + "dialog" : "threema.connector.demo.multipleRecipients:start(threema.connector.demo.sendDemoMessageData)" }, "visual" : { "at" : { "x" : 272, "y" : 280 } }, - "connect" : { "id" : "f15", "to" : "f12" } + "connect" : [ + { "id" : "f15", "to" : "f12" } + ] }, { "id" : "f12", "type" : "SubProcessCall", "name" : "handleMessage", "config" : { "processCall" : "multipleRecipients:call(String,List)", - "output" : { - "map" : { - "out" : "in", - "out.apiResponse" : "result.apiResponse" - } - }, "call" : { - "params" : [ - { "name" : "plainMsg", "type" : "String" }, - { "name" : "receivers", "type" : "List" } - ], "map" : { "param.plainMsg" : "in.plainMessage", "param.receivers" : "in.receiver.split(\"\\n\")" } + }, + "output" : { + "map" : { + "out" : "in", + "out.apiResponse" : "result.apiResponse" + } } }, "visual" : { "at" : { "x" : 512, "y" : 280 }, "icon" : "res:/webContent/icons/threema-icon_black.png" }, - "connect" : { "id" : "f17", "to" : "f13" } + "connect" : [ + { "id" : "f17", "to" : "f13" } + ] }, { "id" : "f13", "type" : "DialogCall", "name" : "ResultPage", "config" : { - "dialogId" : "threema.connector.demo.ResultPage", - "startMethod" : "start(threema.connector.demo.sendDemoMessageData)", + "dialog" : "threema.connector.demo.ResultPage:start(threema.connector.demo.sendDemoMessageData)", + "call" : { + "map" : { + "param.sendDemoMessageData" : "in" + } + }, "output" : { "map" : { "out" : "in", @@ -203,32 +177,27 @@ "out.receiver" : "\"\"", "out.type" : "\"\"" } - }, - "call" : { - "params" : [ - { "name" : "sendDemoMessageData", "type" : "threema.connector.demo.sendDemoMessageData" } - ], - "map" : { - "param.sendDemoMessageData" : "in" - } } }, "visual" : { "at" : { "x" : 688, "y" : 280 } }, - "connect" : { "id" : "f27", "to" : "f14" } + "connect" : [ + { "id" : "f27", "to" : "f14" } + ] }, { "id" : "f0", "type" : "RequestStart", "name" : "GenerateKeyPair.ivp", "config" : { - "callSignature" : "GenerateKeyPair", - "outLink" : "GenerateKeyPair.ivp" + "signature" : "GenerateKeyPair" }, "visual" : { "at" : { "x" : 96, "y" : 368 } }, - "connect" : { "id" : "f22", "to" : "f2" } + "connect" : [ + { "id" : "f22", "to" : "f2" } + ] }, { "id" : "f1", "type" : "TaskEnd", @@ -255,53 +224,50 @@ "visual" : { "at" : { "x" : 272, "y" : 368 } }, - "connect" : { "id" : "f26", "to" : "f25" } + "connect" : [ + { "id" : "f26", "to" : "f25" } + ] }, { "id" : "f25", "type" : "DialogCall", "name" : "KeyPair", "config" : { - "dialogId" : "threema.connector.demo.KeyPair", - "startMethod" : "start(String,String)", - "call" : { - "params" : [ - { "name" : "publicKey", "type" : "String" }, - { "name" : "privatekey", "type" : "String" } - ], - "map" : { - "param.publicKey" : [ - "in.publicKey", - "in.publicKey" - ], - "param.privatekey" : [ - "in.privatekey", - "in.privatekey" - ] - } - } + "dialog" : "threema.connector.demo.KeyPair:start(String,String)" }, "visual" : { "at" : { "x" : 520, "y" : 368 } }, - "connect" : { "id" : "f21", "to" : "f1" } + "connect" : [ + { "id" : "f21", "to" : "f1" } + ] }, { "id" : "f23", "type" : "Alternative", + "config" : { + "conditions" : { + "f16" : "in.sendAnother" + } + }, "visual" : { "at" : { "x" : 840, "y" : 168 } }, "connect" : [ - { "id" : "f16", "to" : "f5", "via" : [ { "x" : 840, "y" : 104 }, { "x" : 272, "y" : 104 } ], "condition" : "in.sendAnother" }, + { "id" : "f16", "to" : "f5", "via" : [ { "x" : 840, "y" : 104 }, { "x" : 272, "y" : 104 } ] }, { "id" : "f29", "to" : "f4" } ] }, { "id" : "f14", "type" : "Alternative", + "config" : { + "conditions" : { + "f31" : "in.sendAnother" + } + }, "visual" : { "at" : { "x" : 840, "y" : 280 } }, "connect" : [ - { "id" : "f31", "to" : "f10", "via" : [ { "x" : 840, "y" : 216 }, { "x" : 272, "y" : 216 } ], "condition" : "in.sendAnother" }, + { "id" : "f31", "to" : "f10", "via" : [ { "x" : 840, "y" : 216 }, { "x" : 272, "y" : 216 } ] }, { "id" : "f30", "to" : "f9" } ] } ] diff --git a/threema-connector-demo/src_hd/threema/connector/demo/KeyPair/KeyPair.rddescriptor b/threema-connector-demo/src_hd/threema/connector/demo/KeyPair/KeyPair.rddescriptor deleted file mode 100644 index ae605f0..0000000 --- a/threema-connector-demo/src_hd/threema/connector/demo/KeyPair/KeyPair.rddescriptor +++ /dev/null @@ -1,7 +0,0 @@ - - - - viewTechnology - JSF - - diff --git a/threema-connector-demo/src_hd/threema/connector/demo/KeyPair/KeyPairData.d.json b/threema-connector-demo/src_hd/threema/connector/demo/KeyPair/KeyPairData.d.json new file mode 100644 index 0000000..a2f371e --- /dev/null +++ b/threema-connector-demo/src_hd/threema/connector/demo/KeyPair/KeyPairData.d.json @@ -0,0 +1,15 @@ +{ + "$schema" : "https://json-schema.axonivy.com/data-class/12.0.0/data-class.json", + "simpleName" : "KeyPairData", + "namespace" : "threema.connector.demo.KeyPair", + "isBusinessCaseData" : false, + "fields" : [ { + "name" : "publicKey", + "type" : "String", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "privatekey", + "type" : "String", + "modifiers" : [ "PERSISTENT" ] + } ] +} \ No newline at end of file diff --git a/threema-connector-demo/src_hd/threema/connector/demo/KeyPair/KeyPairData.ivyClass b/threema-connector-demo/src_hd/threema/connector/demo/KeyPair/KeyPairData.ivyClass deleted file mode 100644 index 2ee413c..0000000 --- a/threema-connector-demo/src_hd/threema/connector/demo/KeyPair/KeyPairData.ivyClass +++ /dev/null @@ -1,6 +0,0 @@ -KeyPairData #class -threema.connector.demo.KeyPair #namespace -publicKey String #field -publicKey PERSISTENT #fieldModifier -privatekey String #field -privatekey PERSISTENT #fieldModifier diff --git a/threema-connector-demo/src_hd/threema/connector/demo/KeyPair/KeyPairProcess.p.json b/threema-connector-demo/src_hd/threema/connector/demo/KeyPair/KeyPairProcess.p.json index e08a9c5..b0b9655 100644 --- a/threema-connector-demo/src_hd/threema/connector/demo/KeyPair/KeyPairProcess.p.json +++ b/threema-connector-demo/src_hd/threema/connector/demo/KeyPair/KeyPairProcess.p.json @@ -1,5 +1,5 @@ { - "format" : "10.0.0", + "$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json", "id" : "18B902D7EEB4DF97", "kind" : "HTML_DIALOG", "config" : { @@ -10,11 +10,11 @@ "type" : "HtmlDialogStart", "name" : "start(String,String)", "config" : { - "callSignature" : "start", + "signature" : "start", "input" : { "params" : [ - { "name" : "publicKey", "type" : "String" }, - { "name" : "privatekey", "type" : "String" } + { "name" : "publicKey", "type" : "String", "desc" : "" }, + { "name" : "privatekey", "type" : "String", "desc" : "" } ], "map" : { "out.publicKey" : "param.publicKey", @@ -26,7 +26,9 @@ "visual" : { "at" : { "x" : 96, "y" : 64 } }, - "connect" : { "id" : "f2", "to" : "f1" } + "connect" : [ + { "id" : "f2", "to" : "f1" } + ] }, { "id" : "f1", "type" : "HtmlDialogEnd", @@ -43,7 +45,9 @@ "visual" : { "at" : { "x" : 96, "y" : 160 } }, - "connect" : { "id" : "f5", "to" : "f4" } + "connect" : [ + { "id" : "f5", "to" : "f4" } + ] }, { "id" : "f4", "type" : "HtmlDialogExit", diff --git a/threema-connector-demo/src_hd/threema/connector/demo/ResultPage/ResultPage.rddescriptor b/threema-connector-demo/src_hd/threema/connector/demo/ResultPage/ResultPage.rddescriptor deleted file mode 100644 index ae605f0..0000000 --- a/threema-connector-demo/src_hd/threema/connector/demo/ResultPage/ResultPage.rddescriptor +++ /dev/null @@ -1,7 +0,0 @@ - - - - viewTechnology - JSF - - diff --git a/threema-connector-demo/src_hd/threema/connector/demo/ResultPage/ResultPageData.d.json b/threema-connector-demo/src_hd/threema/connector/demo/ResultPage/ResultPageData.d.json new file mode 100644 index 0000000..4317031 --- /dev/null +++ b/threema-connector-demo/src_hd/threema/connector/demo/ResultPage/ResultPageData.d.json @@ -0,0 +1,15 @@ +{ + "$schema" : "https://json-schema.axonivy.com/data-class/12.0.0/data-class.json", + "simpleName" : "ResultPageData", + "namespace" : "threema.connector.demo.ResultPage", + "isBusinessCaseData" : false, + "fields" : [ { + "name" : "sendDemoMessageData", + "type" : "threema.connector.demo.sendDemoMessageData", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "statusData", + "type" : "List", + "modifiers" : [ "PERSISTENT" ] + } ] +} \ No newline at end of file diff --git a/threema-connector-demo/src_hd/threema/connector/demo/ResultPage/ResultPageData.ivyClass b/threema-connector-demo/src_hd/threema/connector/demo/ResultPage/ResultPageData.ivyClass deleted file mode 100644 index 26676ce..0000000 --- a/threema-connector-demo/src_hd/threema/connector/demo/ResultPage/ResultPageData.ivyClass +++ /dev/null @@ -1,6 +0,0 @@ -ResultPageData #class -threema.connector.demo.ResultPage #namespace -sendDemoMessageData threema.connector.demo.sendDemoMessageData #field -sendDemoMessageData PERSISTENT #fieldModifier -statusData List #field -statusData PERSISTENT #fieldModifier diff --git a/threema-connector-demo/src_hd/threema/connector/demo/ResultPage/ResultPageProcess.p.json b/threema-connector-demo/src_hd/threema/connector/demo/ResultPage/ResultPageProcess.p.json index 1a3cf61..ea4f8c8 100644 --- a/threema-connector-demo/src_hd/threema/connector/demo/ResultPage/ResultPageProcess.p.json +++ b/threema-connector-demo/src_hd/threema/connector/demo/ResultPage/ResultPageProcess.p.json @@ -1,5 +1,5 @@ { - "format" : "10.0.0", + "$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json", "id" : "18B23815CA49935E", "kind" : "HTML_DIALOG", "config" : { @@ -10,21 +10,21 @@ "type" : "HtmlDialogStart", "name" : "start(sendDemoMessageData)", "config" : { - "callSignature" : "start", - "result" : { + "signature" : "start", + "input" : { "params" : [ - { "name" : "sendDemoMessageData", "type" : "threema.connector.demo.sendDemoMessageData" } + { "name" : "sendDemoMessageData", "type" : "threema.connector.demo.sendDemoMessageData", "desc" : "" } ], "map" : { - "result.sendDemoMessageData" : "in.sendDemoMessageData" + "out.sendDemoMessageData" : "param.sendDemoMessageData" } }, - "input" : { + "result" : { "params" : [ - { "name" : "sendDemoMessageData", "type" : "threema.connector.demo.sendDemoMessageData" } + { "name" : "sendDemoMessageData", "type" : "threema.connector.demo.sendDemoMessageData", "desc" : "" } ], "map" : { - "out.sendDemoMessageData" : "param.sendDemoMessageData" + "result.sendDemoMessageData" : "in.sendDemoMessageData" } }, "guid" : "18B23815CA5CE936" @@ -32,7 +32,9 @@ "visual" : { "at" : { "x" : 96, "y" : 64 } }, - "connect" : { "id" : "f6", "to" : "f2" } + "connect" : [ + { "id" : "f6", "to" : "f2" } + ] }, { "id" : "f1", "type" : "HtmlDialogEnd", @@ -55,7 +57,9 @@ "visual" : { "at" : { "x" : 96, "y" : 160 } }, - "connect" : { "id" : "f5", "to" : "f4" } + "connect" : [ + { "id" : "f5", "to" : "f4" } + ] }, { "id" : "f4", "type" : "HtmlDialogExit", @@ -85,7 +89,9 @@ "visual" : { "at" : { "x" : 208, "y" : 64 } }, - "connect" : { "id" : "f7", "to" : "f1" } + "connect" : [ + { "id" : "f7", "to" : "f1" } + ] }, { "id" : "f8", "type" : "HtmlDialogEventStart", @@ -102,6 +108,8 @@ "visual" : { "at" : { "x" : 96, "y" : 224 } }, - "connect" : { "id" : "f9", "to" : "f4" } + "connect" : [ + { "id" : "f9", "to" : "f4" } + ] } ] } \ No newline at end of file diff --git a/threema-connector-demo/src_hd/threema/connector/demo/multipleRecipients/multipleRecipients.rddescriptor b/threema-connector-demo/src_hd/threema/connector/demo/multipleRecipients/multipleRecipients.rddescriptor deleted file mode 100644 index ae605f0..0000000 --- a/threema-connector-demo/src_hd/threema/connector/demo/multipleRecipients/multipleRecipients.rddescriptor +++ /dev/null @@ -1,7 +0,0 @@ - - - - viewTechnology - JSF - - diff --git a/threema-connector-demo/src_hd/threema/connector/demo/multipleRecipients/multipleRecipientsData.d.json b/threema-connector-demo/src_hd/threema/connector/demo/multipleRecipients/multipleRecipientsData.d.json new file mode 100644 index 0000000..f601407 --- /dev/null +++ b/threema-connector-demo/src_hd/threema/connector/demo/multipleRecipients/multipleRecipientsData.d.json @@ -0,0 +1,11 @@ +{ + "$schema" : "https://json-schema.axonivy.com/data-class/12.0.0/data-class.json", + "simpleName" : "multipleRecipientsData", + "namespace" : "threema.connector.demo.multipleRecipients", + "isBusinessCaseData" : false, + "fields" : [ { + "name" : "sendDemoMessageData", + "type" : "threema.connector.demo.sendDemoMessageData", + "modifiers" : [ "PERSISTENT" ] + } ] +} \ No newline at end of file diff --git a/threema-connector-demo/src_hd/threema/connector/demo/multipleRecipients/multipleRecipientsData.ivyClass b/threema-connector-demo/src_hd/threema/connector/demo/multipleRecipients/multipleRecipientsData.ivyClass deleted file mode 100644 index ab92c58..0000000 --- a/threema-connector-demo/src_hd/threema/connector/demo/multipleRecipients/multipleRecipientsData.ivyClass +++ /dev/null @@ -1,4 +0,0 @@ -multipleRecipientsData #class -threema.connector.demo.multipleRecipients #namespace -sendDemoMessageData threema.connector.demo.sendDemoMessageData #field -sendDemoMessageData PERSISTENT #fieldModifier diff --git a/threema-connector-demo/src_hd/threema/connector/demo/multipleRecipients/multipleRecipientsProcess.p.json b/threema-connector-demo/src_hd/threema/connector/demo/multipleRecipients/multipleRecipientsProcess.p.json index 246dd30..1267f03 100644 --- a/threema-connector-demo/src_hd/threema/connector/demo/multipleRecipients/multipleRecipientsProcess.p.json +++ b/threema-connector-demo/src_hd/threema/connector/demo/multipleRecipients/multipleRecipientsProcess.p.json @@ -1,5 +1,5 @@ { - "format" : "10.0.0", + "$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json", "id" : "18B23798EF7AA160", "kind" : "HTML_DIALOG", "config" : { @@ -10,21 +10,21 @@ "type" : "HtmlDialogStart", "name" : "start(sendDemoMessageData)", "config" : { - "callSignature" : "start", - "result" : { + "signature" : "start", + "input" : { "params" : [ - { "name" : "sendDemoMessageData", "type" : "threema.connector.demo.sendDemoMessageData" } + { "name" : "sendDemoMessageData", "type" : "threema.connector.demo.sendDemoMessageData", "desc" : "" } ], "map" : { - "result.sendDemoMessageData" : "in.sendDemoMessageData" + "out.sendDemoMessageData" : "param.sendDemoMessageData" } }, - "input" : { + "result" : { "params" : [ - { "name" : "sendDemoMessageData", "type" : "threema.connector.demo.sendDemoMessageData" } + { "name" : "sendDemoMessageData", "type" : "threema.connector.demo.sendDemoMessageData", "desc" : "" } ], "map" : { - "out.sendDemoMessageData" : "param.sendDemoMessageData" + "result.sendDemoMessageData" : "in.sendDemoMessageData" } }, "guid" : "18B23798EF997276" @@ -32,7 +32,9 @@ "visual" : { "at" : { "x" : 96, "y" : 64 } }, - "connect" : { "id" : "f2", "to" : "f1" } + "connect" : [ + { "id" : "f2", "to" : "f1" } + ] }, { "id" : "f1", "type" : "HtmlDialogEnd", @@ -49,7 +51,9 @@ "visual" : { "at" : { "x" : 96, "y" : 160 } }, - "connect" : { "id" : "f5", "to" : "f4" } + "connect" : [ + { "id" : "f5", "to" : "f4" } + ] }, { "id" : "f4", "type" : "HtmlDialogExit", diff --git a/threema-connector-demo/src_hd/threema/connector/demo/singleRecipient/singleRecipient.rddescriptor b/threema-connector-demo/src_hd/threema/connector/demo/singleRecipient/singleRecipient.rddescriptor deleted file mode 100644 index ae605f0..0000000 --- a/threema-connector-demo/src_hd/threema/connector/demo/singleRecipient/singleRecipient.rddescriptor +++ /dev/null @@ -1,7 +0,0 @@ - - - - viewTechnology - JSF - - diff --git a/threema-connector-demo/src_hd/threema/connector/demo/singleRecipient/singleRecipientData.d.json b/threema-connector-demo/src_hd/threema/connector/demo/singleRecipient/singleRecipientData.d.json new file mode 100644 index 0000000..1d14cfc --- /dev/null +++ b/threema-connector-demo/src_hd/threema/connector/demo/singleRecipient/singleRecipientData.d.json @@ -0,0 +1,11 @@ +{ + "$schema" : "https://json-schema.axonivy.com/data-class/12.0.0/data-class.json", + "simpleName" : "singleRecipientData", + "namespace" : "threema.connector.demo.singleRecipient", + "isBusinessCaseData" : false, + "fields" : [ { + "name" : "sendDemoMessageData", + "type" : "threema.connector.demo.sendDemoMessageData", + "modifiers" : [ "PERSISTENT" ] + } ] +} \ No newline at end of file diff --git a/threema-connector-demo/src_hd/threema/connector/demo/singleRecipient/singleRecipientData.ivyClass b/threema-connector-demo/src_hd/threema/connector/demo/singleRecipient/singleRecipientData.ivyClass deleted file mode 100644 index 55cea03..0000000 --- a/threema-connector-demo/src_hd/threema/connector/demo/singleRecipient/singleRecipientData.ivyClass +++ /dev/null @@ -1,4 +0,0 @@ -singleRecipientData #class -threema.connector.demo.singleRecipient #namespace -sendDemoMessageData threema.connector.demo.sendDemoMessageData #field -sendDemoMessageData PERSISTENT #fieldModifier diff --git a/threema-connector-demo/src_hd/threema/connector/demo/singleRecipient/singleRecipientProcess.p.json b/threema-connector-demo/src_hd/threema/connector/demo/singleRecipient/singleRecipientProcess.p.json index 02b40b9..dcc9791 100644 --- a/threema-connector-demo/src_hd/threema/connector/demo/singleRecipient/singleRecipientProcess.p.json +++ b/threema-connector-demo/src_hd/threema/connector/demo/singleRecipient/singleRecipientProcess.p.json @@ -1,5 +1,5 @@ { - "format" : "10.0.0", + "$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json", "id" : "18B22F7818988EDB", "kind" : "HTML_DIALOG", "config" : { @@ -10,21 +10,21 @@ "type" : "HtmlDialogStart", "name" : "start(sendDemoMessageData)", "config" : { - "callSignature" : "start", - "result" : { + "signature" : "start", + "input" : { "params" : [ - { "name" : "sendDemoMessageData", "type" : "threema.connector.demo.sendDemoMessageData" } + { "name" : "sendDemoMessageData", "type" : "threema.connector.demo.sendDemoMessageData", "desc" : "" } ], "map" : { - "result.sendDemoMessageData" : "in.sendDemoMessageData" + "out.sendDemoMessageData" : "param.sendDemoMessageData" } }, - "input" : { + "result" : { "params" : [ - { "name" : "sendDemoMessageData", "type" : "threema.connector.demo.sendDemoMessageData" } + { "name" : "sendDemoMessageData", "type" : "threema.connector.demo.sendDemoMessageData", "desc" : "" } ], "map" : { - "out.sendDemoMessageData" : "param.sendDemoMessageData" + "result.sendDemoMessageData" : "in.sendDemoMessageData" } }, "guid" : "18B22F7818A93A33" @@ -32,7 +32,9 @@ "visual" : { "at" : { "x" : 96, "y" : 64 } }, - "connect" : { "id" : "f2", "to" : "f1" } + "connect" : [ + { "id" : "f2", "to" : "f1" } + ] }, { "id" : "f1", "type" : "HtmlDialogEnd", @@ -49,7 +51,9 @@ "visual" : { "at" : { "x" : 96, "y" : 160 } }, - "connect" : { "id" : "f5", "to" : "f4" } + "connect" : [ + { "id" : "f5", "to" : "f4" } + ] }, { "id" : "f4", "type" : "HtmlDialogExit", diff --git a/threema-connector-demo/webContent/layouts/frame-10.xhtml b/threema-connector-demo/webContent/layouts/frame-10.xhtml index e0a3f36..82fb330 100644 --- a/threema-connector-demo/webContent/layouts/frame-10.xhtml +++ b/threema-connector-demo/webContent/layouts/frame-10.xhtml @@ -33,7 +33,7 @@ and refence it below in the head part. - +