You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@causeway.apache.org by ah...@apache.org on 2023/03/20 08:38:27 UTC
[causeway-app-simpleapp] 01/01: Merge remote-tracking branch 'origin/jpa-SNAPSHOT' into jdo-SNAPSHOT

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 8d31c9c78b1d4e68b311c8b0a76c4b640d1fd982
Merge: 8e879f8 df91852
Author: Andi Huber <ah...@apache.org>
AuthorDate: Mon Mar 20 09:38:15 2023 +0100

    Merge remote-tracking branch 'origin/jpa-SNAPSHOT' into jdo-SNAPSHOT

 webapp/src/main/java/domainapp/webapp/AppManifest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --cc webapp/src/main/java/domainapp/webapp/AppManifest.java
index 2ab24dc,7ee41b8..ecb117c
--- a/webapp/src/main/java/domainapp/webapp/AppManifest.java
+++ b/webapp/src/main/java/domainapp/webapp/AppManifest.java
@@@ -9,19 -9,18 +9,19 @@@ 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.extensions.audittrail.jpa.CausewayModuleExtAuditTrailPersistenceJpa;
 -import org.apache.causeway.extensions.commandlog.jpa.CausewayModuleExtCommandLogPersistenceJpa;
 -import org.apache.causeway.extensions.executionlog.jpa.CausewayModuleExtExecutionLogPersistenceJpa;
 -import org.apache.causeway.extensions.executionoutbox.jpa.CausewayModuleExtExecutionOutboxPersistenceJpa;
 +import org.apache.causeway.extensions.audittrail.jdo.CausewayModuleExtAuditTrailPersistenceJdo;
 +import org.apache.causeway.extensions.commandlog.jdo.CausewayModuleExtCommandLogPersistenceJdo;
 +import org.apache.causeway.extensions.executionlog.jdo.CausewayModuleExtExecutionLogPersistenceJdo;
 +import org.apache.causeway.extensions.executionoutbox.jdo.CausewayModuleExtExecutionOutboxPersistenceJdo;
  import org.apache.causeway.extensions.flyway.impl.CausewayModuleExtFlywayImpl;
- import org.apache.causeway.extensions.fullcalendar.wkt.viewer.CausewayModuleExtFullCalendarWicketUi;
+ 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.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;