This is an automated email from the ASF dual-hosted git repository. danhaywood pushed a commit to branch jdo-SNAPSHOT in repository https://gitbox.apache.org/repos/asf/isis-app-simpleapp.git
commit 59134c0fc998f4eacb099a62e8c6494bf8656e54 Merge: f73a418 93e6696 Author: Dan Haywood <[email protected]> AuthorDate: Sun Jul 31 22:11:52 2022 +0100 Merge branch 'jpa-SNAPSHOT' into jdo-SNAPSHOT .run/SimpleApp.run.xml | 10 ++++ README.adoc | 2 +- .../integtests/tests/SimpleObjects_IntegTest.java | 42 +++++++++++++---- .../domainapp/modules/simple/SimpleModule.java | 5 +- .../dom/so/SimpleObject#others.columnOrder.txt | 2 - .../modules/simple/dom/so/SimpleObject.layout.xml | 55 ++++++++++++---------- .../main/java/domainapp/webapp/AppManifest.java | 5 ++ .../src/main/resources/static/css/application.css | 3 ++ 8 files changed, 84 insertions(+), 40 deletions(-) diff --cc webapp/src/main/java/domainapp/webapp/AppManifest.java index 8b66964,cfbfcda..557bda8 --- a/webapp/src/main/java/domainapp/webapp/AppManifest.java +++ b/webapp/src/main/java/domainapp/webapp/AppManifest.java @@@ -22,9 -24,12 +24,12 @@@ import domainapp.webapp.quartz.QuartzMo @Configuration @Import({ + IsisModuleApplibMixins.class, + IsisModuleApplibChangeAndExecutionLoggers.class, + IsisModuleCoreRuntimeServices.class, IsisModuleSecurityShiro.class, - IsisModulePersistenceJpaEclipselink.class, + IsisModulePersistenceJdoDatanucleus.class, IsisModuleViewerRestfulObjectsJaxrsResteasy4.class, IsisModuleViewerWicketViewer.class,
