-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
MARP-653: convert to Ivy Designer 11.3 (#60)
- Loading branch information
Phạm Duy Linh
authored
Jul 24, 2024
1 parent
b8d88f3
commit 7acc1bb
Showing
37 changed files
with
549 additions
and
500 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 3 additions & 3 deletions
6
persistence-utils-demo-test/.settings/ch.ivyteam.ivy.designer.prefs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 | ||
| ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=13 | ||
| ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=113000 | ||
| eclipse.preferences.version=1 |
61 changes: 14 additions & 47 deletions
61
persistence-utils-demo-test/.settings/org.eclipse.wst.common.component
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,47 +1,14 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0"> | ||
|
|
||
|
|
||
|
|
||
| <wb-module deploy-name="persistence-utils-demo-test"> | ||
|
|
||
|
|
||
|
|
||
| <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"/> | ||
|
|
||
|
|
||
| <wb-resource deploy-path="/WEB-INF/classes" source-path="/target/.apt_generated"/> | ||
|
|
||
|
|
||
| <wb-resource deploy-path="/WEB-INF/classes" source-path="/.apt_generated_tests"/> | ||
| <wb-resource deploy-path="/WEB-INF/classes" source-path="/src_generated"/> | ||
| <wb-resource deploy-path="/WEB-INF/classes" source-path="/src_generated_tests"/> | ||
|
|
||
|
|
||
|
|
||
| <property name="java-output-path" value="/persistence-utils-demo-test/target/classes"/> | ||
|
|
||
| <property name="context-root" value="persistence-utils-demo-test"/> | ||
|
|
||
|
|
||
|
|
||
| </wb-module> | ||
|
|
||
|
|
||
|
|
||
| </project-modules> | ||
| <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0"> | ||
| <wb-module deploy-name="persistence-utils-demo-test"> | ||
| <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_wsproc"/> | ||
| <wb-resource deploy-path="/WEB-INF/classes" source-path="/src_dataClasses"/> | ||
| <wb-resource deploy-path="/WEB-INF/classes" source-path="/target/.apt_generated"/> | ||
| <wb-resource deploy-path="/WEB-INF/classes" source-path="/.apt_generated_tests"/> | ||
| <wb-resource deploy-path="/WEB-INF/classes" source-path="/src_generated"/> | ||
| <wb-resource deploy-path="/WEB-INF/classes" source-path="/src_generated_tests"/> | ||
| <property name="java-output-path" value="/persistence-utils-demo-test/target/classes"/> | ||
| <property name="context-root" value="persistence-utils-demo-test"/> | ||
| </wb-module> | ||
| </project-modules> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,57 +1,58 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <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"> | ||
| <modelVersion>4.0.0</modelVersion> | ||
| <groupId>com.axonivy.utils.persistence</groupId> | ||
| <artifactId>persistence-utils-demo-test</artifactId> | ||
| <version>10.0.9-SNAPSHOT</version> | ||
| <packaging>iar</packaging> | ||
| <description>Test project of the persistence utils demo project. Note, that this project is currently also used to test some aspects of the persistence library.</description> | ||
| <dependencies> | ||
| <dependency> | ||
| <groupId>com.axonivy.utils.persistence</groupId> | ||
| <artifactId>persistence-utils-demo-tool</artifactId> | ||
| <version>${project.version}</version> | ||
| <type>iar</type> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>com.axonivy.ivy.test</groupId> | ||
| <artifactId>unit-tester</artifactId> | ||
| <version>10.0.16</version> | ||
| <scope>test</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.hibernate</groupId> | ||
| <artifactId>hibernate-jpamodelgen</artifactId> | ||
| <version>5.6.5.Final</version> | ||
| <scope>provided</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.hsqldb</groupId> | ||
| <artifactId>hsqldb</artifactId> | ||
| <version>2.7.3</version> | ||
| <scope>test</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.mockito</groupId> | ||
| <artifactId>mockito-inline</artifactId> | ||
| <version>3.7.0</version> | ||
| <scope>test</scope> | ||
| </dependency> | ||
| </dependencies> | ||
| <build> | ||
| <testSourceDirectory>src_test</testSourceDirectory> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>com.axonivy.ivy.ci</groupId> | ||
| <artifactId>project-build-plugin</artifactId> | ||
| <version>10.0.16</version> | ||
| <extensions>true</extensions> | ||
| <configuration> | ||
| <compilerOptions> | ||
| <compilerOption>-proc:none</compilerOption> | ||
| </compilerOptions> | ||
| </configuration> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
| </project> | ||
| <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.utils.persistence</groupId> | ||
| <artifactId>persistence-utils-demo-test</artifactId> | ||
| <version>11.3.0-SNAPSHOT</version> | ||
| <packaging>iar</packaging> | ||
| <description>Test project of the persistence utils demo project. Note, that this project is currently also used to test some aspects of the persistence library.</description> | ||
| <dependencies> | ||
| <dependency> | ||
| <groupId>com.axonivy.utils.persistence</groupId> | ||
| <artifactId>persistence-utils-demo-tool</artifactId> | ||
| <version>${project.version}</version> | ||
| <type>iar</type> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>com.axonivy.ivy.test</groupId> | ||
| <artifactId>unit-tester</artifactId> | ||
| <version>10.0.16</version> | ||
| <scope>test</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.hibernate</groupId> | ||
| <artifactId>hibernate-jpamodelgen</artifactId> | ||
| <version>5.6.5.Final</version> | ||
| <scope>provided</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.hsqldb</groupId> | ||
| <artifactId>hsqldb</artifactId> | ||
| <version>2.7.3</version> | ||
| <scope>test</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.mockito</groupId> | ||
| <artifactId>mockito-inline</artifactId> | ||
| <version>3.7.0</version> | ||
| <scope>test</scope> | ||
| </dependency> | ||
| </dependencies> | ||
| <build> | ||
| <testSourceDirectory>src_test</testSourceDirectory> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>com.axonivy.ivy.ci</groupId> | ||
| <artifactId>project-build-plugin</artifactId> | ||
| <version>11.3.0</version> | ||
| <extensions>true</extensions> | ||
| <configuration> | ||
| <compilerOptions> | ||
| <compilerOption>-proc:none</compilerOption> | ||
| </compilerOptions> | ||
| </configuration> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
| </project> |
9 changes: 9 additions & 0 deletions
9
persistence-utils-demo-test/src_generated/com/axonivy/utils/persistence/entities/.gitignore
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| /Car_.java | ||
| /Constrained_.java | ||
| /HistorizedPerson_.java | ||
| /InvoicePosition_.java | ||
| /Invoice_.java | ||
| /Option_.java | ||
| /Producer_.java | ||
| /Product_.java | ||
| /Vehicle_.java |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 3 additions & 3 deletions
6
persistence-utils-demo-tool/.settings/ch.ivyteam.ivy.designer.prefs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 | ||
| ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=13 | ||
| ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=113000 | ||
| eclipse.preferences.version=1 |
21 changes: 10 additions & 11 deletions
21
persistence-utils-demo-tool/.settings/org.eclipse.wst.common.component
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,10 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0"> | ||
| <wb-module deploy-name="persistence-utils-demo-tool"> | ||
| <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="persistence-utils-demo-tool"/> | ||
| <property name="java-output-path" value="/persistence-utils-demo-tool/target/classes"/> | ||
| </wb-module> | ||
| </project-modules> | ||
| <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0"> | ||
| <wb-module deploy-name="persistence-utils-demo-tool"> | ||
| <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_wsproc"/> | ||
| <wb-resource deploy-path="/WEB-INF/classes" source-path="/src_dataClasses"/> | ||
| <property name="context-root" value="persistence-utils-demo-tool"/> | ||
| <property name="java-output-path" value="/persistence-utils-demo-tool/target/classes"/> | ||
| </wb-module> | ||
| </project-modules> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.