[causeway-app-simpleapp] branch jdo-SNAPSHOT updated (7b790d9 -> 123efeb)

[da...@apache.org]

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

danhaywood pushed a change to branch jdo-SNAPSHOT
in repository https://gitbox.apache.org/repos/asf/causeway-app-simpleapp.git


    from 7b790d9  CAUSEWAY-3354: Rename XML namespace identifiers in antora/supplemental-ui/applib/layout XSD files
     add 63163ea  updates pdf module reference
     new 123efeb  Merge branch 'jpa-SNAPSHOT' into jdo-SNAPSHOT

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../src/main/java/domainapp/modules/simple/SimpleModule.java          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

[causeway-app-simpleapp] 01/01: Merge branch 'jpa-SNAPSHOT' into jdo-SNAPSHOT

[da...@apache.org]

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/causeway-app-simpleapp.git

commit 123efeb967305c3d664d6f6bf0667ba0e3d15472
Merge: 7b790d9 63163ea
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sun Mar 5 13:28:50 2023 +0000

    Merge branch 'jpa-SNAPSHOT' into jdo-SNAPSHOT

 .../src/main/java/domainapp/modules/simple/SimpleModule.java          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --cc module-simple/src/main/java/domainapp/modules/simple/SimpleModule.java
index 2355484,49aaf5b..733031d
--- a/module-simple/src/main/java/domainapp/modules/simple/SimpleModule.java
+++ b/module-simple/src/main/java/domainapp/modules/simple/SimpleModule.java
@@@ -3,10 -3,12 +3,10 @@@ package domainapp.modules.simple
  import org.springframework.context.annotation.ComponentScan;
  import org.springframework.context.annotation.Configuration;
  import org.springframework.context.annotation.Import;
 -import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
  
  import org.apache.causeway.extensions.fullcalendar.applib.CausewayModuleExtFullCalendarApplib;
- import org.apache.causeway.extensions.pdfjs.applib.CausewayModuleExtPdfjsApplibModel;
+ import org.apache.causeway.extensions.pdfjs.applib.CausewayModuleExtPdfjsApplib;
 -import org.apache.causeway.persistence.jpa.applib.CausewayModulePersistenceJpaApplib;
 +import org.apache.causeway.persistence.jdo.applib.CausewayModulePersistenceJdoApplib;
  import org.apache.causeway.testing.fakedata.applib.CausewayModuleTestingFakeDataApplib;
  import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScript;
  import org.apache.causeway.testing.fixtures.applib.modules.ModuleWithFixtures;
@@@ -16,12 -18,14 +16,12 @@@ import domainapp.modules.simple.dom.so.
  
  @Configuration
  @Import({
-         CausewayModuleExtPdfjsApplibModel.class,
+         CausewayModuleExtPdfjsApplib.class,
          CausewayModuleExtFullCalendarApplib.class,
          CausewayModuleTestingFakeDataApplib.class,
 -        CausewayModulePersistenceJpaApplib.class,
 +        CausewayModulePersistenceJdoApplib.class,
  })
  @ComponentScan
 -@EnableJpaRepositories
 -@EntityScan(basePackageClasses = {SimpleModule.class})
  public class SimpleModule implements ModuleWithFixtures {
  
      public static final String NAMESPACE = "simple";