This is an automated email from the ASF dual-hosted git repository.

ahuber pushed a commit to branch jdo-SNAPSHOT
in repository https://gitbox.apache.org/repos/asf/causeway-app-helloworld.git

commit 18f3c0f39ce6fc052bbb38b21633da5c64562a43
Merge: 8892c16 0bb6726
Author: Andi Huber <[email protected]>
AuthorDate: Thu Mar 21 13:01:05 2024 +0100

    merge from jpa-SNAPSHOT

 pom.xml                                         |  2 +-
 src/main/java/domainapp/webapp/AppManifest.java | 41 ++++++++++++++++++++-
 src/main/resources/shiro.ini                    | 49 -------------------------
 3 files changed, 40 insertions(+), 52 deletions(-)

diff --cc src/main/java/domainapp/webapp/AppManifest.java
index 9a8c475,3d274c7..1da9d8d
--- a/src/main/java/domainapp/webapp/AppManifest.java
+++ b/src/main/java/domainapp/webapp/AppManifest.java
@@@ -9,8 -13,10 +13,10 @@@ import org.apache.causeway.applib.Cause
  import org.apache.causeway.applib.CausewayModuleApplibMixins;
  import org.apache.causeway.core.config.presets.CausewayPresets;
  import 
org.apache.causeway.core.runtimeservices.CausewayModuleCoreRuntimeServices;
 -import 
org.apache.causeway.persistence.jpa.eclipselink.CausewayModulePersistenceJpaEclipselink;
 +import 
org.apache.causeway.persistence.jdo.datanucleus.CausewayModulePersistenceJdoDatanucleus;
- import org.apache.causeway.security.shiro.CausewayModuleSecurityShiro;
+ import org.apache.causeway.security.simple.CausewayModuleSecuritySimple;
+ import org.apache.causeway.security.simple.realm.SimpleRealm;
+ import org.apache.causeway.security.simple.realm.SimpleRealm.Grant;
  import 
org.apache.causeway.testing.h2console.ui.CausewayModuleTestingH2ConsoleUi;
  import 
org.apache.causeway.viewer.restfulobjects.jaxrsresteasy.CausewayModuleViewerRestfulObjectsJaxrsResteasy;
  import 
org.apache.causeway.viewer.wicket.applib.CausewayModuleViewerWicketApplibMixins;
@@@ -24,8 -30,8 +30,8 @@@ import domainapp.modules.hello.HelloWor
          CausewayModuleApplibChangeAndExecutionLoggers.class,
  
          CausewayModuleCoreRuntimeServices.class,
-         CausewayModuleSecurityShiro.class,
+         CausewayModuleSecuritySimple.class,
 -        CausewayModulePersistenceJpaEclipselink.class,
 +        CausewayModulePersistenceJdoDatanucleus.class,
          CausewayModuleViewerRestfulObjectsJaxrsResteasy.class,
          CausewayModuleViewerWicketApplibMixins.class,
          CausewayModuleViewerWicketViewer.class,

Reply via email to