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-simpleapp.git

commit b8c9cabd70babfe9c0596089b30c9cde88c22f5c
Merge: 2efc937 42e910a
Author: Andi Huber <[email protected]>
AuthorDate: Thu May 11 12:55:20 2023 +0200

    merge from jpa-Snapshot

 webapp/pom.xml                                         | 2 +-
 webapp/src/main/java/domainapp/webapp/AppManifest.java | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --cc webapp/src/main/java/domainapp/webapp/AppManifest.java
index ecb117c,f05db3c..7c6153a
--- a/webapp/src/main/java/domainapp/webapp/AppManifest.java
+++ b/webapp/src/main/java/domainapp/webapp/AppManifest.java
@@@ -16,12 -16,11 +16,12 @@@ import org.apache.causeway.extensions.e
  import org.apache.causeway.extensions.flyway.impl.CausewayModuleExtFlywayImpl;
  import 
org.apache.causeway.extensions.fullcalendar.wkt.ui.viewer.CausewayModuleExtFullCalendarWicketUi;
  import 
org.apache.causeway.extensions.pdfjs.wkt.ui.CausewayModuleExtPdfjsWicketUi;
- import 
org.apache.causeway.extensions.secman.encryption.jbcrypt.CausewayModuleExtSecmanEncryptionJbcrypt;
+ import 
org.apache.causeway.extensions.secman.encryption.spring.CausewayModuleExtSecmanEncryptionSpring;
 -import 
org.apache.causeway.extensions.secman.jpa.CausewayModuleExtSecmanPersistenceJpa;
 -import 
org.apache.causeway.extensions.sessionlog.jpa.CausewayModuleExtSessionLogPersistenceJpa;
 +import 
org.apache.causeway.extensions.secman.jdo.CausewayModuleExtSecmanPersistenceJdo;
 +import 
org.apache.causeway.extensions.sessionlog.jdo.CausewayModuleExtSessionLogPersistenceJdo;
  import 
org.apache.causeway.extensions.viewer.wicket.exceldownload.ui.CausewayModuleExtExcelDownloadWicketUi;
 -import 
org.apache.causeway.persistence.jpa.eclipselink.CausewayModulePersistenceJpaEclipselink;
 +import 
org.apache.causeway.persistence.jdo.datanucleus.CausewayModulePersistenceJdoDatanucleus;
 +import 
org.apache.causeway.persistence.jdo.datanucleus.CausewayModulePersistenceJdoDatanucleusMixins;
  import 
org.apache.causeway.testing.fixtures.applib.CausewayModuleTestingFixturesApplib;
  import 
org.apache.causeway.testing.h2console.ui.CausewayModuleTestingH2ConsoleUi;
  import 
org.apache.causeway.valuetypes.asciidoc.metamodel.CausewayModuleValAsciidocMetaModel;
@@@ -53,13 -50,13 +53,13 @@@ import domainapp.webapp.quartz.QuartzMo
  
          CausewayModuleExtFlywayImpl.class,
  
 -        CausewayModuleExtSecmanPersistenceJpa.class,
 +        CausewayModuleExtSecmanPersistenceJdo.class,
-         CausewayModuleExtSecmanEncryptionJbcrypt.class,
+         CausewayModuleExtSecmanEncryptionSpring.class,
 -        CausewayModuleExtSessionLogPersistenceJpa.class,
 -        CausewayModuleExtAuditTrailPersistenceJpa.class,
 -        CausewayModuleExtCommandLogPersistenceJpa.class,
 -        CausewayModuleExtExecutionLogPersistenceJpa.class,
 -        CausewayModuleExtExecutionOutboxPersistenceJpa.class,
 +        CausewayModuleExtSessionLogPersistenceJdo.class,
 +        CausewayModuleExtAuditTrailPersistenceJdo.class,
 +        CausewayModuleExtCommandLogPersistenceJdo.class,
 +        CausewayModuleExtExecutionLogPersistenceJdo.class,
 +        CausewayModuleExtExecutionOutboxPersistenceJdo.class,
  
          CausewayModuleExtExcelDownloadWicketUi.class,
          CausewayModuleExtFullCalendarWicketUi.class,

Reply via email to