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 39c7788efb356f23acced33945e0fdbaede652d5 Merge: 3edbb35 6160057 Author: Dan Haywood <[email protected]> AuthorDate: Sun Aug 28 13:48:03 2022 +0100 Merge branch 'jpa-SNAPSHOT' into jdo-SNAPSHOT # Conflicts: # webapp/pom.xml # webapp/src/main/java/domainapp/webapp/AppManifest.java README.adoc | 22 ++++++-- webapp/pom.xml | 14 +++-- .../main/java/domainapp/webapp/AppManifest.java | 6 ++- .../application/seed/CustomRolesAndUsers.java | 61 ++++++++++++++++++++++ .../application/seed/SeedSecurityService.java | 38 ++++++++++++++ webapp/src/main/resources/application.yml | 14 +++++ .../main/resources/config/application.properties | 3 +- webapp/src/main/resources/menubars.layout.xml | 28 +++++++++- 8 files changed, 173 insertions(+), 13 deletions(-) diff --cc webapp/pom.xml index 4171a01,40f59b1..2a41336 --- a/webapp/pom.xml +++ b/webapp/pom.xml @@@ -68,14 -71,9 +68,9 @@@ <type>pom</type> </dependency> - <dependency> - <groupId>org.apache.isis.security</groupId> - <artifactId>isis-security-shiro</artifactId> - </dependency> - <dependency> <groupId>org.apache.isis.persistence</groupId> - <artifactId>isis-persistence-jpa-eclipselink</artifactId> + <artifactId>isis-persistence-jdo-datanucleus</artifactId> </dependency> <dependency> @@@ -102,9 -100,18 +97,18 @@@ <artifactId>isis-valuetypes-asciidoc-ui-wkt</artifactId> </dependency> + <dependency> + <groupId>org.apache.isis.extensions</groupId> + <artifactId>isis-extensions-secman-encryption-jbcrypt</artifactId> <!--.--> + </dependency> + <dependency> + <groupId>org.apache.isis.extensions</groupId> - <artifactId>isis-extensions-secman-persistence-jpa</artifactId> ++ <artifactId>isis-extensions-secman-persistence-jdo</artifactId> + </dependency> + <dependency> <groupId>org.apache.isis.extensions</groupId> - <artifactId>isis-extensions-sessionlog-persistence-jpa</artifactId> + <artifactId>isis-extensions-sessionlog-persistence-jdo</artifactId> </dependency> <dependency> diff --cc webapp/src/main/java/domainapp/webapp/AppManifest.java index 8430570,440e6a6..a3e62aa --- a/webapp/src/main/java/domainapp/webapp/AppManifest.java +++ b/webapp/src/main/java/domainapp/webapp/AppManifest.java @@@ -9,15 -9,15 +9,16 @@@ import org.apache.isis.applib.IsisModul import org.apache.isis.applib.IsisModuleApplibMixins; import org.apache.isis.core.config.presets.IsisPresets; import org.apache.isis.core.runtimeservices.IsisModuleCoreRuntimeServices; -import org.apache.isis.extensions.audittrail.jpa.IsisModuleExtAuditTrailPersistenceJpa; -import org.apache.isis.extensions.commandlog.jpa.IsisModuleExtCommandLogPersistenceJpa; -import org.apache.isis.extensions.executionlog.jpa.IsisModuleExtExecutionLogPersistenceJpa; -import org.apache.isis.extensions.executionoutbox.jpa.IsisModuleExtExecutionOutboxPersistenceJpa; +import org.apache.isis.extensions.audittrail.jdo.IsisModuleExtAuditTrailPersistenceJdo; +import org.apache.isis.extensions.commandlog.jdo.IsisModuleExtCommandLogPersistenceJdo; +import org.apache.isis.extensions.executionlog.jdo.IsisModuleExtExecutionLogPersistenceJdo; +import org.apache.isis.extensions.executionoutbox.jdo.IsisModuleExtExecutionOutboxPersistenceJdo; import org.apache.isis.extensions.flyway.impl.IsisModuleExtFlywayImpl; + import org.apache.isis.extensions.secman.encryption.jbcrypt.IsisModuleExtSecmanEncryptionJbcrypt; -import org.apache.isis.extensions.secman.jpa.IsisModuleExtSecmanPersistenceJpa; -import org.apache.isis.extensions.sessionlog.jpa.IsisModuleExtSessionLogPersistenceJpa; -import org.apache.isis.persistence.jpa.eclipselink.IsisModulePersistenceJpaEclipselink; ++import org.apache.isis.extensions.secman.jdo.IsisModuleExtSecmanPersistenceJdo; +import org.apache.isis.extensions.sessionlog.jdo.IsisModuleExtSessionLogPersistenceJdo; +import org.apache.isis.persistence.jdo.datanucleus.IsisModulePersistenceJdoDatanucleus; +import org.apache.isis.persistence.jdo.datanucleus.IsisModulePersistenceJdoDatanucleusMixins; - import org.apache.isis.security.shiro.IsisModuleSecurityShiro; import org.apache.isis.testing.fixtures.applib.IsisModuleTestingFixturesApplib; import org.apache.isis.testing.h2console.ui.IsisModuleTestingH2ConsoleUi; import org.apache.isis.valuetypes.asciidoc.metamodel.IsisModuleValAsciidocMetaModel; @@@ -37,9 -37,7 +38,8 @@@ import domainapp.webapp.quartz.QuartzMo IsisModuleApplibChangeAndExecutionLoggers.class, IsisModuleCoreRuntimeServices.class, - IsisModuleSecurityShiro.class, - IsisModulePersistenceJpaEclipselink.class, + IsisModulePersistenceJdoDatanucleus.class, + IsisModulePersistenceJdoDatanucleusMixins.class, IsisModuleViewerRestfulObjectsJaxrsResteasy4.class, IsisModuleViewerWicketApplibMixins.class, IsisModuleViewerWicketViewer.class, @@@ -49,11 -47,13 +49,13 @@@ IsisModuleExtFlywayImpl.class, - IsisModuleExtSecmanPersistenceJpa.class, ++ IsisModuleExtSecmanPersistenceJdo.class, + IsisModuleExtSecmanEncryptionJbcrypt.class, - IsisModuleExtSessionLogPersistenceJpa.class, - IsisModuleExtAuditTrailPersistenceJpa.class, - IsisModuleExtCommandLogPersistenceJpa.class, - IsisModuleExtExecutionLogPersistenceJpa.class, - IsisModuleExtExecutionOutboxPersistenceJpa.class, + IsisModuleExtSessionLogPersistenceJdo.class, + IsisModuleExtAuditTrailPersistenceJdo.class, + IsisModuleExtCommandLogPersistenceJdo.class, + IsisModuleExtExecutionLogPersistenceJdo.class, + IsisModuleExtExecutionOutboxPersistenceJdo.class, IsisModuleValAsciidocMetaModel.class, // for pretty rendering of DTO objects such as CommandDto, InteractionDto IsisModuleValAsciidocUiWkt.class,
