From 7acc1bb40b93765547e4fc538e53de7875b8da8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ph=E1=BA=A1m=20Duy=20Linh?= <138570547+linhpd-axonivy@users.noreply.github.com> Date: Wed, 24 Jul 2024 15:27:37 +0700 Subject: [PATCH] MARP-653: convert to Ivy Designer 11.3 (#60) --- persistence-utils-demo-test/.classpath | 7 +- persistence-utils-demo-test/.project | 5 + .../.settings/ch.ivyteam.ivy.designer.prefs | 6 +- .../org.eclipse.wst.common.component | 61 ++------- persistence-utils-demo-test/pom.xml | 113 ++++++++-------- .../utils/persistence/entities/.gitignore | 9 ++ persistence-utils-demo-tool/.classpath | 7 +- persistence-utils-demo-tool/.project | 5 + .../.settings/ch.ivyteam.ivy.designer.prefs | 6 +- .../org.eclipse.wst.common.component | 21 ++- persistence-utils-demo-tool/pom.xml | 7 +- .../Start Processes/TestTasks.p.json | 26 ++-- .../tool/TestTasks/TestTasksProcess.p.json | 24 ++-- persistence-utils-demo-webtest/.classpath | 7 +- persistence-utils-demo-webtest/.project | 5 + .../.settings/ch.ivyteam.ivy.designer.prefs | 6 +- .../org.eclipse.wst.common.component | 23 ++-- persistence-utils-demo-webtest/pom.xml | 119 +++++++++-------- .../persistence/webtest/WebTestDemoIT.java | 2 +- persistence-utils-demo/.classpath | 7 +- persistence-utils-demo/.project | 5 + .../.settings/ch.ivyteam.ivy.designer.prefs | 6 +- .../org.eclipse.wst.common.component | 54 ++------ persistence-utils-demo/pom.xml | 13 +- .../processes/Start Processes/Starts.p.json | 77 +++++++---- .../persistence/demo/entities/.gitignore | 2 + .../DepartmentSearchProcess.p.json | 103 +++++++++----- .../PersonSearch/PersonSearchProcess.p.json | 99 +++++++++----- .../demo/components/Info/InfoProcess.p.json | 20 ++- persistence-utils-product/pom.xml | 2 +- persistence-utils/.project | 5 + .../.settings/ch.ivyteam.ivy.designer.prefs | 6 +- .../org.eclipse.wst.common.component | 53 ++------ persistence-utils/pom.xml | 126 +++++++++--------- .../utils/persistence/beans/.gitignore | 8 ++ .../persistence/history/beans/.gitignore | 2 + pom.xml | 2 +- 37 files changed, 549 insertions(+), 500 deletions(-) create mode 100644 persistence-utils-demo-test/src_generated/com/axonivy/utils/persistence/entities/.gitignore create mode 100644 persistence-utils-demo/src_generated/com/axonivy/utils/persistence/demo/entities/.gitignore create mode 100644 persistence-utils/src_generated/com/axonivy/utils/persistence/beans/.gitignore create mode 100644 persistence-utils/src_generated/com/axonivy/utils/persistence/history/beans/.gitignore diff --git a/persistence-utils-demo-test/.classpath b/persistence-utils-demo-test/.classpath index cfeab39..d37d059 100644 --- a/persistence-utils-demo-test/.classpath +++ b/persistence-utils-demo-test/.classpath @@ -5,12 +5,7 @@ - - - - - - + diff --git a/persistence-utils-demo-test/.project b/persistence-utils-demo-test/.project index 2815938..0ca2b45 100644 --- a/persistence-utils-demo-test/.project +++ b/persistence-utils-demo-test/.project @@ -25,6 +25,11 @@ + + ch.ivyteam.ivy.dialog.form.build.ivyDialogFormBuilder + + + ch.ivyteam.ivy.designer.ide.ivyModelValidationBuilder diff --git a/persistence-utils-demo-test/.settings/ch.ivyteam.ivy.designer.prefs b/persistence-utils-demo-test/.settings/ch.ivyteam.ivy.designer.prefs index ae9fd96..c249aed 100644 --- a/persistence-utils-demo-test/.settings/ch.ivyteam.ivy.designer.prefs +++ b/persistence-utils-demo-test/.settings/ch.ivyteam.ivy.designer.prefs @@ -1,5 +1,5 @@ ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_DATA_CLASS=com.axonivy.utils.persistence.test.Data ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_NAMESPACE=com.axonivy.utils.persistence.test -ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=11 -ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=100000 -eclipse.preferences.version=1 \ No newline at end of file +ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=13 +ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=113000 +eclipse.preferences.version=1 diff --git a/persistence-utils-demo-test/.settings/org.eclipse.wst.common.component b/persistence-utils-demo-test/.settings/org.eclipse.wst.common.component index 50e2ed4..d808e64 100644 --- a/persistence-utils-demo-test/.settings/org.eclipse.wst.common.component +++ b/persistence-utils-demo-test/.settings/org.eclipse.wst.common.component @@ -1,47 +1,14 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + \ No newline at end of file diff --git a/persistence-utils-demo-test/pom.xml b/persistence-utils-demo-test/pom.xml index 0623698..6ff1114 100644 --- a/persistence-utils-demo-test/pom.xml +++ b/persistence-utils-demo-test/pom.xml @@ -1,57 +1,58 @@ - - 4.0.0 - com.axonivy.utils.persistence - persistence-utils-demo-test - 10.0.9-SNAPSHOT - iar - Test project of the persistence utils demo project. Note, that this project is currently also used to test some aspects of the persistence library. - - - com.axonivy.utils.persistence - persistence-utils-demo-tool - ${project.version} - iar - - - com.axonivy.ivy.test - unit-tester - 10.0.16 - test - - - org.hibernate - hibernate-jpamodelgen - 5.6.5.Final - provided - - - org.hsqldb - hsqldb - 2.7.3 - test - - - org.mockito - mockito-inline - 3.7.0 - test - - - - src_test - - - com.axonivy.ivy.ci - project-build-plugin - 10.0.16 - true - - - -proc:none - - - - - - \ No newline at end of file + + 4.0.0 + com.axonivy.utils.persistence + persistence-utils-demo-test + 11.3.0-SNAPSHOT + iar + Test project of the persistence utils demo project. Note, that this project is currently also used to test some aspects of the persistence library. + + + com.axonivy.utils.persistence + persistence-utils-demo-tool + ${project.version} + iar + + + com.axonivy.ivy.test + unit-tester + 10.0.16 + test + + + org.hibernate + hibernate-jpamodelgen + 5.6.5.Final + provided + + + org.hsqldb + hsqldb + 2.7.3 + test + + + org.mockito + mockito-inline + 3.7.0 + test + + + + src_test + + + com.axonivy.ivy.ci + project-build-plugin + 11.3.0 + true + + + -proc:none + + + + + + diff --git a/persistence-utils-demo-test/src_generated/com/axonivy/utils/persistence/entities/.gitignore b/persistence-utils-demo-test/src_generated/com/axonivy/utils/persistence/entities/.gitignore new file mode 100644 index 0000000..aa8bbe0 --- /dev/null +++ b/persistence-utils-demo-test/src_generated/com/axonivy/utils/persistence/entities/.gitignore @@ -0,0 +1,9 @@ +/Car_.java +/Constrained_.java +/HistorizedPerson_.java +/InvoicePosition_.java +/Invoice_.java +/Option_.java +/Producer_.java +/Product_.java +/Vehicle_.java diff --git a/persistence-utils-demo-tool/.classpath b/persistence-utils-demo-tool/.classpath index aa20b3e..9baacfb 100644 --- a/persistence-utils-demo-tool/.classpath +++ b/persistence-utils-demo-tool/.classpath @@ -5,12 +5,7 @@ - - - - - - + diff --git a/persistence-utils-demo-tool/.project b/persistence-utils-demo-tool/.project index c4a40f9..a949adf 100644 --- a/persistence-utils-demo-tool/.project +++ b/persistence-utils-demo-tool/.project @@ -25,6 +25,11 @@ + + ch.ivyteam.ivy.dialog.form.build.ivyDialogFormBuilder + + + ch.ivyteam.ivy.designer.ide.ivyModelValidationBuilder diff --git a/persistence-utils-demo-tool/.settings/ch.ivyteam.ivy.designer.prefs b/persistence-utils-demo-tool/.settings/ch.ivyteam.ivy.designer.prefs index d17c45f..483706b 100644 --- a/persistence-utils-demo-tool/.settings/ch.ivyteam.ivy.designer.prefs +++ b/persistence-utils-demo-tool/.settings/ch.ivyteam.ivy.designer.prefs @@ -1,5 +1,5 @@ ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_DATA_CLASS=com.axonivy.utils.persistence.demo.tool.Data ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_NAMESPACE=com.axonivy.utils.persistence.utils.tool -ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=11 -ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=100000 -eclipse.preferences.version=1 \ No newline at end of file +ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=13 +ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=113000 +eclipse.preferences.version=1 diff --git a/persistence-utils-demo-tool/.settings/org.eclipse.wst.common.component b/persistence-utils-demo-tool/.settings/org.eclipse.wst.common.component index c3d3a7e..b73e8ed 100644 --- a/persistence-utils-demo-tool/.settings/org.eclipse.wst.common.component +++ b/persistence-utils-demo-tool/.settings/org.eclipse.wst.common.component @@ -1,11 +1,10 @@ - - - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/persistence-utils-demo-tool/pom.xml b/persistence-utils-demo-tool/pom.xml index e3ae211..a27dab0 100644 --- a/persistence-utils-demo-tool/pom.xml +++ b/persistence-utils-demo-tool/pom.xml @@ -1,9 +1,10 @@ - + 4.0.0 com.axonivy.utils.persistence persistence-utils-demo-tool - 10.0.9-SNAPSHOT + 11.3.0-SNAPSHOT iar @@ -23,7 +24,7 @@ com.axonivy.ivy.ci project-build-plugin - 10.0.16 + 11.3.0 true diff --git a/persistence-utils-demo-tool/processes/Start Processes/TestTasks.p.json b/persistence-utils-demo-tool/processes/Start Processes/TestTasks.p.json index 1ae5dfb..9e74cee 100644 --- a/persistence-utils-demo-tool/processes/Start Processes/TestTasks.p.json +++ b/persistence-utils-demo-tool/processes/Start Processes/TestTasks.p.json @@ -1,5 +1,5 @@ { - "format" : "10.0.0", + "$schema" : "https://json-schema.axonivy.com/process/11.3.0/process.json", "id" : "173A425FAB8461C1", "config" : { "data" : "com.axonivy.utils.persistence.demo.tool.Data" @@ -9,17 +9,22 @@ "type" : "RequestStart", "name" : "testTasks.ivp", "config" : { - "callSignature" : "testTasks", - "responsible" : "Administrator", - "outLink" : "testTasks.ivp", - "wfuser" : "1", - "startName" : "Execute test tasks" + "signature" : "testTasks", + "request" : { + "name" : "Execute test tasks" + }, + "permission" : { + "anonymous" : false, + "role" : "Administrator" + } }, "visual" : { "at" : { "x" : 96, "y" : 64 }, "labelOffset" : { "x" : 28, "y" : 37 } }, - "connect" : { "id" : "f3", "to" : "f2" } + "connect" : [ + { "id" : "f3", "to" : "f2" } + ] }, { "id" : "f1", "type" : "TaskEnd", @@ -31,12 +36,13 @@ "type" : "DialogCall", "name" : "TestTasks", "config" : { - "dialogId" : "com.axonivy.utils.persistence.demo.tool.TestTasks", - "startMethod" : "start()" + "dialog" : "com.axonivy.utils.persistence.demo.tool.TestTasks:start()" }, "visual" : { "at" : { "x" : 224, "y" : 64 } }, - "connect" : { "id" : "f4", "to" : "f1" } + "connect" : [ + { "id" : "f4", "to" : "f1" } + ] } ] } \ No newline at end of file diff --git a/persistence-utils-demo-tool/src_hd/com/axonivy/utils/persistence/demo/tool/TestTasks/TestTasksProcess.p.json b/persistence-utils-demo-tool/src_hd/com/axonivy/utils/persistence/demo/tool/TestTasks/TestTasksProcess.p.json index 14328c9..28d3fe1 100644 --- a/persistence-utils-demo-tool/src_hd/com/axonivy/utils/persistence/demo/tool/TestTasks/TestTasksProcess.p.json +++ b/persistence-utils-demo-tool/src_hd/com/axonivy/utils/persistence/demo/tool/TestTasks/TestTasksProcess.p.json @@ -1,5 +1,5 @@ { - "format" : "10.0.0", + "$schema" : "https://json-schema.axonivy.com/process/11.3.0/process.json", "id" : "17F21BE8CC94A13E", "kind" : "HTML_DIALOG", "config" : { @@ -16,7 +16,9 @@ "at" : { "x" : 96, "y" : 256 }, "labelOffset" : { "x" : 9, "y" : 35 } }, - "connect" : { "id" : "f5", "to" : "f4" } + "connect" : [ + { "id" : "f5", "to" : "f4" } + ] }, { "id" : "f4", "type" : "HtmlDialogExit", @@ -34,7 +36,9 @@ "at" : { "x" : 96, "y" : 160 }, "labelOffset" : { "x" : 17, "y" : 35 } }, - "connect" : { "id" : "f22", "to" : "f21" } + "connect" : [ + { "id" : "f22", "to" : "f21" } + ] }, { "id" : "f19", "type" : "HtmlDialogEnd", @@ -49,32 +53,36 @@ "environment" ], "config" : { - "security" : "system", "output" : { "code" : [ "import com.axonivy.utils.persistence.demo.tool.test.service.TestService;", "", "in.message = TestService.prepareTestDataAndIvy(in.cleanReload);" ] - } + }, + "sudo" : true }, "visual" : { "at" : { "x" : 280, "y" : 160 } }, - "connect" : { "id" : "f20", "to" : "f19" } + "connect" : [ + { "id" : "f20", "to" : "f19" } + ] }, { "id" : "f0", "type" : "HtmlDialogStart", "name" : "start()", "config" : { - "callSignature" : "start", + "signature" : "start", "guid" : "173A42862125166E" }, "visual" : { "at" : { "x" : 96, "y" : 64 }, "labelOffset" : { "x" : 12, "y" : 35 } }, - "connect" : { "id" : "f2", "to" : "f1" } + "connect" : [ + { "id" : "f2", "to" : "f1" } + ] }, { "id" : "f1", "type" : "HtmlDialogEnd", diff --git a/persistence-utils-demo-webtest/.classpath b/persistence-utils-demo-webtest/.classpath index bc1e3c9..8774f33 100644 --- a/persistence-utils-demo-webtest/.classpath +++ b/persistence-utils-demo-webtest/.classpath @@ -5,12 +5,7 @@ - - - - - - + diff --git a/persistence-utils-demo-webtest/.project b/persistence-utils-demo-webtest/.project index 4c078cd..72b9728 100644 --- a/persistence-utils-demo-webtest/.project +++ b/persistence-utils-demo-webtest/.project @@ -25,6 +25,11 @@ + + ch.ivyteam.ivy.dialog.form.build.ivyDialogFormBuilder + + + ch.ivyteam.ivy.designer.ide.ivyModelValidationBuilder diff --git a/persistence-utils-demo-webtest/.settings/ch.ivyteam.ivy.designer.prefs b/persistence-utils-demo-webtest/.settings/ch.ivyteam.ivy.designer.prefs index 4d1f03b..895cec4 100644 --- a/persistence-utils-demo-webtest/.settings/ch.ivyteam.ivy.designer.prefs +++ b/persistence-utils-demo-webtest/.settings/ch.ivyteam.ivy.designer.prefs @@ -1,5 +1,5 @@ ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_DATA_CLASS=com.axonivy.utils.persistence.webtest.Data ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_NAMESPACE=com.axonivy.utils.persistence.webtest -ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=11 -ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=100000 -eclipse.preferences.version=1 \ No newline at end of file +ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=13 +ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=113000 +eclipse.preferences.version=1 diff --git a/persistence-utils-demo-webtest/.settings/org.eclipse.wst.common.component b/persistence-utils-demo-webtest/.settings/org.eclipse.wst.common.component index 64271d2..b0bf070 100644 --- a/persistence-utils-demo-webtest/.settings/org.eclipse.wst.common.component +++ b/persistence-utils-demo-webtest/.settings/org.eclipse.wst.common.component @@ -1,12 +1,11 @@ - - - - - - - - - - - - + + + + + + + + + + + \ No newline at end of file diff --git a/persistence-utils-demo-webtest/pom.xml b/persistence-utils-demo-webtest/pom.xml index 9dcaf16..4a4a990 100644 --- a/persistence-utils-demo-webtest/pom.xml +++ b/persistence-utils-demo-webtest/pom.xml @@ -1,60 +1,61 @@ - - 4.0.0 - com.axonivy.utils.persistence - persistence-utils-demo-webtest - 10.0.9-SNAPSHOT - iar-integration-test - Web Test project of the persistence utils demo project. - - 10.0.16 - - - - sonatype - https://oss.sonatype.org/content/repositories/snapshots - - always - - - - - - com.axonivy.utils.persistence - persistence-utils-demo-tool - ${project.version} - iar - - - com.axonivy.ivy.webtest - web-tester - ${webtester.version} - test - - - - src_test - - - com.axonivy.ivy.ci - project-build-plugin - 10.0.16 - true - - - maven-surefire-plugin - - false - - - - - - - noWebTest - - true - - - - \ No newline at end of file + + 4.0.0 + com.axonivy.utils.persistence + persistence-utils-demo-webtest + 11.3.0-SNAPSHOT + iar-integration-test + Web Test project of the persistence utils demo project. + + 11.3.0 + + + + com.axonivy.utils.persistence + persistence-utils-demo-tool + ${project.version} + iar + + + com.axonivy.ivy.webtest + web-tester + ${webtester.version} + test + + + + + + always + + sonatype + https://oss.sonatype.org/content/repositories/snapshots + + + + src_test + + + com.axonivy.ivy.ci + project-build-plugin + 11.3.0 + true + + + maven-surefire-plugin + + false + + + + + + + noWebTest + + true + + + + diff --git a/persistence-utils-demo-webtest/src_test/com/axonivy/utils/persistence/webtest/WebTestDemoIT.java b/persistence-utils-demo-webtest/src_test/com/axonivy/utils/persistence/webtest/WebTestDemoIT.java index 460f510..8cc4a9a 100644 --- a/persistence-utils-demo-webtest/src_test/com/axonivy/utils/persistence/webtest/WebTestDemoIT.java +++ b/persistence-utils-demo-webtest/src_test/com/axonivy/utils/persistence/webtest/WebTestDemoIT.java @@ -189,7 +189,7 @@ private void startProcessPersonSearch() { private static void startLoginAsAdmin(WebAppFixture fixture) { fixture.login("jpa_admin", "jpa_admin"); - open(EngineUrl.base() + "default-workflow/faces/profile.xhtml"); + open(EngineUrl.base() + "dev-workflow-ui/faces/profile.xhtml"); SelenideElement lang = $(By.name("profileForm:contentLanguage_editableInput")).shouldBe(enabled); lang.clear(); lang.sendKeys("en"); diff --git a/persistence-utils-demo/.classpath b/persistence-utils-demo/.classpath index f586133..338c368 100644 --- a/persistence-utils-demo/.classpath +++ b/persistence-utils-demo/.classpath @@ -5,12 +5,7 @@ - - - - - - + diff --git a/persistence-utils-demo/.project b/persistence-utils-demo/.project index 501b01d..cce9b15 100644 --- a/persistence-utils-demo/.project +++ b/persistence-utils-demo/.project @@ -25,6 +25,11 @@ + + ch.ivyteam.ivy.dialog.form.build.ivyDialogFormBuilder + + + ch.ivyteam.ivy.designer.ide.ivyModelValidationBuilder diff --git a/persistence-utils-demo/.settings/ch.ivyteam.ivy.designer.prefs b/persistence-utils-demo/.settings/ch.ivyteam.ivy.designer.prefs index 6985bc6..200ccb5 100644 --- a/persistence-utils-demo/.settings/ch.ivyteam.ivy.designer.prefs +++ b/persistence-utils-demo/.settings/ch.ivyteam.ivy.designer.prefs @@ -1,5 +1,5 @@ ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_DATA_CLASS=com.axonivy.utils.persistence.demo.Data ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_NAMESPACE=com.axonivy.utils.persistence.demo -ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=11 -ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=100000 -eclipse.preferences.version=1 \ No newline at end of file +ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=13 +ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=113000 +eclipse.preferences.version=1 diff --git a/persistence-utils-demo/.settings/org.eclipse.wst.common.component b/persistence-utils-demo/.settings/org.eclipse.wst.common.component index 3de7593..d2fe6f0 100644 --- a/persistence-utils-demo/.settings/org.eclipse.wst.common.component +++ b/persistence-utils-demo/.settings/org.eclipse.wst.common.component @@ -1,43 +1,11 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + \ No newline at end of file diff --git a/persistence-utils-demo/pom.xml b/persistence-utils-demo/pom.xml index 4b300d6..8af14e5 100644 --- a/persistence-utils-demo/pom.xml +++ b/persistence-utils-demo/pom.xml @@ -1,17 +1,12 @@ - + 4.0.0 com.axonivy.utils.persistence persistence-utils-demo - 10.0.9-SNAPSHOT + 11.3.0-SNAPSHOT iar - - org.hibernate - hibernate-jpamodelgen - 5.6.5.Final - provided - com.axonivy.utils.persistence persistence-utils @@ -32,7 +27,7 @@ com.axonivy.ivy.ci project-build-plugin - 10.0.16 + 11.3.0 true diff --git a/persistence-utils-demo/processes/Start Processes/Starts.p.json b/persistence-utils-demo/processes/Start Processes/Starts.p.json index 04ae35e..be9eff5 100644 --- a/persistence-utils-demo/processes/Start Processes/Starts.p.json +++ b/persistence-utils-demo/processes/Start Processes/Starts.p.json @@ -1,5 +1,5 @@ { - "format" : "10.0.0", + "$schema" : "https://json-schema.axonivy.com/process/11.3.0/process.json", "id" : "173A4BC5D38BAD52", "config" : { "data" : "com.axonivy.utils.persistence.demo.Data" @@ -9,17 +9,24 @@ "type" : "RequestStart", "name" : "personSearch.ivp", "config" : { - "callSignature" : "personSearch", - "outLink" : "personSearch.ivp", - "wfuser" : "1", - "startName" : "<%=ivy.cms.co(\"/Processes/Names/personSearch\")%>", - "tags" : "demo" + "signature" : "personSearch", + "request" : { + "name" : "<%=ivy.cms.co(\"/Processes/Names/personSearch\")%>" + }, + "permission" : { + "anonymous" : false + } }, + "tags" : [ + "demo" + ], "visual" : { "at" : { "x" : 96, "y" : 128 }, "labelOffset" : { "x" : 41, "y" : 37 } }, - "connect" : { "id" : "f4", "to" : "f3" } + "connect" : [ + { "id" : "f4", "to" : "f3" } + ] }, { "id" : "f1", "type" : "TaskEnd", @@ -31,13 +38,14 @@ "type" : "DialogCall", "name" : "PersonSearch", "config" : { - "dialogId" : "com.axonivy.utils.persistence.demo.PersonSearch", - "startMethod" : "start()" + "dialog" : "com.axonivy.utils.persistence.demo.PersonSearch:start()" }, "visual" : { "at" : { "x" : 224, "y" : 128 } }, - "connect" : { "id" : "f2", "to" : "f1" } + "connect" : [ + { "id" : "f2", "to" : "f1" } + ] }, { "id" : "f5", "type" : "ProcessAnnotation", @@ -54,17 +62,24 @@ "type" : "RequestStart", "name" : "departmentSearch.ivp", "config" : { - "callSignature" : "departmentSearch", - "outLink" : "departmentSearch.ivp", - "wfuser" : "1", - "startName" : "<%=ivy.cms.co(\"/Processes/Names/departmentSearch\")%>", - "tags" : "demo" + "signature" : "departmentSearch", + "request" : { + "name" : "<%=ivy.cms.co(\"/Processes/Names/departmentSearch\")%>" + }, + "permission" : { + "anonymous" : false + } }, + "tags" : [ + "demo" + ], "visual" : { "at" : { "x" : 96, "y" : 320 }, "labelOffset" : { "x" : 30, "y" : 34 } }, - "connect" : { "id" : "f9", "to" : "f8" } + "connect" : [ + { "id" : "f9", "to" : "f8" } + ] }, { "id" : "f7", "type" : "ProcessAnnotation", @@ -81,13 +96,14 @@ "type" : "DialogCall", "name" : "DepartmentSearch", "config" : { - "dialogId" : "com.axonivy.utils.persistence.demo.DepartmentSearch", - "startMethod" : "start()" + "dialog" : "com.axonivy.utils.persistence.demo.DepartmentSearch:start()" }, "visual" : { "at" : { "x" : 224, "y" : 320 } }, - "connect" : { "id" : "f11", "to" : "f10" } + "connect" : [ + { "id" : "f11", "to" : "f10" } + ] }, { "id" : "f10", "type" : "TaskEnd", @@ -111,7 +127,9 @@ "visual" : { "at" : { "x" : 224, "y" : 480 } }, - "connect" : { "id" : "f15", "to" : "f13" } + "connect" : [ + { "id" : "f15", "to" : "f13" } + ] }, { "id" : "f13", "type" : "TaskEnd", @@ -123,17 +141,24 @@ "type" : "RequestStart", "name" : "raiseSalary.ivp", "config" : { - "callSignature" : "raiseSalary", - "outLink" : "raiseSalary.ivp", - "wfuser" : "1", - "startName" : "<%=ivy.cms.co(\"/Processes/Names/raiseSalaries\")%>", - "tags" : "demo" + "signature" : "raiseSalary", + "request" : { + "name" : "<%=ivy.cms.co(\"/Processes/Names/raiseSalaries\")%>" + }, + "permission" : { + "anonymous" : false + } }, + "tags" : [ + "demo" + ], "visual" : { "at" : { "x" : 96, "y" : 480 }, "labelOffset" : { "x" : 32, "y" : 37 } }, - "connect" : { "id" : "f16", "to" : "f12" } + "connect" : [ + { "id" : "f16", "to" : "f12" } + ] } ], "layout" : { "lanes" : [ { diff --git a/persistence-utils-demo/src_generated/com/axonivy/utils/persistence/demo/entities/.gitignore b/persistence-utils-demo/src_generated/com/axonivy/utils/persistence/demo/entities/.gitignore new file mode 100644 index 0000000..df7d0c3 --- /dev/null +++ b/persistence-utils-demo/src_generated/com/axonivy/utils/persistence/demo/entities/.gitignore @@ -0,0 +1,2 @@ +/Department_.java +/Person_.java diff --git a/persistence-utils-demo/src_hd/com/axonivy/utils/persistence/demo/DepartmentSearch/DepartmentSearchProcess.p.json b/persistence-utils-demo/src_hd/com/axonivy/utils/persistence/demo/DepartmentSearch/DepartmentSearchProcess.p.json index 02f0bce..dd723cb 100644 --- a/persistence-utils-demo/src_hd/com/axonivy/utils/persistence/demo/DepartmentSearch/DepartmentSearchProcess.p.json +++ b/persistence-utils-demo/src_hd/com/axonivy/utils/persistence/demo/DepartmentSearch/DepartmentSearchProcess.p.json @@ -1,5 +1,5 @@ { - "format" : "10.0.0", + "$schema" : "https://json-schema.axonivy.com/process/11.3.0/process.json", "id" : "173B897CD644184D", "kind" : "HTML_DIALOG", "config" : { @@ -10,14 +10,16 @@ "type" : "HtmlDialogStart", "name" : "start()", "config" : { - "callSignature" : "start", + "signature" : "start", "guid" : "173A4BB5DFB9831F" }, "visual" : { "at" : { "x" : 96, "y" : 64 }, "labelOffset" : { "x" : 12, "y" : 35 } }, - "connect" : { "id" : "f7", "to" : "f6" } + "connect" : [ + { "id" : "f7", "to" : "f6" } + ] }, { "id" : "f1", "type" : "HtmlDialogEnd", @@ -35,7 +37,9 @@ "at" : { "x" : 96, "y" : 480 }, "labelOffset" : { "x" : 9, "y" : 35 } }, - "connect" : { "id" : "f44", "to" : "f4" } + "connect" : [ + { "id" : "f44", "to" : "f4" } + ] }, { "id" : "f4", "type" : "HtmlDialogExit", @@ -59,16 +63,18 @@ "visual" : { "at" : { "x" : 256, "y" : 64 } }, - "connect" : { "id" : "f2", "to" : "f1" } + "connect" : [ + { "id" : "f2", "to" : "f1" } + ] }, { "id" : "f14", "type" : "HtmlDialogMethodStart", "name" : "deleteDepartment(String)", "config" : { - "callSignature" : "deleteDepartment", + "signature" : "deleteDepartment", "input" : { "params" : [ - { "name" : "departmentId", "type" : "String" } + { "name" : "departmentId", "type" : "String", "desc" : "" } ], "map" : { "out.departmentId" : "param.departmentId" @@ -80,16 +86,18 @@ "at" : { "x" : 96, "y" : 416 }, "labelOffset" : { "x" : 3, "y" : 35 } }, - "connect" : { "id" : "f31", "to" : "f30" } + "connect" : [ + { "id" : "f31", "to" : "f30" } + ] }, { "id" : "f17", "type" : "HtmlDialogMethodStart", "name" : "editDepartment(String)", "config" : { - "callSignature" : "editDepartment", + "signature" : "editDepartment", "input" : { "params" : [ - { "name" : "departmentId", "type" : "String" } + { "name" : "departmentId", "type" : "String", "desc" : "" } ], "map" : { "out.departmentId" : "param.departmentId" @@ -101,7 +109,9 @@ "at" : { "x" : 96, "y" : 128 }, "labelOffset" : { "x" : 2, "y" : 35 } }, - "connect" : { "id" : "f9", "to" : "f8" } + "connect" : [ + { "id" : "f9", "to" : "f8" } + ] }, { "id" : "f18", "type" : "HtmlDialogEnd", @@ -119,9 +129,11 @@ }, "visual" : { "at" : { "x" : 256, "y" : 128 }, - "size" : { "width" : 128, "height" : 60 } + "size" : { "width" : 128 } }, - "connect" : { "id" : "f10", "to" : "f18" } + "connect" : [ + { "id" : "f10", "to" : "f18" } + ] }, { "id" : "f11", "type" : "HtmlDialogEventStart", @@ -133,24 +145,28 @@ "at" : { "x" : 96, "y" : 192 }, "labelOffset" : { "x" : 15, "y" : 35 } }, - "connect" : { "id" : "f16", "to" : "f15" } + "connect" : [ + { "id" : "f16", "to" : "f15" } + ] }, { "id" : "f15", "type" : "Script", "name" : "Validate", "config" : { - "security" : "system", "output" : { "code" : [ "in.secondSave = in.ctrl.isSaveViolationMaxWarning();", "in.ctrl.validateDepartmentForSave(in.secondSave);" ] - } + }, + "sudo" : true }, "visual" : { "at" : { "x" : 256, "y" : 192 } }, - "connect" : { "id" : "f20", "to" : "f25" } + "connect" : [ + { "id" : "f20", "to" : "f25" } + ] }, { "id" : "f28", "type" : "Script", @@ -166,7 +182,9 @@ "visual" : { "at" : { "x" : 768, "y" : 192 } }, - "connect" : { "id" : "f41", "to" : "f19" } + "connect" : [ + { "id" : "f41", "to" : "f19" } + ] }, { "id" : "f19", "type" : "HtmlDialogEnd", @@ -177,6 +195,11 @@ "id" : "f36", "type" : "Alternative", "name" : "second save?", + "config" : { + "conditions" : { + "f27" : "in.secondSave" + } + }, "visual" : { "at" : { "x" : 480, "y" : 256 }, "labelOffset" : { "x" : 20, "y" : 39 }, @@ -187,7 +210,7 @@ "name" : "yes", "segment" : 0.55, "offset" : { "x" : 17, "y" : -6 } - }, "condition" : "in.secondSave" }, + } }, { "id" : "f24", "to" : "f19", "via" : [ { "x" : 864, "y" : 256 }, { "x" : 864, "y" : 192 } ], "label" : { "name" : "no", "segment" : 0.05, @@ -198,6 +221,12 @@ "id" : "f25", "type" : "Alternative", "name" : "valid?", + "config" : { + "conditions" : { + "f22" : "in.ctrl.isNoSaveViolation()", + "f35" : "in.ctrl.isSaveViolationMaxWarning()" + } + }, "visual" : { "at" : { "x" : 352, "y" : 192 }, "labelOffset" : { "x" : 10, "y" : -16 } @@ -207,16 +236,16 @@ "name" : "yes", "segment" : 0.08, "offset" : { "x" : -2, "y" : -11 } - }, "condition" : "in.ctrl.isNoSaveViolation()" }, + } }, { "id" : "f35", "to" : "f36", "via" : [ { "x" : 352, "y" : 256 } ], "label" : { "name" : "max warning", "segment" : 1.36, - "offset" : { "x" : 0, "y" : -11 } - }, "condition" : "in.ctrl.isSaveViolationMaxWarning()" }, + "offset" : { "y" : -11 } + } }, { "id" : "f37", "to" : "f19", "via" : [ { "x" : 352, "y" : 306 }, { "x" : 864, "y" : 306 }, { "x" : 864, "y" : 192 } ], "label" : { "name" : "error or higher", "segment" : 1.09, - "offset" : { "x" : 0, "y" : -10 } + "offset" : { "y" : -10 } } } ] }, { @@ -224,15 +253,17 @@ "type" : "Script", "name" : "Save department", "config" : { - "security" : "system", "output" : { "code" : "in.ctrl.saveDepartment();" - } + }, + "sudo" : true }, "visual" : { "at" : { "x" : 608, "y" : 192 } }, - "connect" : { "id" : "f29", "to" : "f28" } + "connect" : [ + { "id" : "f29", "to" : "f28" } + ] }, { "id" : "f12", "type" : "HtmlDialogEventStart", @@ -244,7 +275,9 @@ "at" : { "x" : 96, "y" : 352 }, "labelOffset" : { "x" : 16, "y" : 35 } }, - "connect" : { "id" : "f26", "to" : "f33" } + "connect" : [ + { "id" : "f26", "to" : "f33" } + ] }, { "id" : "f13", "type" : "HtmlDialogEnd", @@ -271,7 +304,9 @@ "visual" : { "at" : { "x" : 256, "y" : 352 } }, - "connect" : { "id" : "f21", "to" : "f13" } + "connect" : [ + { "id" : "f21", "to" : "f13" } + ] }, { "id" : "f30", "type" : "Script", @@ -286,9 +321,11 @@ }, "visual" : { "at" : { "x" : 256, "y" : 416 }, - "size" : { "width" : 128, "height" : 60 } + "size" : { "width" : 128 } }, - "connect" : { "id" : "f34", "to" : "f32" } + "connect" : [ + { "id" : "f34", "to" : "f32" } + ] }, { "id" : "f32", "type" : "HtmlDialogEnd", @@ -311,9 +348,11 @@ }, "visual" : { "at" : { "x" : 96, "y" : 608 }, - "labelOffset" : { "x" : 16, "y" : 35 } + "labelOffset" : { "x" : 16 } }, - "connect" : { "id" : "f40", "to" : "f39" } + "connect" : [ + { "id" : "f40", "to" : "f39" } + ] }, { "id" : "f39", "type" : "HtmlDialogEnd", diff --git a/persistence-utils-demo/src_hd/com/axonivy/utils/persistence/demo/PersonSearch/PersonSearchProcess.p.json b/persistence-utils-demo/src_hd/com/axonivy/utils/persistence/demo/PersonSearch/PersonSearchProcess.p.json index 09bed7b..fc762f8 100644 --- a/persistence-utils-demo/src_hd/com/axonivy/utils/persistence/demo/PersonSearch/PersonSearchProcess.p.json +++ b/persistence-utils-demo/src_hd/com/axonivy/utils/persistence/demo/PersonSearch/PersonSearchProcess.p.json @@ -1,5 +1,5 @@ { - "format" : "10.0.0", + "$schema" : "https://json-schema.axonivy.com/process/11.3.0/process.json", "id" : "173A4BB5DE327C81", "kind" : "HTML_DIALOG", "config" : { @@ -10,14 +10,16 @@ "type" : "HtmlDialogStart", "name" : "start()", "config" : { - "callSignature" : "start", + "signature" : "start", "guid" : "173A4BB5DFB9831F" }, "visual" : { "at" : { "x" : 96, "y" : 64 }, "labelOffset" : { "x" : 12, "y" : 35 } }, - "connect" : { "id" : "f7", "to" : "f6" } + "connect" : [ + { "id" : "f7", "to" : "f6" } + ] }, { "id" : "f1", "type" : "HtmlDialogEnd", @@ -35,7 +37,9 @@ "at" : { "x" : 96, "y" : 480 }, "labelOffset" : { "x" : 9, "y" : 35 } }, - "connect" : { "id" : "f44", "to" : "f4" } + "connect" : [ + { "id" : "f44", "to" : "f4" } + ] }, { "id" : "f4", "type" : "HtmlDialogExit", @@ -59,7 +63,9 @@ "visual" : { "at" : { "x" : 256, "y" : 64 } }, - "connect" : { "id" : "f2", "to" : "f1" } + "connect" : [ + { "id" : "f2", "to" : "f1" } + ] }, { "id" : "f9", "type" : "HtmlDialogEnd", @@ -71,10 +77,10 @@ "type" : "HtmlDialogMethodStart", "name" : "deletePerson(String)", "config" : { - "callSignature" : "deletePerson", + "signature" : "deletePerson", "input" : { "params" : [ - { "name" : "personId", "type" : "String" } + { "name" : "personId", "type" : "String", "desc" : "" } ], "map" : { "out.personId" : "param.personId" @@ -86,7 +92,9 @@ "at" : { "x" : 96, "y" : 416 }, "labelOffset" : { "x" : 16, "y" : 35 } }, - "connect" : { "id" : "f18", "to" : "f17" } + "connect" : [ + { "id" : "f18", "to" : "f17" } + ] }, { "id" : "f15", "type" : "HtmlDialogEnd", @@ -108,16 +116,18 @@ "visual" : { "at" : { "x" : 224, "y" : 416 } }, - "connect" : { "id" : "f16", "to" : "f15" } + "connect" : [ + { "id" : "f16", "to" : "f15" } + ] }, { "id" : "f8", "type" : "HtmlDialogMethodStart", "name" : "editPerson(String)", "config" : { - "callSignature" : "editPerson", + "signature" : "editPerson", "input" : { "params" : [ - { "name" : "personId", "type" : "String" } + { "name" : "personId", "type" : "String", "desc" : "" } ], "map" : { "out.personId" : "param.personId" @@ -129,7 +139,9 @@ "at" : { "x" : 96, "y" : 128 }, "labelOffset" : { "x" : 40, "y" : 35 } }, - "connect" : { "id" : "f20", "to" : "f19" } + "connect" : [ + { "id" : "f20", "to" : "f19" } + ] }, { "id" : "f19", "type" : "Script", @@ -142,7 +154,9 @@ "visual" : { "at" : { "x" : 256, "y" : 128 } }, - "connect" : { "id" : "f10", "to" : "f9" } + "connect" : [ + { "id" : "f10", "to" : "f9" } + ] }, { "id" : "f12", "type" : "HtmlDialogEventStart", @@ -154,7 +168,9 @@ "at" : { "x" : 96, "y" : 192 }, "labelOffset" : { "x" : 11, "y" : 35 } }, - "connect" : { "id" : "f21", "to" : "f11" } + "connect" : [ + { "id" : "f21", "to" : "f11" } + ] }, { "id" : "f13", "type" : "HtmlDialogEnd", @@ -169,36 +185,46 @@ "sync person" ], "config" : { - "security" : "system", "output" : { "code" : "in.ctrl.saveAndSyncPerson();" - } + }, + "sudo" : true }, "visual" : { "at" : { "x" : 608, "y" : 192 } }, - "connect" : { "id" : "f29", "to" : "f28" } + "connect" : [ + { "id" : "f29", "to" : "f28" } + ] }, { "id" : "f11", "type" : "Script", "name" : "Validate", "config" : { - "security" : "system", "output" : { "code" : [ "in.secondSave = in.ctrl.isSaveViolationMaxWarning();", "in.ctrl.validatePersonForSave(in.secondSave);" ] - } + }, + "sudo" : true }, "visual" : { "at" : { "x" : 256, "y" : 192 } }, - "connect" : { "id" : "f26", "to" : "f25" } + "connect" : [ + { "id" : "f26", "to" : "f25" } + ] }, { "id" : "f25", "type" : "Alternative", "name" : "valid?", + "config" : { + "conditions" : { + "f22" : "in.ctrl.isNoSaveViolation()", + "f35" : "in.ctrl.isSaveViolationMaxWarning()" + } + }, "visual" : { "at" : { "x" : 352, "y" : 192 }, "labelOffset" : { "x" : 10, "y" : -16 } @@ -208,16 +234,16 @@ "name" : "yes", "segment" : 0.08, "offset" : { "x" : -2, "y" : -11 } - }, "condition" : "in.ctrl.isNoSaveViolation()" }, + } }, { "id" : "f35", "to" : "f36", "via" : [ { "x" : 352, "y" : 256 } ], "label" : { "name" : "max warning", "segment" : 1.36, - "offset" : { "x" : 0, "y" : -11 } - }, "condition" : "in.ctrl.isSaveViolationMaxWarning()" }, + "offset" : { "y" : -11 } + } }, { "id" : "f37", "to" : "f13", "via" : [ { "x" : 352, "y" : 306 }, { "x" : 864, "y" : 306 }, { "x" : 864, "y" : 192 } ], "label" : { "name" : "error or higher", "segment" : 1.09, - "offset" : { "x" : 0, "y" : -10 } + "offset" : { "y" : -10 } } } ] }, { @@ -235,7 +261,9 @@ "visual" : { "at" : { "x" : 768, "y" : 192 } }, - "connect" : { "id" : "f41", "to" : "f13" } + "connect" : [ + { "id" : "f41", "to" : "f13" } + ] }, { "id" : "f30", "type" : "HtmlDialogEventStart", @@ -247,7 +275,9 @@ "at" : { "x" : 96, "y" : 352 }, "labelOffset" : { "x" : 12, "y" : 35 } }, - "connect" : { "id" : "f34", "to" : "f33" } + "connect" : [ + { "id" : "f34", "to" : "f33" } + ] }, { "id" : "f31", "type" : "HtmlDialogEnd", @@ -274,11 +304,18 @@ "visual" : { "at" : { "x" : 224, "y" : 352 } }, - "connect" : { "id" : "f32", "to" : "f31" } + "connect" : [ + { "id" : "f32", "to" : "f31" } + ] }, { "id" : "f36", "type" : "Alternative", "name" : "second save?", + "config" : { + "conditions" : { + "f27" : "in.secondSave" + } + }, "visual" : { "at" : { "x" : 480, "y" : 256 }, "labelOffset" : { "x" : 20, "y" : 39 }, @@ -289,7 +326,7 @@ "name" : "yes", "segment" : 0.55, "offset" : { "x" : 17, "y" : -6 } - }, "condition" : "in.secondSave" }, + } }, { "id" : "f24", "to" : "f13", "via" : [ { "x" : 864, "y" : 256 }, { "x" : 864, "y" : 192 } ], "label" : { "name" : "no", "segment" : 0.05, @@ -312,9 +349,11 @@ }, "visual" : { "at" : { "x" : 96, "y" : 640 }, - "labelOffset" : { "x" : 23, "y" : 35 } + "labelOffset" : { "x" : 23 } }, - "connect" : { "id" : "f40", "to" : "f39" } + "connect" : [ + { "id" : "f40", "to" : "f39" } + ] }, { "id" : "f39", "type" : "HtmlDialogEnd", diff --git a/persistence-utils-demo/src_hd/com/axonivy/utils/persistence/demo/components/Info/InfoProcess.p.json b/persistence-utils-demo/src_hd/com/axonivy/utils/persistence/demo/components/Info/InfoProcess.p.json index 916dc48..f535d54 100644 --- a/persistence-utils-demo/src_hd/com/axonivy/utils/persistence/demo/components/Info/InfoProcess.p.json +++ b/persistence-utils-demo/src_hd/com/axonivy/utils/persistence/demo/components/Info/InfoProcess.p.json @@ -1,5 +1,5 @@ { - "format" : "10.0.0", + "$schema" : "https://json-schema.axonivy.com/process/11.3.0/process.json", "id" : "173BD7E18B4BE71C", "kind" : "HTML_DIALOG", "config" : { @@ -10,14 +10,16 @@ "type" : "HtmlDialogStart", "name" : "start()", "config" : { - "callSignature" : "start", + "signature" : "start", "guid" : "173BD7E18F345B7F" }, "visual" : { "at" : { "x" : 96, "y" : 64 }, "labelOffset" : { "x" : 12, "y" : 35 } }, - "connect" : { "id" : "f2", "to" : "f1" } + "connect" : [ + { "id" : "f2", "to" : "f1" } + ] }, { "id" : "f1", "type" : "HtmlDialogEnd", @@ -29,10 +31,10 @@ "type" : "HtmlDialogMethodStart", "name" : "showInfo(String)", "config" : { - "callSignature" : "showInfo", + "signature" : "showInfo", "input" : { "params" : [ - { "name" : "value", "type" : "String" } + { "name" : "value", "type" : "String", "desc" : "" } ], "map" : { "out.value" : "param.value" @@ -44,7 +46,9 @@ "at" : { "x" : 96, "y" : 224 }, "labelOffset" : { "x" : 14, "y" : 35 } }, - "connect" : { "id" : "f10", "to" : "f9" } + "connect" : [ + { "id" : "f10", "to" : "f9" } + ] }, { "id" : "f7", "type" : "HtmlDialogEnd", @@ -75,6 +79,8 @@ "visual" : { "at" : { "x" : 224, "y" : 224 } }, - "connect" : { "id" : "f8", "to" : "f7" } + "connect" : [ + { "id" : "f8", "to" : "f7" } + ] } ] } \ No newline at end of file diff --git a/persistence-utils-product/pom.xml b/persistence-utils-product/pom.xml index 4af2c84..3574530 100644 --- a/persistence-utils-product/pom.xml +++ b/persistence-utils-product/pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.axonivy.utils.persistence persistence-utils-product - 10.0.9-SNAPSHOT + 11.3.0-SNAPSHOT pom diff --git a/persistence-utils/.project b/persistence-utils/.project index 380e2d9..16fade5 100644 --- a/persistence-utils/.project +++ b/persistence-utils/.project @@ -25,6 +25,11 @@ + + ch.ivyteam.ivy.dialog.form.build.ivyDialogFormBuilder + + + ch.ivyteam.ivy.designer.ide.ivyModelValidationBuilder diff --git a/persistence-utils/.settings/ch.ivyteam.ivy.designer.prefs b/persistence-utils/.settings/ch.ivyteam.ivy.designer.prefs index a090ea2..a5695f9 100644 --- a/persistence-utils/.settings/ch.ivyteam.ivy.designer.prefs +++ b/persistence-utils/.settings/ch.ivyteam.ivy.designer.prefs @@ -1,5 +1,5 @@ ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_DATA_CLASS=com.axonivy.utils.persistence.Data ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_NAMESPACE=com.axonivy.utils.persistence -ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=11 -ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=100000 -eclipse.preferences.version=1 \ No newline at end of file +ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=13 +ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=113000 +eclipse.preferences.version=1 diff --git a/persistence-utils/.settings/org.eclipse.wst.common.component b/persistence-utils/.settings/org.eclipse.wst.common.component index 4444762..338cf44 100644 --- a/persistence-utils/.settings/org.eclipse.wst.common.component +++ b/persistence-utils/.settings/org.eclipse.wst.common.component @@ -1,42 +1,11 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + \ No newline at end of file diff --git a/persistence-utils/pom.xml b/persistence-utils/pom.xml index 463d54a..3dbafd9 100644 --- a/persistence-utils/pom.xml +++ b/persistence-utils/pom.xml @@ -1,64 +1,64 @@ - - 4.0.0 - com.axonivy.utils.persistence - persistence-utils - 10.0.9-SNAPSHOT - iar - - - org.hibernate - hibernate-jpamodelgen - 5.6.5.Final - provided - - - - src - - - com.axonivy.ivy.ci - project-build-plugin - 10.0.16 - true - - - -proc:none - - - - - org.apache.maven.plugins - maven-source-plugin - 3.3.0 - - - attach-sources - - jar-no-fork - - - - - - maven-assembly-plugin - 3.4.2 - - - make-assembly - package - - single - - - false - - jar.xml - - - - - - - - \ No newline at end of file + + 4.0.0 + com.axonivy.utils.persistence + persistence-utils + 11.3.0-SNAPSHOT + iar + + + org.hibernate + hibernate-jpamodelgen + 5.6.5.Final + provided + + + + src + + + com.axonivy.ivy.ci + project-build-plugin + 11.3.0 + true + + + -proc:none + + + + + maven-source-plugin + 3.3.0 + + + attach-sources + + jar-no-fork + + + + + + maven-assembly-plugin + 3.4.2 + + + make-assembly + package + + single + + + false + + jar.xml + + + + + + + + diff --git a/persistence-utils/src_generated/com/axonivy/utils/persistence/beans/.gitignore b/persistence-utils/src_generated/com/axonivy/utils/persistence/beans/.gitignore new file mode 100644 index 0000000..8c1e31b --- /dev/null +++ b/persistence-utils/src_generated/com/axonivy/utils/persistence/beans/.gitignore @@ -0,0 +1,8 @@ +/AuditableIdEntity_.java +/GenericEntity_.java +/GenericIdEntity_.java +/Header_.java +/ToggleableIdEntity_.java +/AuditableEntity_.java +/ToggleableEntity_.java +/VersionableEntity_.java diff --git a/persistence-utils/src_generated/com/axonivy/utils/persistence/history/beans/.gitignore b/persistence-utils/src_generated/com/axonivy/utils/persistence/history/beans/.gitignore new file mode 100644 index 0000000..e2556d3 --- /dev/null +++ b/persistence-utils/src_generated/com/axonivy/utils/persistence/history/beans/.gitignore @@ -0,0 +1,2 @@ +/HistoryPK_.java +/History_.java diff --git a/pom.xml b/pom.xml index 1a84f65..59ff654 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.axonivy.utils.persistence persistence-utils-modules - 10.0.9-SNAPSHOT + 11.3.0-SNAPSHOT persistence-utils pom