You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2021/08/26 05:46:11 UTC
[isis-app-simpleapp] branch jdo updated (a036de5 -> 48948f5)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a change to branch jdo
in repository https://gitbox.apache.org/repos/asf/isis-app-simpleapp.git.
from a036de5 ISIS-2660: removes persistence.xml, as is not required by default
add d0aef8a wip - converting to JPA
add 5f050b9 wip - converting to JPA
add 448eb13 Merge branch 'v2.0.0-jdo-SNAPSHOT' into v2.0.0-jpa-SNAPSHOT
add e2ed5ef fixes use of jdo
add 05529b3 minor cleanup, no behavioral changes
add b90b0b1 fixes provisioning errors (configuration)
add 5b11f7a further fixes provisioning issues
add aa39173 typo in SimpleObject's object type
add 47d80bf IsisModuleJpaEclipseLink was renamed (upstream)
add 402b748 attempting to get the integ tests to pass
add e93cf21 fixes test bootstrapping/provisioning issues
add 8d410d1 fixes SimpleObject injection points not resolved
add 8f2f2e3 fixes service provisioning when launching the App
add 821b5f8 fixes menubars (upstream changes)
add 67c4d4f set the jpa branch to version 2.0.0-SNAPSHOT
add 784aeb3 JPA: adds artifact id suffix -jpa
add 8a97726 JPA: adds artifact id suffix -jpa (2)
add 422cc1f fixes build issue, fixes unit tests, adds support for 'simple' schema
add bb9babe Merge branch 'jdo' into jpa
add 4185b88 ISIS-2512: fixes datasource configurations
add ca5e6ac CustomController: don't fail on empty result
add aab8870 framework packages had been renamed
add 87d496a ISIS-2444: docs for TableColumnOrderService
add 3ee5418 uses TransactionalProcessor service rather than TransactionService
add 1ea42fd api changes with approvaltests
add 08261ee reconciling with jdo
add 5c8288a more rationalizing
add 892e963 Merge branch 'jdo' into jpa
add 620f3e6 splits out tests into their own modules (not yet building)
add f1d82d2 fixes classpaths for tests; adds staging repository to top-level pom
add c6ad1f6 Merge branch 'jdo' into jpa
add 6977248 Merge branch 'jdo' into jpa
add 8af1e57 Merge branch 'jdo' into jpa
add d5eeb47 Merge branch 'jdo' into jpa
add 33bc600 Merge branch 'jdo' into jpa-SNAPSHOT
add a018c1c Merge branch 'jdo' into jpa
add db958c8 Merge branch 'jdo' into jpa
add a5142ec Merge branch 'jdo' into jpa
add e07e955 Merge branch 'jdo' into jpa-SNAPSHOT
add 2e6b201 minor update for M5
add 2a29eea Merge branch 'jdo' into jpa
add 68f4fd0 Merge branch 'jdo' into jpa
add f5045d5 getting JPA to run under flyway
add 6ac2cf9 reconciling jpa with jdo branch
add da2c76a Merge branch 'jdo' into jpa
add c5135fa workaround for ISIS-2583
add 9befa5c Merge branch 'jdo' into jpa-SNAPSHOT
add 7859a2c bumps to latest nightly
add cc07512 bumps to latest nightly
add 43933e3 Merge branch 'jdo-SNAPSHOT' into jpa-SNAPSHOT
add 5b388c4 removes workaround for ISIS-2583
add 488026a adds JPQL @NamedQuery as an example
add eb503d6 adds notes on eclipselink.weaving
add d17467e Merge branch 'jpa' into jpa-SNAPSHOT
add 56a2ac8 Merge branch 'jdo' into jpa
add c2b97ed Merge branch 'jpa' into jpa-SNAPSHOT
add e299f00 Merge branch 'jdo' into jdo-SNAPSHOT
add 239b774 Merge branch 'jdo-SNAPSHOT' into jpa-SNAPSHOT
add fc95327 Merge branch 'jdo' into jpa
add 1ba0bd2 Merge branch 'jpa' into jpa-SNAPSHOT
add 421146f Merge branch 'jdo' into jdo-SNAPSHOT
add b67add2 Merge branch 'jdo-SNAPSHOT' into jpa-SNAPSHOT
add 9824779 adds update-parent-to-latest.sh
add 7a25cac improves update-parent-to-latest.sh
add bcb4008 updates parent pom to 2.0.0-M5.20210413-1443-108a3a48
add afe09f5 Merge branch 'jdo-SNAPSHOT' into jpa-SNAPSHOT
add 9fe1003 Merge branch 'jdo' into jpa
add aeb490c Merge branch 'jdo' into jpa
add a9c9f39 adds back in EntityScan; removes unnecessary domain event
add bb7d2d9 Merge branch 'jdo' into jpa
add 2e9b151 Merge branch 'jdo' into jpa
add 95aa1f9 Merge branch 'jpa' into jpa-SNAPSHOT
add b8dc865 Merge branch 'jdo' into jdo-SNAPSHOT
add 60bf37c replaces @MemberOrder with @PropertyLayout
add 57a093d Merge branch 'jdo-SNAPSHOT' into jpa-SNAPSHOT
add 88a4240 fix further @PropertyLayout issue
add 12ede14 Merge branch 'jdo' into jpa
add 2062c6a Merge branch 'jpa' into jpa-SNAPSHOT
add 3195904 Merge branch 'jdo' into jdo-SNAPSHOT
add e2538ec Merge branch 'jdo-SNAPSHOT' into jpa-SNAPSHOT
add 8a603f7 fixes up layout
add d492aec Merge branch 'jdo-SNAPSHOT' into jpa-SNAPSHOT
add c342542 updates parent pom to 2.0.0-M5.20210422-0429-0348bc49
add f10a088 updates parent pom to 2.0.0-M5.20210422-0429-0348bc49
add 5aa7541 Merge branch 'jdo-SNAPSHOT' into jpa-SNAPSHOT
add c9f70c6 update parent pom: cleanup some imports
add 7b6a7d7 cleanup imports
add 695c4d3 update parent pom 2.0.0-M5.20210423-0430-569e4464
add 3ed8d7d Merge remote-tracking branch 'origin/jdo-SNAPSHOT' into jpa-SNAPSHOT
add 8ebadb2 updates to latest snapshot
add 0323754 updates to latest snapshot
add edc2e77 Merge branch 'jdo-SNAPSHOT' into jpa-SNAPSHOT
add e2a235c updates parent pom to 2.0.0-M5.20210516-0435-8f068035
add d362db5 Merge branch 'jdo-SNAPSHOT' into jpa-SNAPSHOT
add 4a80224 removes test due to removed system mixin
add ae48b21 bumps version
add 1d31843 updates parent pom to 2.0.0-M5.20210522-0434-fb17f373
add 5622265 removes commented out <version> from pom.xml
add 66e6dce fixes test from removal of system mixin; updates <version>
add 972d5ac Merge branch 'jdo' into jpa
add 793c284 Merge branch 'jpa' into jpa-SNAPSHOT
add 15608b7 Merge branch 'jdo' into jdo-SNAPSHOT
add ec6df05 Merge branch 'jdo-SNAPSHOT' into jpa-SNAPSHOT
add 2232206 updates parent pom to 2.0.0-M5.20210528-0538-0747d6b3
add e036c02 updates parent pom to 2.0.0-M5.20210529-0603-801802dc
add 6080acc updates menubars
add feb4bdc Merge branch 'jdo-SNAPSHOT' into jpa-SNAPSHOT
add 3df64a5 cleans up home page also
add 47f3b99 Merge branch 'jdo-SNAPSHOT' into jpa-SNAPSHOT
add b2403b3 updates parent pom to 2.0.0-M5.20210531-0551-643cdd85
add 760cde5 updates parent pom to 2.0.0-M5.20210601-0553-daa4d8e1
add 3b63894 explicitly adds in dependency to isis-security-shiro
add 03c0d06 Merge branch 'jdo-SNAPSHOT' into jpa-SNAPSHOT
add 01a8d81 ISIS-2714: adds framework roles to shiro.ini
add 0b9b88e Merge branch 'jdo-SNAPSHOT' into jpa-SNAPSHOT
add 3d15a64 updates with 2732, 2727 and 2726 changes
add 5178d5b removes DomainAppFixtureScriptsSpecificationProvider
add b8a0460 Merge branch 'jdo-SNAPSHOT' into jpa-SNAPSHOT
add 9fd1627 reconciling with jdo-SNAPSHOT
add 1cf78b7 reconciling against jpa
add f365cb9 Merge branch 'jdo-SNAPSHOT' into jpa-SNAPSHOT
add 5bd9842 Merge branch 'jpa-SNAPSHOT' into jdo-SNAPSHOT
add cf9670a updates to latest snapshot
add 95f8238 improvements
add b3d4e72 adds isis.version property
add dce145b improves and renames update-parent.sh
add 170bf69 updates parent pom to 2.0.0-M5.20210713-0226-85ec9782
add 40eb6b7 updates parent pom to 2.0.0-SNAPSHOT
add c5d4b93 fixes uniqueness constraint, use upper case
add adb41c0 tiny update to menbars.layout.xml
add 6444c44 updates parent pom to 2.0.0-SNAPSHOT
add b29ec0a adds example usage of columnOrders; uses @Title instead of title()
add 078c9ba updates parent pom to 2.0.0-M5.20210802-0226-04ee32a6
add 9f593ed updates to 2.0.0-SNAPSHOT
add 0335b78 uses @Nested for integ tests
add b8b6c83 updates parent pom to 2.0.0-M5.20210805-1637-ae1e2f24
add bc67fd5 reverts @Nested
add f848c6d fixes home page logicalTypeName; removes secman menu items (added accidentally previously); force h2 to use MSSQLServer compatible mode.
add 61540b8 Merge branch 'jpa-SNAPSHOT' into jdo-SNAPSHOT
add 0a85b7c updates parent pom to 2.0.0-M6
add 2c05d27 Merge branch 'jpa-SNAPSHOT' into jdo-SNAPSHOT
add e96e9fc removes double annotation; fixes logger definitions
add ddd29ec further small fixes (backported from jdo-SNAPSHOT)
add c6c9121 Merge branch 'jpa-SNAPSHOT' into jdo-SNAPSHOT
add b4d2ef8 reverts config for h2 to be compatible with jdo
add 23cb0f9 removes commented out line
add fff9323 backports jdo branch's config for h2
add dbee8fd Merge branch 'jpa-SNAPSHOT' into jdo-SNAPSHOT
add 0b306de removes secman action from menubars.layout
add 9408357 Merge branch 'jpa-SNAPSHOT' into jdo-SNAPSHOT
add df2d0ba updates version to 2.0.0-M6
add f637c81 updates version to 2.0.0-M6
add e2c6edf fixes mavendeps
add ab9fa3e Merge branch 'release-2.0.0-M6-RC1-jpa' into release-2.0.0-M6-RC1-jdo
add fccb706 more sorting out of mavendeps
add 1ea34ed merges jpa
add c20d8d3 sets version back to 1.0.0-SNAPSHOT
add c9801b9 sets version back to 1.0.0-SNAPSHOT
add 48948f5 Merge branch 'jpa-SNAPSHOT' into jdo-SNAPSHOT
No new revisions were added by this update.
Summary of changes:
.gitignore | 4 +-
.../integtests/SimpleModuleIntegTestAbstract.java | 4 +-
.../integtests/tests/SimpleObject_IntegTest.java | 26 ++---------
.../integtests/tests/SimpleObjects_IntegTest.java | 5 ++-
module-simple/pom.xml | 5 +--
.../domainapp/modules/simple/SimpleModule.java | 6 ---
.../dom/so/SimpleObject#others.columnOrder.txt | 2 +
.../simple/dom/so/SimpleObject.columnOrder.txt | 2 +
.../modules/simple/dom/so/SimpleObject.java | 51 +++++++++++++---------
.../modules/simple/dom/so/SimpleObject.layout.xml | 6 +--
.../modules/simple/dom/so/SimpleObjects.java | 15 ++++---
.../simple/fixture/SimpleObjectBuilder.java | 8 ++--
.../simple/fixture/SimpleObject_persona.java | 6 +--
.../java/domainapp/modules/simple/types/Name.java | 7 ---
pom.xml | 3 +-
update-parent-to-latest.sh | 6 ---
update-parent.sh | 15 +++++++
.../webapp/integtests/WebAppIntegTestAbstract.java | 4 +-
webapp/pom.xml | 10 ++---
.../main/java/domainapp/webapp/AppManifest.java | 4 +-
.../src/main/java/domainapp/webapp/SimpleApp.java | 3 +-
...mainAppFixtureScriptsSpecificationProvider.java | 25 -----------
.../services/homepage/HomePageViewModel.java | 3 +-
.../services/homepage/HomePageViewModel.layout.xml | 5 ++-
.../webapp/custom/restapi/CustomController.java | 36 ++++++++-------
.../java/domainapp/webapp/quartz/QuartzModule.java | 4 --
.../domainapp/webapp/quartz/job/SampleJob.java | 37 ++++++----------
webapp/src/main/resources/application.yml | 20 ++++++---
.../main/resources/config/application.properties | 10 +++--
webapp/src/main/resources/log4j2-spring.xml | 19 +++++---
webapp/src/main/resources/menubars.layout.xml | 29 +++++++++---
webapp/src/main/resources/shiro.ini | 34 ++++++++++-----
32 files changed, 208 insertions(+), 206 deletions(-)
create mode 100644 module-simple/src/main/java/domainapp/modules/simple/dom/so/SimpleObject#others.columnOrder.txt
create mode 100644 module-simple/src/main/java/domainapp/modules/simple/dom/so/SimpleObject.columnOrder.txt
delete mode 100644 update-parent-to-latest.sh
create mode 100644 update-parent.sh
delete mode 100644 webapp/src/main/java/domainapp/webapp/application/fixture/DomainAppFixtureScriptsSpecificationProvider.java