You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2021/09/29 06:25:40 UTC

[isis-app-demo] branch main updated (0026087 -> 77982d5)

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

danhaywood pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/isis-app-demo.git.


    from 0026087  copies 2.0.0-M6 version of simpleapp
     new b05c988  renames groupId and artifactI
     new e9c5308  renames module-simple dir to module-pets-dir, same for tests
     new 2e486d8  renames name
     new 42671ef  renames SimpleObject to PetOwner
     new d84e75f  renames SimpleObject related files
     new 0a0f465  changes PetOwner schema to 'pets'
     new 24e9a09  changes config files for schema change
     new 94a1765  changes PetOwner uniqueness constraint
     new fea5b50  changes PetOwner logicalTypeName
     new 0bfe937  renames SimpleObjects to PetOwners
     new 854cde9  changes PetOwners logicalTypeName
     new 990fa3d  renames SimpleObjectRepository to PetOwnerRepository
     new 1cbb684  renames SimpleObject_persona to PetOwner_persona
     new fdbb6ab  renames SimpleObjectBuilder to PetOwnerBuilder
     new 684ac60  renames SimpleModule to PetsModule
     new 44fe078  renames SimpleApp main class to PetClinicApp
     new 5d3fb15  renames SimpleModuleIntegTestAbstract to PetsModuleIntegTestAbstract
     new 5db6726  renames packages in pets module and pets-tests module
     new 1e5f464  renames packages in webapp module
     new 7485f54  renames packages in webapp-tests module
     new abbd61d  renames DomainAppDemo fixture to PetClinicDemo
     new a402d8b  saves IntelliJ run configuration for PetClinicApp
     new 77982d5  updates and slims down the README

The 23 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:
 .run/PetClinicApp.run.xml                          |  11 ++
 README.adoc                                        | 213 +--------------------
 {module-simple => module-pets-tests}/.gitignore    |   0
 .../log4j2-test.xml                                |   0
 {module-simple-tests => module-pets-tests}/pom.xml |  10 +-
 .../modules/pets/dom/petowner/PetOwner_Test.java   |  12 +-
 .../modules/pets/dom/petowner/PetOwners_Test.java  |  26 +--
 .../integtests/PetsModuleIntegTestAbstract.java    |  10 +-
 .../pets/integtests/tests/PetOwner_IntegTest.java  |  30 +--
 .../pets/integtests/tests/PetOwners_IntegTest.java |  30 +--
 .../src/test/resources/application-test.yml        |   4 +
 {module-simple-tests => module-pets}/.gitignore    |   0
 {module-simple => module-pets}/pom.xml             |   8 +-
 .../java/petclinic/modules/pets/PetsModule.java    |  10 +-
 .../dom/petowner/PetOwner#others.columnOrder.txt   |   0
 .../pets/dom/petowner/PetOwner.columnOrder.txt     |   0
 .../modules/pets/dom/petowner/PetOwner.java        |  32 ++--
 .../modules/pets/dom/petowner/PetOwner.layout.xml  |   0
 .../modules/pets/dom/petowner/PetOwner.png         | Bin
 .../pets/dom/petowner/PetOwnerRepository.java      |  15 ++
 .../modules/pets/dom/petowner/PetOwners.java       |  38 ++--
 .../modules/pets/fixture/PetOwnerBuilder.java      |  32 ++++
 .../modules/pets/fixture/PetOwner_persona.java     |  48 +++++
 .../java/petclinic/modules/pets}/types/Name.java   |   2 +-
 .../java/petclinic/modules/pets}/types/Notes.java  |   2 +-
 .../src/test/resources/application-test.yml        |   4 -
 .../simple/dom/so/SimpleObjectRepository.java      |  13 --
 .../simple/fixture/SimpleObjectBuilder.java        |  31 ---
 .../simple/fixture/SimpleObject_persona.java       |  47 -----
 pom.xml                                            |  18 +-
 webapp-tests/pom.xml                               |  10 +-
 .../webapp/integtests/WebAppIntegTestAbstract.java |  10 +-
 .../metamodel/SwaggerExport_IntegTest.java         |   4 +-
 .../metamodel/ValidateDomainModel_IntegTest.java   |   4 +-
 .../webapp/integtests/smoke/Smoke_IntegTest.java   |  16 +-
 .../src/test/resources/application-test.yml        |   2 +-
 webapp/pom.xml                                     |  12 +-
 .../webapp/AppManifest.java                        |  12 +-
 .../webapp/PetClinicApp.java}                      |   6 +-
 .../webapp/application/ApplicationModule.java      |   6 +-
 .../fixture/scenarios/PetClinicDemo.java}          |   8 +-
 .../services/health/HealthCheckServiceImpl.java    |  12 +-
 .../services/homepage/HomePageViewModel.java       |  12 +-
 .../services/homepage/HomePageViewModel.layout.xml |   0
 .../services/homepage/HomePageViewModel.png        | Bin
 .../webapp/custom/CustomModule.java                |   2 +-
 .../webapp/custom/restapi/CustomController.java    |  14 +-
 .../webapp/quartz/QuartzModule.java                |   4 +-
 .../webapp/quartz/job/SampleJob.java               |  16 +-
 webapp/src/main/resources/application.yml          |   6 +-
 .../config/application-SQLSERVER.properties        |  10 +-
 .../main/resources/config/application.properties   |   4 +-
 52 files changed, 315 insertions(+), 501 deletions(-)
 create mode 100644 .run/PetClinicApp.run.xml
 rename {module-simple => module-pets-tests}/.gitignore (100%)
 rename {module-simple-tests => module-pets-tests}/log4j2-test.xml (100%)
 rename {module-simple-tests => module-pets-tests}/pom.xml (86%)
 rename module-simple-tests/src/test/java/domainapp/modules/simple/dom/so/SimpleObject_Test.java => module-pets-tests/src/test/java/petclinic/modules/pets/dom/petowner/PetOwner_Test.java (90%)
 rename module-simple-tests/src/test/java/domainapp/modules/simple/dom/so/SimpleObjects_Test.java => module-pets-tests/src/test/java/petclinic/modules/pets/dom/petowner/PetOwners_Test.java (64%)
 rename module-simple-tests/src/test/java/domainapp/modules/simple/integtests/SimpleModuleIntegTestAbstract.java => module-pets-tests/src/test/java/petclinic/modules/pets/integtests/PetsModuleIntegTestAbstract.java (84%)
 rename module-simple-tests/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObject_IntegTest.java => module-pets-tests/src/test/java/petclinic/modules/pets/integtests/tests/PetOwner_IntegTest.java (58%)
 rename module-simple-tests/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObjects_IntegTest.java => module-pets-tests/src/test/java/petclinic/modules/pets/integtests/tests/PetOwners_IntegTest.java (62%)
 create mode 100644 module-pets-tests/src/test/resources/application-test.yml
 rename {module-simple-tests => module-pets}/.gitignore (100%)
 rename {module-simple => module-pets}/pom.xml (89%)
 rename module-simple/src/main/java/domainapp/modules/simple/SimpleModule.java => module-pets/src/main/java/petclinic/modules/pets/PetsModule.java (72%)
 rename module-simple/src/main/java/domainapp/modules/simple/dom/so/SimpleObject#others.columnOrder.txt => module-pets/src/main/java/petclinic/modules/pets/dom/petowner/PetOwner#others.columnOrder.txt (100%)
 rename module-simple/src/main/java/domainapp/modules/simple/dom/so/SimpleObject.columnOrder.txt => module-pets/src/main/java/petclinic/modules/pets/dom/petowner/PetOwner.columnOrder.txt (100%)
 rename module-simple/src/main/java/domainapp/modules/simple/dom/so/SimpleObject.java => module-pets/src/main/java/petclinic/modules/pets/dom/petowner/PetOwner.java (81%)
 rename module-simple/src/main/java/domainapp/modules/simple/dom/so/SimpleObject.layout.xml => module-pets/src/main/java/petclinic/modules/pets/dom/petowner/PetOwner.layout.xml (100%)
 rename module-simple/src/main/java/domainapp/modules/simple/dom/so/SimpleObject.png => module-pets/src/main/java/petclinic/modules/pets/dom/petowner/PetOwner.png (100%)
 create mode 100644 module-pets/src/main/java/petclinic/modules/pets/dom/petowner/PetOwnerRepository.java
 rename module-simple/src/main/java/domainapp/modules/simple/dom/so/SimpleObjects.java => module-pets/src/main/java/petclinic/modules/pets/dom/petowner/PetOwners.java (65%)
 create mode 100644 module-pets/src/main/java/petclinic/modules/pets/fixture/PetOwnerBuilder.java
 create mode 100644 module-pets/src/main/java/petclinic/modules/pets/fixture/PetOwner_persona.java
 rename {module-simple/src/main/java/domainapp/modules/simple => module-pets/src/main/java/petclinic/modules/pets}/types/Name.java (93%)
 rename {module-simple/src/main/java/domainapp/modules/simple => module-pets/src/main/java/petclinic/modules/pets}/types/Notes.java (95%)
 delete mode 100644 module-simple-tests/src/test/resources/application-test.yml
 delete mode 100644 module-simple/src/main/java/domainapp/modules/simple/dom/so/SimpleObjectRepository.java
 delete mode 100644 module-simple/src/main/java/domainapp/modules/simple/fixture/SimpleObjectBuilder.java
 delete mode 100644 module-simple/src/main/java/domainapp/modules/simple/fixture/SimpleObject_persona.java
 rename webapp-tests/src/test/java/{domainapp => petclinic}/webapp/integtests/WebAppIntegTestAbstract.java (89%)
 rename webapp-tests/src/test/java/{domainapp => petclinic}/webapp/integtests/metamodel/SwaggerExport_IntegTest.java (90%)
 rename webapp-tests/src/test/java/{domainapp => petclinic}/webapp/integtests/metamodel/ValidateDomainModel_IntegTest.java (80%)
 rename webapp-tests/src/test/java/{domainapp => petclinic}/webapp/integtests/smoke/Smoke_IntegTest.java (82%)
 rename webapp/src/main/java/{domainapp => petclinic}/webapp/AppManifest.java (85%)
 rename webapp/src/main/java/{domainapp/webapp/SimpleApp.java => petclinic/webapp/PetClinicApp.java} (80%)
 rename webapp/src/main/java/{domainapp => petclinic}/webapp/application/ApplicationModule.java (68%)
 rename webapp/src/main/java/{domainapp/webapp/application/fixture/scenarios/DomainAppDemo.java => petclinic/webapp/application/fixture/scenarios/PetClinicDemo.java} (63%)
 rename webapp/src/main/java/{domainapp => petclinic}/webapp/application/services/health/HealthCheckServiceImpl.java (64%)
 rename webapp/src/main/java/{domainapp => petclinic}/webapp/application/services/homepage/HomePageViewModel.java (65%)
 rename webapp/src/main/java/{domainapp => petclinic}/webapp/application/services/homepage/HomePageViewModel.layout.xml (100%)
 rename webapp/src/main/java/{domainapp => petclinic}/webapp/application/services/homepage/HomePageViewModel.png (100%)
 rename webapp/src/main/java/{domainapp => petclinic}/webapp/custom/CustomModule.java (84%)
 rename webapp/src/main/java/{domainapp => petclinic}/webapp/custom/restapi/CustomController.java (78%)
 rename webapp/src/main/java/{domainapp => petclinic}/webapp/quartz/QuartzModule.java (94%)
 rename webapp/src/main/java/{domainapp => petclinic}/webapp/quartz/job/SampleJob.java (79%)

[isis-app-demo] 16/23: renames SimpleApp main class to PetClinicApp

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/isis-app-demo.git

commit 44fe0786fed3ea20efda7acc2552b8f83ae0c978
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Sep 29 07:05:51 2021 +0100

    renames SimpleApp main class to PetClinicApp
---
 webapp/pom.xml                                                        | 2 +-
 .../main/java/domainapp/webapp/{SimpleApp.java => PetClinicApp.java}  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/webapp/pom.xml b/webapp/pom.xml
index 9fb4635..c0f8032 100644
--- a/webapp/pom.xml
+++ b/webapp/pom.xml
@@ -171,7 +171,7 @@
                                 <jvmFlags>
                                     <jvmFlag>-Xmx512m</jvmFlag>
                                 </jvmFlags>
-                                <mainClass>domainapp.webapp.SimpleApp</mainClass>
+                                <mainClass>domainapp.webapp.PetClinicApp</mainClass>
                                 <ports>
                                     <port>8080</port>
                                 </ports>
diff --git a/webapp/src/main/java/domainapp/webapp/SimpleApp.java b/webapp/src/main/java/domainapp/webapp/PetClinicApp.java
similarity index 83%
rename from webapp/src/main/java/domainapp/webapp/SimpleApp.java
rename to webapp/src/main/java/domainapp/webapp/PetClinicApp.java
index 7dedb13..edb9667 100644
--- a/webapp/src/main/java/domainapp/webapp/SimpleApp.java
+++ b/webapp/src/main/java/domainapp/webapp/PetClinicApp.java
@@ -12,7 +12,7 @@ import org.apache.isis.core.config.presets.IsisPresets;
     AppManifest.class
 //    , XrayEnable.class
 })
-public class SimpleApp extends SpringBootServletInitializer {
+public class PetClinicApp extends SpringBootServletInitializer {
 
     /**
      * @implNote this is to support the <em>Spring Boot Maven Plugin</em>, which auto-detects an
@@ -20,7 +20,7 @@ public class SimpleApp extends SpringBootServletInitializer {
      */
     public static void main(String[] args) {
         IsisPresets.prototyping();
-        SpringApplication.run(new Class[] { SimpleApp.class }, args);
+        SpringApplication.run(new Class[] { PetClinicApp.class }, args);
     }
 
 }

[isis-app-demo] 15/23: renames SimpleModule to PetsModule

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/isis-app-demo.git

commit 684ac6031bc740e6ad352a471e298641f4baf49f
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Sep 29 07:04:34 2021 +0100

    renames SimpleModule to PetsModule
---
 .../modules/simple/integtests/SimpleModuleIntegTestAbstract.java      | 4 ++--
 .../domainapp/modules/simple/{SimpleModule.java => PetsModule.java}   | 4 ++--
 .../java/domainapp/webapp/integtests/WebAppIntegTestAbstract.java     | 4 ++--
 .../src/main/java/domainapp/webapp/application/ApplicationModule.java | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/module-pets-tests/src/test/java/domainapp/modules/simple/integtests/SimpleModuleIntegTestAbstract.java b/module-pets-tests/src/test/java/domainapp/modules/simple/integtests/SimpleModuleIntegTestAbstract.java
index a2b6476..4868b0f 100644
--- a/module-pets-tests/src/test/java/domainapp/modules/simple/integtests/SimpleModuleIntegTestAbstract.java
+++ b/module-pets-tests/src/test/java/domainapp/modules/simple/integtests/SimpleModuleIntegTestAbstract.java
@@ -15,7 +15,7 @@ import org.apache.isis.security.bypass.IsisModuleSecurityBypass;
 import org.apache.isis.testing.fixtures.applib.IsisIntegrationTestAbstractWithFixtures;
 import org.apache.isis.testing.fixtures.applib.IsisModuleTestingFixturesApplib;
 
-import domainapp.modules.simple.SimpleModule;
+import domainapp.modules.simple.PetsModule;
 
 
 @SpringBootTest(
@@ -37,7 +37,7 @@ public abstract class SimpleModuleIntegTestAbstract extends IsisIntegrationTestA
             IsisModulePersistenceJpaEclipselink.class,
             IsisModuleTestingFixturesApplib.class,
 
-            SimpleModule.class
+            PetsModule.class
     })
     @PropertySources({
             @PropertySource(IsisPresets.H2InMemory_withUniqueSchema),
diff --git a/module-pets/src/main/java/domainapp/modules/simple/SimpleModule.java b/module-pets/src/main/java/domainapp/modules/simple/PetsModule.java
similarity index 88%
rename from module-pets/src/main/java/domainapp/modules/simple/SimpleModule.java
rename to module-pets/src/main/java/domainapp/modules/simple/PetsModule.java
index 20f66be..a09d06d 100644
--- a/module-pets/src/main/java/domainapp/modules/simple/SimpleModule.java
+++ b/module-pets/src/main/java/domainapp/modules/simple/PetsModule.java
@@ -13,8 +13,8 @@ import domainapp.modules.simple.dom.so.PetOwner;
 @Configuration
 @ComponentScan
 @EnableJpaRepositories
-@EntityScan(basePackageClasses = {SimpleModule.class})
-public class SimpleModule implements ModuleWithFixtures {
+@EntityScan(basePackageClasses = {PetsModule.class})
+public class PetsModule implements ModuleWithFixtures {
 
     @Override
     public FixtureScript getTeardownFixture() {
diff --git a/webapp-tests/src/test/java/domainapp/webapp/integtests/WebAppIntegTestAbstract.java b/webapp-tests/src/test/java/domainapp/webapp/integtests/WebAppIntegTestAbstract.java
index 5859b65..4057e7e 100644
--- a/webapp-tests/src/test/java/domainapp/webapp/integtests/WebAppIntegTestAbstract.java
+++ b/webapp-tests/src/test/java/domainapp/webapp/integtests/WebAppIntegTestAbstract.java
@@ -16,7 +16,7 @@ import org.apache.isis.security.bypass.IsisModuleSecurityBypass;
 import org.apache.isis.testing.fixtures.applib.IsisModuleTestingFixturesApplib;
 import org.apache.isis.testing.integtestsupport.applib.IsisIntegrationTestAbstract;
 
-import domainapp.modules.simple.SimpleModule;
+import domainapp.modules.simple.PetsModule;
 import domainapp.webapp.application.ApplicationModule;
 
 @SpringBootTest(
@@ -43,7 +43,7 @@ public abstract class WebAppIntegTestAbstract extends IsisIntegrationTestAbstrac
         IsisModulePersistenceJpaEclipselink.class,
         IsisModuleTestingFixturesApplib.class,
 
-        SimpleModule.class
+        PetsModule.class
     })
     @PropertySources({
         @PropertySource(IsisPresets.H2InMemory_withUniqueSchema),
diff --git a/webapp/src/main/java/domainapp/webapp/application/ApplicationModule.java b/webapp/src/main/java/domainapp/webapp/application/ApplicationModule.java
index 540c2e4..1e6bd4d 100644
--- a/webapp/src/main/java/domainapp/webapp/application/ApplicationModule.java
+++ b/webapp/src/main/java/domainapp/webapp/application/ApplicationModule.java
@@ -4,10 +4,10 @@ import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 
-import domainapp.modules.simple.SimpleModule;
+import domainapp.modules.simple.PetsModule;
 
 @Configuration
-@Import(SimpleModule.class)
+@Import(PetsModule.class)
 @ComponentScan
 public class ApplicationModule {

[isis-app-demo] 22/23: saves IntelliJ run configuration for PetClinicApp

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/isis-app-demo.git

commit a402d8b66ae5ca5fa9caabff33de6008b3cd59c0
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Sep 29 07:16:48 2021 +0100

    saves IntelliJ run configuration for PetClinicApp
---
 .run/PetClinicApp.run.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/.run/PetClinicApp.run.xml b/.run/PetClinicApp.run.xml
new file mode 100644
index 0000000..de4b457
--- /dev/null
+++ b/.run/PetClinicApp.run.xml
@@ -0,0 +1,11 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="PetClinicApp" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
+    <module name="petclinic-webapp" />
+    <option name="SPRING_BOOT_MAIN_CLASS" value="petclinic.webapp.PetClinicApp" />
+    <option name="ALTERNATIVE_JRE_PATH" />
+    <option name="SHORTEN_COMMAND_LINE" value="NONE" />
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>
\ No newline at end of file

[isis-app-demo] 03/23: renames name

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/isis-app-demo.git

commit 2e486d8957f1d4102faedee80d5fcd645febe46c
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Sep 29 06:35:15 2021 +0100

    renames name
---
 module-pets-tests/pom.xml | 2 +-
 module-pets/pom.xml       | 2 +-
 pom.xml                   | 2 +-
 webapp-tests/pom.xml      | 2 +-
 webapp/pom.xml            | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/module-pets-tests/pom.xml b/module-pets-tests/pom.xml
index 7b11bb5..e3d433c 100644
--- a/module-pets-tests/pom.xml
+++ b/module-pets-tests/pom.xml
@@ -11,7 +11,7 @@
     </parent>
 
     <artifactId>petclinic-module-pets-tests</artifactId>
-    <name>SimpleApp (JPA) - Simple Module (tests)</name>
+    <name>Petclinic - Pets Module (tests)</name>
 
     <description>
         Integ tests for 'simple module'
diff --git a/module-pets/pom.xml b/module-pets/pom.xml
index 3252d95..408875e 100644
--- a/module-pets/pom.xml
+++ b/module-pets/pom.xml
@@ -11,7 +11,7 @@
     </parent>
 
     <artifactId>petclinic-module-pets</artifactId>
-    <name>SimpleApp (JPA) - Simple Module</name>
+    <name>Petclinic - Pets Module</name>
 
     <build>
         <resources>
diff --git a/pom.xml b/pom.xml
index 80b271c..a169472 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
     <artifactId>petclinic</artifactId>
     <version>1.0.0-SNAPSHOT</version>
 
-    <name>SimpleApp (JPA) - Parent</name>
+    <name>Petclinic - Parent</name>
 
     <packaging>pom</packaging>
 
diff --git a/webapp-tests/pom.xml b/webapp-tests/pom.xml
index f8ae122..f8cdc1e 100644
--- a/webapp-tests/pom.xml
+++ b/webapp-tests/pom.xml
@@ -9,7 +9,7 @@
     </parent>
 
     <artifactId>petclinic-webapp-tests</artifactId>
-    <name>SimpleApp (JPA) - Webapp (tests)</name>
+    <name>Petclinic - Webapp (tests)</name>
 
     <description>
         Integ tests for entire app.
diff --git a/webapp/pom.xml b/webapp/pom.xml
index 4fb3117..9fb4635 100644
--- a/webapp/pom.xml
+++ b/webapp/pom.xml
@@ -9,7 +9,7 @@
     </parent>
 
     <artifactId>petclinic-webapp</artifactId>
-    <name>SimpleApp (JPA) - Webapp</name>
+    <name>Petclinic - Webapp</name>
 
     <description>
     	Assembles and runs both the Wicket viewer and the Restfulobjects viewer

[isis-app-demo] 05/23: renames SimpleObject related files

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/isis-app-demo.git

commit d84e75f3fe66c81984d6b66685f867a737f440ea
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Sep 29 06:49:22 2021 +0100

    renames SimpleObject related files
---
 ...hers.columnOrder.txt => PetOwner#others.columnOrder.txt} |   0
 ...impleObject.columnOrder.txt => PetOwner.columnOrder.txt} |   0
 .../dom/so/{SimpleObject.layout.xml => PetOwner.layout.xml} |   0
 .../simple/dom/so/{SimpleObject.png => PetOwner.png}        | Bin
 4 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/module-pets/src/main/java/domainapp/modules/simple/dom/so/SimpleObject#others.columnOrder.txt b/module-pets/src/main/java/domainapp/modules/simple/dom/so/PetOwner#others.columnOrder.txt
similarity index 100%
rename from module-pets/src/main/java/domainapp/modules/simple/dom/so/SimpleObject#others.columnOrder.txt
rename to module-pets/src/main/java/domainapp/modules/simple/dom/so/PetOwner#others.columnOrder.txt
diff --git a/module-pets/src/main/java/domainapp/modules/simple/dom/so/SimpleObject.columnOrder.txt b/module-pets/src/main/java/domainapp/modules/simple/dom/so/PetOwner.columnOrder.txt
similarity index 100%
rename from module-pets/src/main/java/domainapp/modules/simple/dom/so/SimpleObject.columnOrder.txt
rename to module-pets/src/main/java/domainapp/modules/simple/dom/so/PetOwner.columnOrder.txt
diff --git a/module-pets/src/main/java/domainapp/modules/simple/dom/so/SimpleObject.layout.xml b/module-pets/src/main/java/domainapp/modules/simple/dom/so/PetOwner.layout.xml
similarity index 100%
rename from module-pets/src/main/java/domainapp/modules/simple/dom/so/SimpleObject.layout.xml
rename to module-pets/src/main/java/domainapp/modules/simple/dom/so/PetOwner.layout.xml
diff --git a/module-pets/src/main/java/domainapp/modules/simple/dom/so/SimpleObject.png b/module-pets/src/main/java/domainapp/modules/simple/dom/so/PetOwner.png
similarity index 100%
rename from module-pets/src/main/java/domainapp/modules/simple/dom/so/SimpleObject.png
rename to module-pets/src/main/java/domainapp/modules/simple/dom/so/PetOwner.png

[isis-app-demo] 04/23: renames SimpleObject to PetOwner

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/isis-app-demo.git

commit 42671ef1186b36a18fde34d32f3a24e66854bd22
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Sep 29 06:40:02 2021 +0100

    renames SimpleObject to PetOwner
---
 README.adoc                                        |  2 +-
 .../{SimpleObject_Test.java => PetOwner_Test.java} |  8 ++++----
 .../modules/simple/dom/so/SimpleObjects_Test.java  | 10 ++++-----
 ...ject_IntegTest.java => PetOwner_IntegTest.java} | 24 +++++++++++-----------
 .../integtests/tests/SimpleObjects_IntegTest.java  |  8 ++++----
 .../domainapp/modules/simple/SimpleModule.java     |  4 ++--
 .../dom/so/{SimpleObject.java => PetOwner.java}    | 22 ++++++++++----------
 .../simple/dom/so/SimpleObjectRepository.java      |  6 +++---
 .../modules/simple/dom/so/SimpleObjects.java       | 22 ++++++++++----------
 .../simple/fixture/SimpleObjectBuilder.java        |  6 +++---
 .../simple/fixture/SimpleObject_persona.java       |  8 ++++----
 .../webapp/integtests/smoke/Smoke_IntegTest.java   |  8 ++++----
 .../services/homepage/HomePageViewModel.java       |  4 ++--
 .../webapp/custom/restapi/CustomController.java    |  6 +++---
 .../domainapp/webapp/quartz/job/SampleJob.java     |  8 ++++----
 15 files changed, 73 insertions(+), 73 deletions(-)

diff --git a/README.adoc b/README.adoc
index 47808f9..f17e6d0 100644
--- a/README.adoc
+++ b/README.adoc
@@ -83,7 +83,7 @@ The following table explains the contents of each of the directories:
 |Description
 
 |`module-simple`
-|Holds the "simple" module, consisting of the `SimpleObject` entity and supporting services.
+|Holds the "simple" module, consisting of the `PetOwner` entity and supporting services.
 It also contains module-specific unit- and integration tests.
 
 [TIP]
diff --git a/module-pets-tests/src/test/java/domainapp/modules/simple/dom/so/SimpleObject_Test.java b/module-pets-tests/src/test/java/domainapp/modules/simple/dom/so/PetOwner_Test.java
similarity index 94%
rename from module-pets-tests/src/test/java/domainapp/modules/simple/dom/so/SimpleObject_Test.java
rename to module-pets-tests/src/test/java/domainapp/modules/simple/dom/so/PetOwner_Test.java
index 922b077..efcec71 100644
--- a/module-pets-tests/src/test/java/domainapp/modules/simple/dom/so/SimpleObject_Test.java
+++ b/module-pets-tests/src/test/java/domainapp/modules/simple/dom/so/PetOwner_Test.java
@@ -16,17 +16,17 @@ import org.apache.isis.applib.services.repository.RepositoryService;
 import org.apache.isis.applib.services.title.TitleService;
 
 @ExtendWith(MockitoExtension.class)
-class SimpleObject_Test {
+class PetOwner_Test {
 
     @Mock TitleService mockTitleService;
     @Mock MessageService mockMessageService;
     @Mock RepositoryService mockRepositoryService;
 
-    SimpleObject object;
+    PetOwner object;
 
     @BeforeEach
     public void setUp() throws Exception {
-        object = SimpleObject.withName("Foo");
+        object = PetOwner.withName("Foo");
         object.titleService = mockTitleService;
         object.messageService = mockMessageService;
         object.repositoryService = mockRepositoryService;
@@ -68,4 +68,4 @@ class SimpleObject_Test {
             verify(mockRepositoryService).removeAndFlush(object);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/module-pets-tests/src/test/java/domainapp/modules/simple/dom/so/SimpleObjects_Test.java b/module-pets-tests/src/test/java/domainapp/modules/simple/dom/so/SimpleObjects_Test.java
index 88eaeb0..3807963 100644
--- a/module-pets-tests/src/test/java/domainapp/modules/simple/dom/so/SimpleObjects_Test.java
+++ b/module-pets-tests/src/test/java/domainapp/modules/simple/dom/so/SimpleObjects_Test.java
@@ -45,11 +45,11 @@ class SimpleObjects_Test {
 
             // expect
             when(mockRepositoryService.persist(
-                    argThat((ArgumentMatcher<SimpleObject>) simpleObject -> Objects.equals(simpleObject.getName(), someName)))
-            ).then((Answer<SimpleObject>) invocation -> invocation.getArgument(0));
+                    argThat((ArgumentMatcher<PetOwner>) simpleObject -> Objects.equals(simpleObject.getName(), someName)))
+            ).then((Answer<PetOwner>) invocation -> invocation.getArgument(0));
 
             // when
-            final SimpleObject obj = objects.create(someName);
+            final PetOwner obj = objects.create(someName);
 
             // then
             assertThat(obj).isNotNull();
@@ -64,14 +64,14 @@ class SimpleObjects_Test {
         void happyCase() {
 
             // given
-            final List<SimpleObject> all = new ArrayList<>();
+            final List<PetOwner> all = new ArrayList<>();
 
             // expecting
             when(mockSimpleObjectRepository.findAll())
                 .thenReturn(all);
 
             // when
-            final List<SimpleObject> list = objects.listAll();
+            final List<PetOwner> list = objects.listAll();
 
             // then
             assertThat(list).isEqualTo(all);
diff --git a/module-pets-tests/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObject_IntegTest.java b/module-pets-tests/src/test/java/domainapp/modules/simple/integtests/tests/PetOwner_IntegTest.java
similarity index 67%
rename from module-pets-tests/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObject_IntegTest.java
rename to module-pets-tests/src/test/java/domainapp/modules/simple/integtests/tests/PetOwner_IntegTest.java
index 761bb86..7fab3b6 100644
--- a/module-pets-tests/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObject_IntegTest.java
+++ b/module-pets-tests/src/test/java/domainapp/modules/simple/integtests/tests/PetOwner_IntegTest.java
@@ -11,32 +11,32 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
 import org.apache.isis.applib.services.wrapper.DisabledException;
 import org.apache.isis.applib.services.wrapper.InvalidException;
 
-import domainapp.modules.simple.dom.so.SimpleObject;
+import domainapp.modules.simple.dom.so.PetOwner;
 import domainapp.modules.simple.fixture.SimpleObject_persona;
 import domainapp.modules.simple.integtests.SimpleModuleIntegTestAbstract;
 
 @Transactional
-public class SimpleObject_IntegTest extends SimpleModuleIntegTestAbstract {
+public class PetOwner_IntegTest extends SimpleModuleIntegTestAbstract {
 
-    SimpleObject simpleObject;
+    PetOwner petOwner;
 
     @BeforeEach
     public void setUp() {
         // given
-        simpleObject = fixtureScripts.runPersona(SimpleObject_persona.FOO);
+        petOwner = fixtureScripts.runPersona(SimpleObject_persona.FOO);
     }
 
 
     @Nested
-    public static class name extends SimpleObject_IntegTest {
+    public static class name extends PetOwner_IntegTest {
 
         @Test
         public void accessible() {
             // when
-            final String name = wrap(simpleObject).getName();
+            final String name = wrap(petOwner).getName();
 
             // then
-            assertThat(name).isEqualTo(simpleObject.getName());
+            assertThat(name).isEqualTo(petOwner.getName());
         }
 
         @Test
@@ -46,25 +46,25 @@ public class SimpleObject_IntegTest extends SimpleModuleIntegTestAbstract {
             assertThrows(DisabledException.class, ()->{
 
                 // when
-                wrap(simpleObject).setName("new name");
+                wrap(petOwner).setName("new name");
             });
         }
 
     }
 
     @Nested
-    public static class updateName extends SimpleObject_IntegTest {
+    public static class updateName extends PetOwner_IntegTest {
 
 
         @Test
         public void can_be_updated_directly() {
 
             // when
-            wrap(simpleObject).updateName("new name");
+            wrap(petOwner).updateName("new name");
             transactionService.flushTransaction();
 
             // then
-            assertThat(wrap(simpleObject).getName()).isEqualTo("new name");
+            assertThat(wrap(petOwner).getName()).isEqualTo("new name");
         }
 
         @Test
@@ -74,7 +74,7 @@ public class SimpleObject_IntegTest extends SimpleModuleIntegTestAbstract {
             InvalidException cause = assertThrows(InvalidException.class, ()->{
 
                 // when
-                wrap(simpleObject).updateName("new name!");
+                wrap(petOwner).updateName("new name!");
             });
 
             // then
diff --git a/module-pets-tests/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObjects_IntegTest.java b/module-pets-tests/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObjects_IntegTest.java
index fdd26c2..fa1bf86 100644
--- a/module-pets-tests/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObjects_IntegTest.java
+++ b/module-pets-tests/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObjects_IntegTest.java
@@ -15,7 +15,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import org.apache.isis.testing.unittestsupport.applib.matchers.ThrowableMatchers;
 
-import domainapp.modules.simple.dom.so.SimpleObject;
+import domainapp.modules.simple.dom.so.PetOwner;
 import domainapp.modules.simple.dom.so.SimpleObjects;
 import domainapp.modules.simple.fixture.SimpleObject_persona;
 import domainapp.modules.simple.integtests.SimpleModuleIntegTestAbstract;
@@ -37,7 +37,7 @@ public class SimpleObjects_IntegTest extends SimpleModuleIntegTestAbstract {
             transactionService.flushTransaction();
 
             // when
-            final List<SimpleObject> all = wrap(menu).listAll();
+            final List<PetOwner> all = wrap(menu).listAll();
 
             // then
             assertThat(all).hasSize(SimpleObject_persona.values().length);
@@ -47,7 +47,7 @@ public class SimpleObjects_IntegTest extends SimpleModuleIntegTestAbstract {
         public void whenNone() {
 
             // when
-            final List<SimpleObject> all = wrap(menu).listAll();
+            final List<PetOwner> all = wrap(menu).listAll();
 
             // then
             assertThat(all).hasSize(0);
@@ -63,7 +63,7 @@ public class SimpleObjects_IntegTest extends SimpleModuleIntegTestAbstract {
             wrap(menu).create("Faz");
 
             // then
-            final List<SimpleObject> all = wrap(menu).listAll();
+            final List<PetOwner> all = wrap(menu).listAll();
             assertThat(all).hasSize(1);
         }
 
diff --git a/module-pets/src/main/java/domainapp/modules/simple/SimpleModule.java b/module-pets/src/main/java/domainapp/modules/simple/SimpleModule.java
index e547259..20f66be 100644
--- a/module-pets/src/main/java/domainapp/modules/simple/SimpleModule.java
+++ b/module-pets/src/main/java/domainapp/modules/simple/SimpleModule.java
@@ -8,7 +8,7 @@ import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
 import org.apache.isis.testing.fixtures.applib.modules.ModuleWithFixtures;
 
-import domainapp.modules.simple.dom.so.SimpleObject;
+import domainapp.modules.simple.dom.so.PetOwner;
 
 @Configuration
 @ComponentScan
@@ -21,7 +21,7 @@ public class SimpleModule implements ModuleWithFixtures {
         return new FixtureScript() {
             @Override
             protected void execute(ExecutionContext executionContext) {
-                repositoryService.removeAll(SimpleObject.class);
+                repositoryService.removeAll(PetOwner.class);
             }
         };
     }
diff --git a/module-pets/src/main/java/domainapp/modules/simple/dom/so/SimpleObject.java b/module-pets/src/main/java/domainapp/modules/simple/dom/so/PetOwner.java
similarity index 86%
rename from module-pets/src/main/java/domainapp/modules/simple/dom/so/SimpleObject.java
rename to module-pets/src/main/java/domainapp/modules/simple/dom/so/PetOwner.java
index 094b99b..fb2d8c3 100644
--- a/module-pets/src/main/java/domainapp/modules/simple/dom/so/SimpleObject.java
+++ b/module-pets/src/main/java/domainapp/modules/simple/dom/so/PetOwner.java
@@ -43,21 +43,21 @@ import domainapp.modules.simple.types.Notes;
 )
 @javax.persistence.NamedQueries({
         @javax.persistence.NamedQuery(
-                name = SimpleObject.NAMED_QUERY__FIND_BY_NAME_LIKE,
+                name = PetOwner.NAMED_QUERY__FIND_BY_NAME_LIKE,
                 query = "SELECT so " +
-                        "FROM SimpleObject so " +
+                        "FROM PetOwner so " +
                         "WHERE so.name LIKE :name"
         )
 })
 @javax.persistence.EntityListeners(IsisEntityListener.class)
-@DomainObject(logicalTypeName = "simple.SimpleObject", entityChangePublishing = Publishing.ENABLED)
+@DomainObject(logicalTypeName = "simple.PetOwner", entityChangePublishing = Publishing.ENABLED)
 @DomainObjectLayout()
 @NoArgsConstructor(access = AccessLevel.PUBLIC)
 @XmlJavaTypeAdapter(PersistentEntityAdapter.class)
 @ToString(onlyExplicitlyIncluded = true)
-public class SimpleObject implements Comparable<SimpleObject> {
+public class PetOwner implements Comparable<PetOwner> {
 
-    static final String NAMED_QUERY__FIND_BY_NAME_LIKE = "SimpleObject.findByNameLike";
+    static final String NAMED_QUERY__FIND_BY_NAME_LIKE = "PetOwner.findByNameLike";
 
     @javax.persistence.Id
     @javax.persistence.GeneratedValue(strategy = javax.persistence.GenerationType.AUTO)
@@ -70,8 +70,8 @@ public class SimpleObject implements Comparable<SimpleObject> {
     @Getter @Setter
     private long version;
 
-    public static SimpleObject withName(String name) {
-        val simpleObject = new SimpleObject();
+    public static PetOwner withName(String name) {
+        val simpleObject = new PetOwner();
         simpleObject.setName(name);
         return simpleObject;
     }
@@ -99,7 +99,7 @@ public class SimpleObject implements Comparable<SimpleObject> {
 
     @Action(semantics = IDEMPOTENT, commandPublishing = Publishing.ENABLED, executionPublishing = Publishing.ENABLED)
     @ActionLayout(associateWith = "name", promptStyle = PromptStyle.INLINE)
-    public SimpleObject updateName(
+    public PetOwner updateName(
             @Name final String name) {
         setName(name);
         return this;
@@ -129,11 +129,11 @@ public class SimpleObject implements Comparable<SimpleObject> {
 
 
 
-    private final static Comparator<SimpleObject> comparator =
-            Comparator.comparing(SimpleObject::getName);
+    private final static Comparator<PetOwner> comparator =
+            Comparator.comparing(PetOwner::getName);
 
     @Override
-    public int compareTo(final SimpleObject other) {
+    public int compareTo(final PetOwner other) {
         return comparator.compare(this, other);
     }
 
diff --git a/module-pets/src/main/java/domainapp/modules/simple/dom/so/SimpleObjectRepository.java b/module-pets/src/main/java/domainapp/modules/simple/dom/so/SimpleObjectRepository.java
index 77d34a1..c0b7fe7 100644
--- a/module-pets/src/main/java/domainapp/modules/simple/dom/so/SimpleObjectRepository.java
+++ b/module-pets/src/main/java/domainapp/modules/simple/dom/so/SimpleObjectRepository.java
@@ -4,10 +4,10 @@ import java.util.List;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 
-public interface SimpleObjectRepository extends JpaRepository<SimpleObject, Long> {
+public interface SimpleObjectRepository extends JpaRepository<PetOwner, Long> {
 
-    List<SimpleObject> findByNameContaining(final String name);
+    List<PetOwner> findByNameContaining(final String name);
 
-    SimpleObject findByName(final String name);
+    PetOwner findByName(final String name);
 
 }
diff --git a/module-pets/src/main/java/domainapp/modules/simple/dom/so/SimpleObjects.java b/module-pets/src/main/java/domainapp/modules/simple/dom/so/SimpleObjects.java
index 218d00b..f1b7770 100644
--- a/module-pets/src/main/java/domainapp/modules/simple/dom/so/SimpleObjects.java
+++ b/module-pets/src/main/java/domainapp/modules/simple/dom/so/SimpleObjects.java
@@ -35,25 +35,25 @@ public class SimpleObjects {
 
     @Action(semantics = SemanticsOf.NON_IDEMPOTENT)
     @ActionLayout(promptStyle = PromptStyle.DIALOG_SIDEBAR)
-    public SimpleObject create(
+    public PetOwner create(
             @Name final String name) {
-        return repositoryService.persist(SimpleObject.withName(name));
+        return repositoryService.persist(PetOwner.withName(name));
     }
 
 
     @Action(semantics = SemanticsOf.NON_IDEMPOTENT)
     @ActionLayout(promptStyle = PromptStyle.DIALOG_SIDEBAR)
-    public List<SimpleObject> findByNameLike(
+    public List<PetOwner> findByNameLike(
             @Name final String name) {
         return repositoryService.allMatches(
-                Query.named(SimpleObject.class, SimpleObject.NAMED_QUERY__FIND_BY_NAME_LIKE)
+                Query.named(PetOwner.class, PetOwner.NAMED_QUERY__FIND_BY_NAME_LIKE)
                      .withParameter("name", "%" + name + "%"));
     }
 
 
     @Action(semantics = SemanticsOf.SAFE)
     @ActionLayout(bookmarking = BookmarkPolicy.AS_ROOT, promptStyle = PromptStyle.DIALOG_SIDEBAR)
-    public List<SimpleObject> findByName(
+    public List<PetOwner> findByName(
             @Name final String name
             ) {
         return simpleObjectRepository.findByNameContaining(name);
@@ -61,7 +61,7 @@ public class SimpleObjects {
 
 
     @Programmatic
-    public SimpleObject findByNameExact(final String name) {
+    public PetOwner findByNameExact(final String name) {
         return simpleObjectRepository.findByName(name);
     }
 
@@ -69,7 +69,7 @@ public class SimpleObjects {
 
     @Action(semantics = SemanticsOf.SAFE)
     @ActionLayout(bookmarking = BookmarkPolicy.AS_ROOT)
-    public List<SimpleObject> listAll() {
+    public List<PetOwner> listAll() {
         return simpleObjectRepository.findAll();
     }
 
@@ -78,11 +78,11 @@ public class SimpleObjects {
 
     @Programmatic
     public void ping() {
-        jpaSupportService.getEntityManager(SimpleObject.class)
+        jpaSupportService.getEntityManager(PetOwner.class)
             .ifSuccess(entityManager -> {
-                final TypedQuery<SimpleObject> q = entityManager.createQuery(
-                        "SELECT p FROM SimpleObject p ORDER BY p.name",
-                        SimpleObject.class)
+                final TypedQuery<PetOwner> q = entityManager.createQuery(
+                        "SELECT p FROM PetOwner p ORDER BY p.name",
+                        PetOwner.class)
                     .setMaxResults(1);
                 q.getResultList();
             });
diff --git a/module-pets/src/main/java/domainapp/modules/simple/fixture/SimpleObjectBuilder.java b/module-pets/src/main/java/domainapp/modules/simple/fixture/SimpleObjectBuilder.java
index 80223be..be7d65c 100644
--- a/module-pets/src/main/java/domainapp/modules/simple/fixture/SimpleObjectBuilder.java
+++ b/module-pets/src/main/java/domainapp/modules/simple/fixture/SimpleObjectBuilder.java
@@ -4,20 +4,20 @@ import javax.inject.Inject;
 
 import org.apache.isis.testing.fixtures.applib.personas.BuilderScriptWithResult;
 
-import domainapp.modules.simple.dom.so.SimpleObject;
+import domainapp.modules.simple.dom.so.PetOwner;
 import domainapp.modules.simple.dom.so.SimpleObjects;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.experimental.Accessors;
 
 @Accessors(chain = true)
-public class SimpleObjectBuilder extends BuilderScriptWithResult<SimpleObject> {
+public class SimpleObjectBuilder extends BuilderScriptWithResult<PetOwner> {
 
     @Getter @Setter
     private String name;
 
     @Override
-    protected SimpleObject buildResult(final ExecutionContext ec) {
+    protected PetOwner buildResult(final ExecutionContext ec) {
 
         checkParam("name", ec, String.class);
 
diff --git a/module-pets/src/main/java/domainapp/modules/simple/fixture/SimpleObject_persona.java b/module-pets/src/main/java/domainapp/modules/simple/fixture/SimpleObject_persona.java
index 41a5aec..e1ebb5b 100644
--- a/module-pets/src/main/java/domainapp/modules/simple/fixture/SimpleObject_persona.java
+++ b/module-pets/src/main/java/domainapp/modules/simple/fixture/SimpleObject_persona.java
@@ -5,13 +5,13 @@ import org.apache.isis.testing.fixtures.applib.personas.PersonaWithBuilderScript
 import org.apache.isis.testing.fixtures.applib.personas.PersonaWithFinder;
 import org.apache.isis.testing.fixtures.applib.setup.PersonaEnumPersistAll;
 
-import domainapp.modules.simple.dom.so.SimpleObject;
+import domainapp.modules.simple.dom.so.PetOwner;
 import domainapp.modules.simple.dom.so.SimpleObjects;
 import lombok.AllArgsConstructor;
 
 @AllArgsConstructor
 public enum SimpleObject_persona
-implements PersonaWithBuilderScript<SimpleObjectBuilder>, PersonaWithFinder<SimpleObject> {
+implements PersonaWithBuilderScript<SimpleObjectBuilder>, PersonaWithFinder<PetOwner> {
 
     FOO("Foo"),
     BAR("Bar"),
@@ -32,13 +32,13 @@ implements PersonaWithBuilderScript<SimpleObjectBuilder>, PersonaWithFinder<Simp
     }
 
     @Override
-    public SimpleObject findUsing(final ServiceRegistry serviceRegistry) {
+    public PetOwner findUsing(final ServiceRegistry serviceRegistry) {
         SimpleObjects simpleObjects = serviceRegistry.lookupService(SimpleObjects.class).orElse(null);
         return simpleObjects.findByNameExact(name);
     }
 
     public static class PersistAll
-    extends PersonaEnumPersistAll<SimpleObject_persona, SimpleObject> {
+    extends PersonaEnumPersistAll<SimpleObject_persona, PetOwner> {
 
         public PersistAll() {
             super(SimpleObject_persona.class);
diff --git a/webapp-tests/src/test/java/domainapp/webapp/integtests/smoke/Smoke_IntegTest.java b/webapp-tests/src/test/java/domainapp/webapp/integtests/smoke/Smoke_IntegTest.java
index f8c5b56..6aea04a 100644
--- a/webapp-tests/src/test/java/domainapp/webapp/integtests/smoke/Smoke_IntegTest.java
+++ b/webapp-tests/src/test/java/domainapp/webapp/integtests/smoke/Smoke_IntegTest.java
@@ -13,8 +13,8 @@ import org.apache.isis.applib.services.xactn.TransactionService;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import domainapp.modules.simple.dom.so.PetOwner;
 import domainapp.webapp.integtests.WebAppIntegTestAbstract;
-import domainapp.modules.simple.dom.so.SimpleObject;
 import domainapp.modules.simple.dom.so.SimpleObjects;
 
 @Transactional
@@ -27,14 +27,14 @@ class Smoke_IntegTest extends WebAppIntegTestAbstract {
     void happy_case() {
 
         // when
-        List<SimpleObject> all = wrap(menu).listAll();
+        List<PetOwner> all = wrap(menu).listAll();
 
         // then
         assertThat(all).isEmpty();
 
 
         // when
-        final SimpleObject fred = wrap(menu).create("Fred");
+        final PetOwner fred = wrap(menu).create("Fred");
         transactionService.flushTransaction();
 
         // then
@@ -44,7 +44,7 @@ class Smoke_IntegTest extends WebAppIntegTestAbstract {
 
 
         // when
-        final SimpleObject bill = wrap(menu).create("Bill");
+        final PetOwner bill = wrap(menu).create("Bill");
         transactionService.flushTransaction();
 
         // then
diff --git a/webapp/src/main/java/domainapp/webapp/application/services/homepage/HomePageViewModel.java b/webapp/src/main/java/domainapp/webapp/application/services/homepage/HomePageViewModel.java
index bfb4dca..6cbc1c8 100644
--- a/webapp/src/main/java/domainapp/webapp/application/services/homepage/HomePageViewModel.java
+++ b/webapp/src/main/java/domainapp/webapp/application/services/homepage/HomePageViewModel.java
@@ -9,7 +9,7 @@ import org.apache.isis.applib.annotation.DomainObjectLayout;
 import org.apache.isis.applib.annotation.HomePage;
 import org.apache.isis.applib.annotation.Nature;
 
-import domainapp.modules.simple.dom.so.SimpleObject;
+import domainapp.modules.simple.dom.so.PetOwner;
 import domainapp.modules.simple.dom.so.SimpleObjects;
 
 @DomainObject(
@@ -24,7 +24,7 @@ public class HomePageViewModel {
         return getObjects().size() + " objects";
     }
 
-    public List<SimpleObject> getObjects() {
+    public List<PetOwner> getObjects() {
         return simpleObjects.listAll();
     }
 
diff --git a/webapp/src/main/java/domainapp/webapp/custom/restapi/CustomController.java b/webapp/src/main/java/domainapp/webapp/custom/restapi/CustomController.java
index 33c2ee5..ec16251 100644
--- a/webapp/src/main/java/domainapp/webapp/custom/restapi/CustomController.java
+++ b/webapp/src/main/java/domainapp/webapp/custom/restapi/CustomController.java
@@ -17,7 +17,7 @@ import org.apache.isis.applib.services.xactn.TransactionalProcessor;
 
 import lombok.RequiredArgsConstructor;
 
-import domainapp.modules.simple.dom.so.SimpleObject;
+import domainapp.modules.simple.dom.so.PetOwner;
 import domainapp.modules.simple.dom.so.SimpleObjects;
 
 @RestController
@@ -29,9 +29,9 @@ class CustomController {
     private final SimpleObjects simpleObjects;
 
     @GetMapping("/custom/simpleObjects")
-    List<SimpleObject> all() {
+    List<PetOwner> all() {
         return call("sven", simpleObjects::listAll)
-                .orElse(Collections.<SimpleObject>emptyList());
+                .orElse(Collections.<PetOwner>emptyList());
     }
 
     private <T> Optional<T> call(
diff --git a/webapp/src/main/java/domainapp/webapp/quartz/job/SampleJob.java b/webapp/src/main/java/domainapp/webapp/quartz/job/SampleJob.java
index d112ae9..4249d81 100644
--- a/webapp/src/main/java/domainapp/webapp/quartz/job/SampleJob.java
+++ b/webapp/src/main/java/domainapp/webapp/quartz/job/SampleJob.java
@@ -20,7 +20,7 @@ import org.apache.isis.applib.services.xactn.TransactionalProcessor;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.log4j.Log4j2;
 
-import domainapp.modules.simple.dom.so.SimpleObject;
+import domainapp.modules.simple.dom.so.PetOwner;
 import domainapp.modules.simple.dom.so.SimpleObjects;
 
 @Component
@@ -34,13 +34,13 @@ public class SampleJob implements Job {
 
     @Override
     public void execute(JobExecutionContext context) throws JobExecutionException {
-        final List<SimpleObject> all = all();
+        final List<PetOwner> all = all();
         log.info("{} objects in the database", all.size());
     }
 
-    List<SimpleObject> all() {
+    List<PetOwner> all() {
         return call("sven", simpleObjects::listAll)
-                .orElse(Collections.<SimpleObject>emptyList());
+                .orElse(Collections.<PetOwner>emptyList());
     }
 
     private <T> Optional<T> call(

[isis-app-demo] 21/23: renames DomainAppDemo fixture to PetClinicDemo

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/isis-app-demo.git

commit abbd61da49cd0f17690a60d111c0fb58ef17f394
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Sep 29 07:15:47 2021 +0100

    renames DomainAppDemo fixture to PetClinicDemo
---
 webapp/src/main/java/petclinic/webapp/AppManifest.java              | 4 ++--
 .../fixture/scenarios/{DomainAppDemo.java => PetClinicDemo.java}    | 2 +-
 webapp/src/main/resources/application.yml                           | 6 +++---
 webapp/src/main/resources/config/application.properties             | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/webapp/src/main/java/petclinic/webapp/AppManifest.java b/webapp/src/main/java/petclinic/webapp/AppManifest.java
index f55f43b..bf225fa 100644
--- a/webapp/src/main/java/petclinic/webapp/AppManifest.java
+++ b/webapp/src/main/java/petclinic/webapp/AppManifest.java
@@ -16,7 +16,7 @@ import org.apache.isis.viewer.restfulobjects.jaxrsresteasy4.IsisModuleViewerRest
 import org.apache.isis.viewer.wicket.viewer.IsisModuleViewerWicketViewer;
 
 import petclinic.webapp.application.ApplicationModule;
-import petclinic.webapp.application.fixture.scenarios.DomainAppDemo;
+import petclinic.webapp.application.fixture.scenarios.PetClinicDemo;
 import petclinic.webapp.custom.CustomModule;
 import petclinic.webapp.quartz.QuartzModule;
 
@@ -38,7 +38,7 @@ import petclinic.webapp.quartz.QuartzModule;
         QuartzModule.class,
 
         // discoverable fixtures
-        DomainAppDemo.class
+        PetClinicDemo.class
 })
 @PropertySources({
         @PropertySource(IsisPresets.DebugDiscovery),
diff --git a/webapp/src/main/java/petclinic/webapp/application/fixture/scenarios/DomainAppDemo.java b/webapp/src/main/java/petclinic/webapp/application/fixture/scenarios/PetClinicDemo.java
similarity index 92%
rename from webapp/src/main/java/petclinic/webapp/application/fixture/scenarios/DomainAppDemo.java
rename to webapp/src/main/java/petclinic/webapp/application/fixture/scenarios/PetClinicDemo.java
index d4ca7b2..b41753c 100644
--- a/webapp/src/main/java/petclinic/webapp/application/fixture/scenarios/DomainAppDemo.java
+++ b/webapp/src/main/java/petclinic/webapp/application/fixture/scenarios/PetClinicDemo.java
@@ -7,7 +7,7 @@ import org.apache.isis.testing.fixtures.applib.modules.ModuleWithFixturesService
 
 import petclinic.modules.pets.fixture.PetOwner_persona;
 
-public class DomainAppDemo extends FixtureScript {
+public class PetClinicDemo extends FixtureScript {
 
     @Override
     protected void execute(final ExecutionContext ec) {
diff --git a/webapp/src/main/resources/application.yml b/webapp/src/main/resources/application.yml
index b6c92a8..5960b92 100644
--- a/webapp/src/main/resources/application.yml
+++ b/webapp/src/main/resources/application.yml
@@ -69,9 +69,9 @@ isis:
   testing:
     fixtures:
       fixture-scripts-specification:
-        context-class: petclinic.webapp.application.fixture.scenarios.DomainAppDemo
-        run-script-default: petclinic.webapp.application.fixture.scenarios.DomainAppDemo
-        recreate: petclinic.webapp.application.fixture.scenarios.DomainAppDemo
+        context-class: petclinic.webapp.application.fixture.scenarios.PetClinicDemo
+        run-script-default: petclinic.webapp.application.fixture.scenarios.PetClinicDemo
+        recreate: petclinic.webapp.application.fixture.scenarios.PetClinicDemo
         non-persisted-objects-strategy: persist
         multiple-execution-strategy: execute
 
diff --git a/webapp/src/main/resources/config/application.properties b/webapp/src/main/resources/config/application.properties
index 8a6e57b..26ecfba 100644
--- a/webapp/src/main/resources/config/application.properties
+++ b/webapp/src/main/resources/config/application.properties
@@ -26,6 +26,6 @@ eclipselink.application-location=.
 eclipselink.jpa.upper-case-column-names=false
 
 # uncomment to run during bootstrap
-#isis.testing.fixtures.initial-script = petclinic.webapp.application.fixture.scenarios.DomainAppDemo
+#isis.testing.fixtures.initial-script = petclinic.webapp.application.fixture.scenarios.PetClinicDemo

[isis-app-demo] 10/23: renames SimpleObjects to PetOwners

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/isis-app-demo.git

commit 0bfe93796395d3fe1e66ce5316d8c716f9ca3fbe
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Sep 29 06:53:47 2021 +0100

    renames SimpleObjects to PetOwners
---
 .../dom/so/{SimpleObjects_Test.java => PetOwners_Test.java}    |  6 +++---
 .../{SimpleObjects_IntegTest.java => PetOwners_IntegTest.java} | 10 +++++-----
 .../simple/dom/so/{SimpleObjects.java => PetOwners.java}       |  4 ++--
 .../domainapp/modules/simple/fixture/SimpleObjectBuilder.java  |  7 ++++---
 .../domainapp/modules/simple/fixture/SimpleObject_persona.java |  7 ++++---
 .../domainapp/webapp/integtests/smoke/Smoke_IntegTest.java     |  4 ++--
 .../application/services/health/HealthCheckServiceImpl.java    | 10 +++++-----
 .../application/services/homepage/HomePageViewModel.java       |  6 +++---
 .../java/domainapp/webapp/custom/restapi/CustomController.java |  6 +++---
 .../src/main/java/domainapp/webapp/quartz/job/SampleJob.java   |  6 +++---
 10 files changed, 34 insertions(+), 32 deletions(-)

diff --git a/module-pets-tests/src/test/java/domainapp/modules/simple/dom/so/SimpleObjects_Test.java b/module-pets-tests/src/test/java/domainapp/modules/simple/dom/so/PetOwners_Test.java
similarity index 92%
rename from module-pets-tests/src/test/java/domainapp/modules/simple/dom/so/SimpleObjects_Test.java
rename to module-pets-tests/src/test/java/domainapp/modules/simple/dom/so/PetOwners_Test.java
index 3807963..a18d82c 100644
--- a/module-pets-tests/src/test/java/domainapp/modules/simple/dom/so/SimpleObjects_Test.java
+++ b/module-pets-tests/src/test/java/domainapp/modules/simple/dom/so/PetOwners_Test.java
@@ -21,17 +21,17 @@ import org.apache.isis.applib.services.repository.RepositoryService;
 import org.apache.isis.persistence.jpa.applib.services.JpaSupportService;
 
 @ExtendWith(MockitoExtension.class)
-class SimpleObjects_Test {
+class PetOwners_Test {
 
     @Mock RepositoryService mockRepositoryService;
     @Mock JpaSupportService mockJpaSupportService;
     @Mock SimpleObjectRepository mockSimpleObjectRepository;
 
-    SimpleObjects objects;
+    PetOwners objects;
 
     @BeforeEach
     public void setUp() {
-        objects = new SimpleObjects(mockRepositoryService, mockJpaSupportService, mockSimpleObjectRepository);
+        objects = new PetOwners(mockRepositoryService, mockJpaSupportService, mockSimpleObjectRepository);
     }
 
     @Nested
diff --git a/module-pets-tests/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObjects_IntegTest.java b/module-pets-tests/src/test/java/domainapp/modules/simple/integtests/tests/PetOwners_IntegTest.java
similarity index 88%
rename from module-pets-tests/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObjects_IntegTest.java
rename to module-pets-tests/src/test/java/domainapp/modules/simple/integtests/tests/PetOwners_IntegTest.java
index fa1bf86..0c15972 100644
--- a/module-pets-tests/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObjects_IntegTest.java
+++ b/module-pets-tests/src/test/java/domainapp/modules/simple/integtests/tests/PetOwners_IntegTest.java
@@ -16,18 +16,18 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
 import org.apache.isis.testing.unittestsupport.applib.matchers.ThrowableMatchers;
 
 import domainapp.modules.simple.dom.so.PetOwner;
-import domainapp.modules.simple.dom.so.SimpleObjects;
+import domainapp.modules.simple.dom.so.PetOwners;
 import domainapp.modules.simple.fixture.SimpleObject_persona;
 import domainapp.modules.simple.integtests.SimpleModuleIntegTestAbstract;
 
 @Transactional
-public class SimpleObjects_IntegTest extends SimpleModuleIntegTestAbstract {
+public class PetOwners_IntegTest extends SimpleModuleIntegTestAbstract {
 
     @Inject
-    SimpleObjects menu;
+    PetOwners menu;
 
     @Nested
-    public static class listAll extends SimpleObjects_IntegTest {
+    public static class listAll extends PetOwners_IntegTest {
 
         @Test
         public void happyCase() {
@@ -55,7 +55,7 @@ public class SimpleObjects_IntegTest extends SimpleModuleIntegTestAbstract {
     }
 
     @Nested
-    public static class create extends SimpleObjects_IntegTest {
+    public static class create extends PetOwners_IntegTest {
 
         @Test
         public void happyCase() {
diff --git a/module-pets/src/main/java/domainapp/modules/simple/dom/so/SimpleObjects.java b/module-pets/src/main/java/domainapp/modules/simple/dom/so/PetOwners.java
similarity index 97%
rename from module-pets/src/main/java/domainapp/modules/simple/dom/so/SimpleObjects.java
rename to module-pets/src/main/java/domainapp/modules/simple/dom/so/PetOwners.java
index f1b7770..a8d44be 100644
--- a/module-pets/src/main/java/domainapp/modules/simple/dom/so/SimpleObjects.java
+++ b/module-pets/src/main/java/domainapp/modules/simple/dom/so/PetOwners.java
@@ -22,11 +22,11 @@ import domainapp.modules.simple.types.Name;
 
 @DomainService(
         nature = NatureOfService.VIEW,
-        logicalTypeName = "simple.SimpleObjects"
+        logicalTypeName = "simple.PetOwners"
 )
 @javax.annotation.Priority(PriorityPrecedence.EARLY)
 @lombok.RequiredArgsConstructor(onConstructor_ = {@Inject} )
-public class SimpleObjects {
+public class PetOwners {
 
     final RepositoryService repositoryService;
     final JpaSupportService jpaSupportService;
diff --git a/module-pets/src/main/java/domainapp/modules/simple/fixture/SimpleObjectBuilder.java b/module-pets/src/main/java/domainapp/modules/simple/fixture/SimpleObjectBuilder.java
index be7d65c..dcf5c94 100644
--- a/module-pets/src/main/java/domainapp/modules/simple/fixture/SimpleObjectBuilder.java
+++ b/module-pets/src/main/java/domainapp/modules/simple/fixture/SimpleObjectBuilder.java
@@ -5,7 +5,8 @@ import javax.inject.Inject;
 import org.apache.isis.testing.fixtures.applib.personas.BuilderScriptWithResult;
 
 import domainapp.modules.simple.dom.so.PetOwner;
-import domainapp.modules.simple.dom.so.SimpleObjects;
+import domainapp.modules.simple.dom.so.PetOwners;
+
 import lombok.Getter;
 import lombok.Setter;
 import lombok.experimental.Accessors;
@@ -21,11 +22,11 @@ public class SimpleObjectBuilder extends BuilderScriptWithResult<PetOwner> {
 
         checkParam("name", ec, String.class);
 
-        return wrap(simpleObjects).create(name);
+        return wrap(petOwners).create(name);
     }
 
     // -- DEPENDENCIES
 
-    @Inject SimpleObjects simpleObjects;
+    @Inject PetOwners petOwners;
 
 }
diff --git a/module-pets/src/main/java/domainapp/modules/simple/fixture/SimpleObject_persona.java b/module-pets/src/main/java/domainapp/modules/simple/fixture/SimpleObject_persona.java
index e1ebb5b..f385997 100644
--- a/module-pets/src/main/java/domainapp/modules/simple/fixture/SimpleObject_persona.java
+++ b/module-pets/src/main/java/domainapp/modules/simple/fixture/SimpleObject_persona.java
@@ -6,7 +6,8 @@ import org.apache.isis.testing.fixtures.applib.personas.PersonaWithFinder;
 import org.apache.isis.testing.fixtures.applib.setup.PersonaEnumPersistAll;
 
 import domainapp.modules.simple.dom.so.PetOwner;
-import domainapp.modules.simple.dom.so.SimpleObjects;
+import domainapp.modules.simple.dom.so.PetOwners;
+
 import lombok.AllArgsConstructor;
 
 @AllArgsConstructor
@@ -33,8 +34,8 @@ implements PersonaWithBuilderScript<SimpleObjectBuilder>, PersonaWithFinder<PetO
 
     @Override
     public PetOwner findUsing(final ServiceRegistry serviceRegistry) {
-        SimpleObjects simpleObjects = serviceRegistry.lookupService(SimpleObjects.class).orElse(null);
-        return simpleObjects.findByNameExact(name);
+        PetOwners petOwners = serviceRegistry.lookupService(PetOwners.class).orElse(null);
+        return petOwners.findByNameExact(name);
     }
 
     public static class PersistAll
diff --git a/webapp-tests/src/test/java/domainapp/webapp/integtests/smoke/Smoke_IntegTest.java b/webapp-tests/src/test/java/domainapp/webapp/integtests/smoke/Smoke_IntegTest.java
index 6aea04a..2d5a057 100644
--- a/webapp-tests/src/test/java/domainapp/webapp/integtests/smoke/Smoke_IntegTest.java
+++ b/webapp-tests/src/test/java/domainapp/webapp/integtests/smoke/Smoke_IntegTest.java
@@ -15,12 +15,12 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 import domainapp.modules.simple.dom.so.PetOwner;
 import domainapp.webapp.integtests.WebAppIntegTestAbstract;
-import domainapp.modules.simple.dom.so.SimpleObjects;
+import domainapp.modules.simple.dom.so.PetOwners;
 
 @Transactional
 class Smoke_IntegTest extends WebAppIntegTestAbstract {
 
-    @Inject SimpleObjects menu;
+    @Inject PetOwners menu;
     @Inject TransactionService transactionService;
 
     @Test
diff --git a/webapp/src/main/java/domainapp/webapp/application/services/health/HealthCheckServiceImpl.java b/webapp/src/main/java/domainapp/webapp/application/services/health/HealthCheckServiceImpl.java
index 4f16352..6ae3bed 100644
--- a/webapp/src/main/java/domainapp/webapp/application/services/health/HealthCheckServiceImpl.java
+++ b/webapp/src/main/java/domainapp/webapp/application/services/health/HealthCheckServiceImpl.java
@@ -8,23 +8,23 @@ import org.springframework.stereotype.Service;
 import org.apache.isis.applib.services.health.Health;
 import org.apache.isis.applib.services.health.HealthCheckService;
 
-import domainapp.modules.simple.dom.so.SimpleObjects;
+import domainapp.modules.simple.dom.so.PetOwners;
 
 @Service
 @Named("domainapp.HealthCheckServiceImpl")
 public class HealthCheckServiceImpl implements HealthCheckService {
 
-    private final SimpleObjects simpleObjects;
+    private final PetOwners petOwners;
 
     @Inject
-    public HealthCheckServiceImpl(SimpleObjects simpleObjects) {
-        this.simpleObjects = simpleObjects;
+    public HealthCheckServiceImpl(PetOwners petOwners) {
+        this.petOwners = petOwners;
     }
 
     @Override
     public Health check() {
         try {
-            simpleObjects.ping();
+            petOwners.ping();
             return Health.ok();
         } catch (Exception ex) {
             return Health.error(ex);
diff --git a/webapp/src/main/java/domainapp/webapp/application/services/homepage/HomePageViewModel.java b/webapp/src/main/java/domainapp/webapp/application/services/homepage/HomePageViewModel.java
index 6cbc1c8..4963f86 100644
--- a/webapp/src/main/java/domainapp/webapp/application/services/homepage/HomePageViewModel.java
+++ b/webapp/src/main/java/domainapp/webapp/application/services/homepage/HomePageViewModel.java
@@ -10,7 +10,7 @@ import org.apache.isis.applib.annotation.HomePage;
 import org.apache.isis.applib.annotation.Nature;
 
 import domainapp.modules.simple.dom.so.PetOwner;
-import domainapp.modules.simple.dom.so.SimpleObjects;
+import domainapp.modules.simple.dom.so.PetOwners;
 
 @DomainObject(
         nature = Nature.VIEW_MODEL,
@@ -25,8 +25,8 @@ public class HomePageViewModel {
     }
 
     public List<PetOwner> getObjects() {
-        return simpleObjects.listAll();
+        return petOwners.listAll();
     }
 
-    @Inject SimpleObjects simpleObjects;
+    @Inject PetOwners petOwners;
 }
diff --git a/webapp/src/main/java/domainapp/webapp/custom/restapi/CustomController.java b/webapp/src/main/java/domainapp/webapp/custom/restapi/CustomController.java
index ec16251..a43598b 100644
--- a/webapp/src/main/java/domainapp/webapp/custom/restapi/CustomController.java
+++ b/webapp/src/main/java/domainapp/webapp/custom/restapi/CustomController.java
@@ -18,7 +18,7 @@ import org.apache.isis.applib.services.xactn.TransactionalProcessor;
 import lombok.RequiredArgsConstructor;
 
 import domainapp.modules.simple.dom.so.PetOwner;
-import domainapp.modules.simple.dom.so.SimpleObjects;
+import domainapp.modules.simple.dom.so.PetOwners;
 
 @RestController
 @RequiredArgsConstructor(onConstructor_ = {@Inject})
@@ -26,11 +26,11 @@ class CustomController {
 
     private final InteractionService interactionService;
     private final TransactionalProcessor transactionalProcessor;
-    private final SimpleObjects simpleObjects;
+    private final PetOwners petOwners;
 
     @GetMapping("/custom/simpleObjects")
     List<PetOwner> all() {
-        return call("sven", simpleObjects::listAll)
+        return call("sven", petOwners::listAll)
                 .orElse(Collections.<PetOwner>emptyList());
     }
 
diff --git a/webapp/src/main/java/domainapp/webapp/quartz/job/SampleJob.java b/webapp/src/main/java/domainapp/webapp/quartz/job/SampleJob.java
index 4249d81..b7adf92 100644
--- a/webapp/src/main/java/domainapp/webapp/quartz/job/SampleJob.java
+++ b/webapp/src/main/java/domainapp/webapp/quartz/job/SampleJob.java
@@ -21,7 +21,7 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.log4j.Log4j2;
 
 import domainapp.modules.simple.dom.so.PetOwner;
-import domainapp.modules.simple.dom.so.SimpleObjects;
+import domainapp.modules.simple.dom.so.PetOwners;
 
 @Component
 @RequiredArgsConstructor(onConstructor_ = {@Inject})
@@ -30,7 +30,7 @@ public class SampleJob implements Job {
 
     private final InteractionService interactionService;
     private final TransactionalProcessor transactionalProcessor;
-    private final SimpleObjects simpleObjects;
+    private final PetOwners petOwners;
 
     @Override
     public void execute(JobExecutionContext context) throws JobExecutionException {
@@ -39,7 +39,7 @@ public class SampleJob implements Job {
     }
 
     List<PetOwner> all() {
-        return call("sven", simpleObjects::listAll)
+        return call("sven", petOwners::listAll)
                 .orElse(Collections.<PetOwner>emptyList());
     }

[isis-app-demo] 11/23: changes PetOwners logicalTypeName

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/isis-app-demo.git

commit 854cde9e354583db3fbb563e7dbf3aa3a9f4e7b5
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Sep 29 06:57:35 2021 +0100

    changes PetOwners logicalTypeName
---
 .../src/main/java/domainapp/modules/simple/dom/so/PetOwners.java        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module-pets/src/main/java/domainapp/modules/simple/dom/so/PetOwners.java b/module-pets/src/main/java/domainapp/modules/simple/dom/so/PetOwners.java
index a8d44be..bbbe161 100644
--- a/module-pets/src/main/java/domainapp/modules/simple/dom/so/PetOwners.java
+++ b/module-pets/src/main/java/domainapp/modules/simple/dom/so/PetOwners.java
@@ -22,7 +22,7 @@ import domainapp.modules.simple.types.Name;
 
 @DomainService(
         nature = NatureOfService.VIEW,
-        logicalTypeName = "simple.PetOwners"
+        logicalTypeName = "pets.PetOwners"
 )
 @javax.annotation.Priority(PriorityPrecedence.EARLY)
 @lombok.RequiredArgsConstructor(onConstructor_ = {@Inject} )

[isis-app-demo] 07/23: changes config files for schema change

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/isis-app-demo.git

commit 24e9a090f0e1add19a855f912e2a76a756af5189
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Sep 29 06:57:15 2021 +0100

    changes config files for schema change
---
 module-pets-tests/src/test/resources/application-test.yml      |  2 +-
 webapp-tests/src/test/resources/application-test.yml           |  2 +-
 .../src/main/resources/config/application-SQLSERVER.properties | 10 +++++-----
 webapp/src/main/resources/config/application.properties        |  2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/module-pets-tests/src/test/resources/application-test.yml b/module-pets-tests/src/test/resources/application-test.yml
index 3a68cae..fa32cda 100644
--- a/module-pets-tests/src/test/resources/application-test.yml
+++ b/module-pets-tests/src/test/resources/application-test.yml
@@ -1,4 +1,4 @@
 isis:
   persistence:
     schema:
-      auto-create-schemas: "simple"
+      auto-create-schemas: "pets"
diff --git a/webapp-tests/src/test/resources/application-test.yml b/webapp-tests/src/test/resources/application-test.yml
index 3a68cae..fa32cda 100644
--- a/webapp-tests/src/test/resources/application-test.yml
+++ b/webapp-tests/src/test/resources/application-test.yml
@@ -1,4 +1,4 @@
 isis:
   persistence:
     schema:
-      auto-create-schemas: "simple"
+      auto-create-schemas: "pets"
diff --git a/webapp/src/main/resources/config/application-SQLSERVER.properties b/webapp/src/main/resources/config/application-SQLSERVER.properties
index 07d8fe3..561b8a4 100644
--- a/webapp/src/main/resources/config/application-SQLSERVER.properties
+++ b/webapp/src/main/resources/config/application-SQLSERVER.properties
@@ -16,14 +16,14 @@
 #
 
 spring.flyway.enabled=true
-spring.flyway.default-schema=SIMPLE
-spring.flyway.schemas=SIMPLE
+spring.flyway.default-schema=PETS
+spring.flyway.schemas=PETS
 
 spring.datasource.platform=sqlserver
-spring.datasource.url=jdbc:sqlserver://localhost;databaseName=simpleapp
+spring.datasource.url=jdbc:sqlserver://localhost;databaseName=petclinic
 spring.datasource.driver-class-name=com.microsoft.sqlserver.jdbc.SQLServerDriver
-spring.datasource.username=simpleapp
-spring.datasource.password=simpleapp
+spring.datasource.username=petclinic
+spring.datasource.password=petclinic
 
 #isis.persistence.schema.create-schema-sql-template=   (use flyway instead)
 isis.persistence.schema.auto-create-schemas=
diff --git a/webapp/src/main/resources/config/application.properties b/webapp/src/main/resources/config/application.properties
index 8a7dcce..87d3d0f 100644
--- a/webapp/src/main/resources/config/application.properties
+++ b/webapp/src/main/resources/config/application.properties
@@ -15,7 +15,7 @@ spring.datasource.url=jdbc:h2:mem:simple;DATABASE_TO_UPPER=false
 spring.datasource.driver-class-name=org.h2.Driver
 
 isis.persistence.schema.create-schema-sql-template=CREATE SCHEMA IF NOT EXISTS %s
-isis.persistence.schema.auto-create-schemas=simple
+isis.persistence.schema.auto-create-schemas=pets
 
 #eclipselink.weaving=true
 eclipselink.deploy-on-startup=true

[isis-app-demo] 19/23: renames packages in webapp module

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/isis-app-demo.git

commit 1e5f464dc296db04ff992f804909bfb5986cca7d
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Sep 29 07:13:44 2021 +0100

    renames packages in webapp module
---
 .../webapp/integtests/WebAppIntegTestAbstract.java          |   4 ++--
 webapp/pom.xml                                              |   2 +-
 .../java/{domainapp => petclinic}/webapp/AppManifest.java   |  10 +++++-----
 .../java/{domainapp => petclinic}/webapp/PetClinicApp.java  |   2 +-
 .../webapp/application/ApplicationModule.java               |   2 +-
 .../webapp/application/fixture/scenarios/DomainAppDemo.java |   2 +-
 .../application/services/health/HealthCheckServiceImpl.java |   2 +-
 .../application/services/homepage/HomePageViewModel.java    |   2 +-
 .../services/homepage/HomePageViewModel.layout.xml          |   0
 .../application/services/homepage/HomePageViewModel.png     | Bin
 .../webapp/custom/CustomModule.java                         |   2 +-
 .../webapp/custom/restapi/CustomController.java             |   2 +-
 .../webapp/quartz/QuartzModule.java                         |   4 ++--
 .../webapp/quartz/job/SampleJob.java                        |   2 +-
 webapp/src/main/resources/application.yml                   |   6 +++---
 webapp/src/main/resources/config/application.properties     |   2 +-
 16 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/webapp-tests/src/test/java/domainapp/webapp/integtests/WebAppIntegTestAbstract.java b/webapp-tests/src/test/java/domainapp/webapp/integtests/WebAppIntegTestAbstract.java
index 260c893..a97f236 100644
--- a/webapp-tests/src/test/java/domainapp/webapp/integtests/WebAppIntegTestAbstract.java
+++ b/webapp-tests/src/test/java/domainapp/webapp/integtests/WebAppIntegTestAbstract.java
@@ -17,7 +17,7 @@ import org.apache.isis.testing.fixtures.applib.IsisModuleTestingFixturesApplib;
 import org.apache.isis.testing.integtestsupport.applib.IsisIntegrationTestAbstract;
 
 import petclinic.modules.pets.PetsModule;
-import domainapp.webapp.application.ApplicationModule;
+import petclinic.webapp.application.ApplicationModule;
 
 @SpringBootTest(
     classes = {
@@ -30,7 +30,7 @@ import domainapp.webapp.application.ApplicationModule;
 public abstract class WebAppIntegTestAbstract extends IsisIntegrationTestAbstract {
 
     /**
-     * Compared to the production app manifest <code>domainapp.webapp.AppManifest</code>,
+     * Compared to the production app manifest <code>petclinic.webapp.AppManifest</code>,
      * here we in effect disable security checks, and we exclude any web/UI modules.
      */
     @SpringBootConfiguration
diff --git a/webapp/pom.xml b/webapp/pom.xml
index c0f8032..1f6e9dd 100644
--- a/webapp/pom.xml
+++ b/webapp/pom.xml
@@ -171,7 +171,7 @@
                                 <jvmFlags>
                                     <jvmFlag>-Xmx512m</jvmFlag>
                                 </jvmFlags>
-                                <mainClass>domainapp.webapp.PetClinicApp</mainClass>
+                                <mainClass>petclinic.webapp.PetClinicApp</mainClass>
                                 <ports>
                                     <port>8080</port>
                                 </ports>
diff --git a/webapp/src/main/java/domainapp/webapp/AppManifest.java b/webapp/src/main/java/petclinic/webapp/AppManifest.java
similarity index 87%
rename from webapp/src/main/java/domainapp/webapp/AppManifest.java
rename to webapp/src/main/java/petclinic/webapp/AppManifest.java
index 9dca47c..f55f43b 100644
--- a/webapp/src/main/java/domainapp/webapp/AppManifest.java
+++ b/webapp/src/main/java/petclinic/webapp/AppManifest.java
@@ -1,4 +1,4 @@
-package domainapp.webapp;
+package petclinic.webapp;
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
@@ -15,10 +15,10 @@ import org.apache.isis.testing.h2console.ui.IsisModuleTestingH2ConsoleUi;
 import org.apache.isis.viewer.restfulobjects.jaxrsresteasy4.IsisModuleViewerRestfulObjectsJaxrsResteasy4;
 import org.apache.isis.viewer.wicket.viewer.IsisModuleViewerWicketViewer;
 
-import domainapp.webapp.application.ApplicationModule;
-import domainapp.webapp.application.fixture.scenarios.DomainAppDemo;
-import domainapp.webapp.custom.CustomModule;
-import domainapp.webapp.quartz.QuartzModule;
+import petclinic.webapp.application.ApplicationModule;
+import petclinic.webapp.application.fixture.scenarios.DomainAppDemo;
+import petclinic.webapp.custom.CustomModule;
+import petclinic.webapp.quartz.QuartzModule;
 
 @Configuration
 @Import({
diff --git a/webapp/src/main/java/domainapp/webapp/PetClinicApp.java b/webapp/src/main/java/petclinic/webapp/PetClinicApp.java
similarity index 96%
rename from webapp/src/main/java/domainapp/webapp/PetClinicApp.java
rename to webapp/src/main/java/petclinic/webapp/PetClinicApp.java
index edb9667..bf1084d 100644
--- a/webapp/src/main/java/domainapp/webapp/PetClinicApp.java
+++ b/webapp/src/main/java/petclinic/webapp/PetClinicApp.java
@@ -1,4 +1,4 @@
-package domainapp.webapp;
+package petclinic.webapp;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/webapp/src/main/java/domainapp/webapp/application/ApplicationModule.java b/webapp/src/main/java/petclinic/webapp/application/ApplicationModule.java
similarity index 89%
rename from webapp/src/main/java/domainapp/webapp/application/ApplicationModule.java
rename to webapp/src/main/java/petclinic/webapp/application/ApplicationModule.java
index 2e09ee6..a41e541 100644
--- a/webapp/src/main/java/domainapp/webapp/application/ApplicationModule.java
+++ b/webapp/src/main/java/petclinic/webapp/application/ApplicationModule.java
@@ -1,4 +1,4 @@
-package domainapp.webapp.application;
+package petclinic.webapp.application;
 
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
diff --git a/webapp/src/main/java/domainapp/webapp/application/fixture/scenarios/DomainAppDemo.java b/webapp/src/main/java/petclinic/webapp/application/fixture/scenarios/DomainAppDemo.java
similarity index 91%
rename from webapp/src/main/java/domainapp/webapp/application/fixture/scenarios/DomainAppDemo.java
rename to webapp/src/main/java/petclinic/webapp/application/fixture/scenarios/DomainAppDemo.java
index 80bcee1..d4ca7b2 100644
--- a/webapp/src/main/java/domainapp/webapp/application/fixture/scenarios/DomainAppDemo.java
+++ b/webapp/src/main/java/petclinic/webapp/application/fixture/scenarios/DomainAppDemo.java
@@ -1,4 +1,4 @@
-package domainapp.webapp.application.fixture.scenarios;
+package petclinic.webapp.application.fixture.scenarios;
 
 import javax.inject.Inject;
 
diff --git a/webapp/src/main/java/domainapp/webapp/application/services/health/HealthCheckServiceImpl.java b/webapp/src/main/java/petclinic/webapp/application/services/health/HealthCheckServiceImpl.java
similarity index 93%
rename from webapp/src/main/java/domainapp/webapp/application/services/health/HealthCheckServiceImpl.java
rename to webapp/src/main/java/petclinic/webapp/application/services/health/HealthCheckServiceImpl.java
index 6916370..e8367d2 100644
--- a/webapp/src/main/java/domainapp/webapp/application/services/health/HealthCheckServiceImpl.java
+++ b/webapp/src/main/java/petclinic/webapp/application/services/health/HealthCheckServiceImpl.java
@@ -1,4 +1,4 @@
-package domainapp.webapp.application.services.health;
+package petclinic.webapp.application.services.health;
 
 import javax.inject.Inject;
 import javax.inject.Named;
diff --git a/webapp/src/main/java/domainapp/webapp/application/services/homepage/HomePageViewModel.java b/webapp/src/main/java/petclinic/webapp/application/services/homepage/HomePageViewModel.java
similarity index 93%
rename from webapp/src/main/java/domainapp/webapp/application/services/homepage/HomePageViewModel.java
rename to webapp/src/main/java/petclinic/webapp/application/services/homepage/HomePageViewModel.java
index 5b10a47..f863002 100644
--- a/webapp/src/main/java/domainapp/webapp/application/services/homepage/HomePageViewModel.java
+++ b/webapp/src/main/java/petclinic/webapp/application/services/homepage/HomePageViewModel.java
@@ -1,4 +1,4 @@
-package domainapp.webapp.application.services.homepage;
+package petclinic.webapp.application.services.homepage;
 
 import java.util.List;
 
diff --git a/webapp/src/main/java/domainapp/webapp/application/services/homepage/HomePageViewModel.layout.xml b/webapp/src/main/java/petclinic/webapp/application/services/homepage/HomePageViewModel.layout.xml
similarity index 100%
rename from webapp/src/main/java/domainapp/webapp/application/services/homepage/HomePageViewModel.layout.xml
rename to webapp/src/main/java/petclinic/webapp/application/services/homepage/HomePageViewModel.layout.xml
diff --git a/webapp/src/main/java/domainapp/webapp/application/services/homepage/HomePageViewModel.png b/webapp/src/main/java/petclinic/webapp/application/services/homepage/HomePageViewModel.png
similarity index 100%
rename from webapp/src/main/java/domainapp/webapp/application/services/homepage/HomePageViewModel.png
rename to webapp/src/main/java/petclinic/webapp/application/services/homepage/HomePageViewModel.png
diff --git a/webapp/src/main/java/domainapp/webapp/custom/CustomModule.java b/webapp/src/main/java/petclinic/webapp/custom/CustomModule.java
similarity index 84%
rename from webapp/src/main/java/domainapp/webapp/custom/CustomModule.java
rename to webapp/src/main/java/petclinic/webapp/custom/CustomModule.java
index 9004096..c7b2224 100644
--- a/webapp/src/main/java/domainapp/webapp/custom/CustomModule.java
+++ b/webapp/src/main/java/petclinic/webapp/custom/CustomModule.java
@@ -1,4 +1,4 @@
-package domainapp.webapp.custom;
+package petclinic.webapp.custom;
 
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
diff --git a/webapp/src/main/java/domainapp/webapp/custom/restapi/CustomController.java b/webapp/src/main/java/petclinic/webapp/custom/restapi/CustomController.java
similarity index 97%
rename from webapp/src/main/java/domainapp/webapp/custom/restapi/CustomController.java
rename to webapp/src/main/java/petclinic/webapp/custom/restapi/CustomController.java
index ef9ad58..6d8a095 100644
--- a/webapp/src/main/java/domainapp/webapp/custom/restapi/CustomController.java
+++ b/webapp/src/main/java/petclinic/webapp/custom/restapi/CustomController.java
@@ -1,4 +1,4 @@
-package domainapp.webapp.custom.restapi;
+package petclinic.webapp.custom.restapi;
 
 import java.util.Collections;
 import java.util.List;
diff --git a/webapp/src/main/java/domainapp/webapp/quartz/QuartzModule.java b/webapp/src/main/java/petclinic/webapp/quartz/QuartzModule.java
similarity index 94%
rename from webapp/src/main/java/domainapp/webapp/quartz/QuartzModule.java
rename to webapp/src/main/java/petclinic/webapp/quartz/QuartzModule.java
index 3220d64..747ba2e 100644
--- a/webapp/src/main/java/domainapp/webapp/quartz/QuartzModule.java
+++ b/webapp/src/main/java/petclinic/webapp/quartz/QuartzModule.java
@@ -1,4 +1,4 @@
-package domainapp.webapp.quartz;
+package petclinic.webapp.quartz;
 
 import org.quartz.JobDetail;
 import org.quartz.SimpleTrigger;
@@ -10,7 +10,7 @@ import org.springframework.scheduling.quartz.SimpleTriggerFactoryBean;
 
 import lombok.val;
 
-import domainapp.webapp.quartz.job.SampleJob;
+import petclinic.webapp.quartz.job.SampleJob;
 
 @Configuration
 @ComponentScan
diff --git a/webapp/src/main/java/domainapp/webapp/quartz/job/SampleJob.java b/webapp/src/main/java/petclinic/webapp/quartz/job/SampleJob.java
similarity index 97%
rename from webapp/src/main/java/domainapp/webapp/quartz/job/SampleJob.java
rename to webapp/src/main/java/petclinic/webapp/quartz/job/SampleJob.java
index d22c301..051d71b 100644
--- a/webapp/src/main/java/domainapp/webapp/quartz/job/SampleJob.java
+++ b/webapp/src/main/java/petclinic/webapp/quartz/job/SampleJob.java
@@ -1,4 +1,4 @@
-package domainapp.webapp.quartz.job;
+package petclinic.webapp.quartz.job;
 
 import java.util.Collections;
 import java.util.List;
diff --git a/webapp/src/main/resources/application.yml b/webapp/src/main/resources/application.yml
index 01efdda..b6c92a8 100644
--- a/webapp/src/main/resources/application.yml
+++ b/webapp/src/main/resources/application.yml
@@ -69,9 +69,9 @@ isis:
   testing:
     fixtures:
       fixture-scripts-specification:
-        context-class: domainapp.webapp.application.fixture.scenarios.DomainAppDemo
-        run-script-default: domainapp.webapp.application.fixture.scenarios.DomainAppDemo
-        recreate: domainapp.webapp.application.fixture.scenarios.DomainAppDemo
+        context-class: petclinic.webapp.application.fixture.scenarios.DomainAppDemo
+        run-script-default: petclinic.webapp.application.fixture.scenarios.DomainAppDemo
+        recreate: petclinic.webapp.application.fixture.scenarios.DomainAppDemo
         non-persisted-objects-strategy: persist
         multiple-execution-strategy: execute
 
diff --git a/webapp/src/main/resources/config/application.properties b/webapp/src/main/resources/config/application.properties
index 87d3d0f..8a6e57b 100644
--- a/webapp/src/main/resources/config/application.properties
+++ b/webapp/src/main/resources/config/application.properties
@@ -26,6 +26,6 @@ eclipselink.application-location=.
 eclipselink.jpa.upper-case-column-names=false
 
 # uncomment to run during bootstrap
-#isis.testing.fixtures.initial-script = domainapp.webapp.application.fixture.scenarios.DomainAppDemo
+#isis.testing.fixtures.initial-script = petclinic.webapp.application.fixture.scenarios.DomainAppDemo

[isis-app-demo] 13/23: renames SimpleObject_persona to PetOwner_persona

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/isis-app-demo.git

commit 1cbb684ad3f1b082f0b2d2b37841c8555c7b4459
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Sep 29 07:03:07 2021 +0100

    renames SimpleObject_persona to PetOwner_persona
---
 .../modules/simple/integtests/tests/PetOwner_IntegTest.java       | 4 ++--
 .../modules/simple/integtests/tests/PetOwners_IntegTest.java      | 8 ++++----
 .../fixture/{SimpleObject_persona.java => PetOwner_persona.java}  | 6 +++---
 .../webapp/application/fixture/scenarios/DomainAppDemo.java       | 4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/module-pets-tests/src/test/java/domainapp/modules/simple/integtests/tests/PetOwner_IntegTest.java b/module-pets-tests/src/test/java/domainapp/modules/simple/integtests/tests/PetOwner_IntegTest.java
index 7fab3b6..f5660dd 100644
--- a/module-pets-tests/src/test/java/domainapp/modules/simple/integtests/tests/PetOwner_IntegTest.java
+++ b/module-pets-tests/src/test/java/domainapp/modules/simple/integtests/tests/PetOwner_IntegTest.java
@@ -12,7 +12,7 @@ import org.apache.isis.applib.services.wrapper.DisabledException;
 import org.apache.isis.applib.services.wrapper.InvalidException;
 
 import domainapp.modules.simple.dom.so.PetOwner;
-import domainapp.modules.simple.fixture.SimpleObject_persona;
+import domainapp.modules.simple.fixture.PetOwner_persona;
 import domainapp.modules.simple.integtests.SimpleModuleIntegTestAbstract;
 
 @Transactional
@@ -23,7 +23,7 @@ public class PetOwner_IntegTest extends SimpleModuleIntegTestAbstract {
     @BeforeEach
     public void setUp() {
         // given
-        petOwner = fixtureScripts.runPersona(SimpleObject_persona.FOO);
+        petOwner = fixtureScripts.runPersona(PetOwner_persona.FOO);
     }
 
 
diff --git a/module-pets-tests/src/test/java/domainapp/modules/simple/integtests/tests/PetOwners_IntegTest.java b/module-pets-tests/src/test/java/domainapp/modules/simple/integtests/tests/PetOwners_IntegTest.java
index 0c15972..b570c58 100644
--- a/module-pets-tests/src/test/java/domainapp/modules/simple/integtests/tests/PetOwners_IntegTest.java
+++ b/module-pets-tests/src/test/java/domainapp/modules/simple/integtests/tests/PetOwners_IntegTest.java
@@ -17,7 +17,7 @@ import org.apache.isis.testing.unittestsupport.applib.matchers.ThrowableMatchers
 
 import domainapp.modules.simple.dom.so.PetOwner;
 import domainapp.modules.simple.dom.so.PetOwners;
-import domainapp.modules.simple.fixture.SimpleObject_persona;
+import domainapp.modules.simple.fixture.PetOwner_persona;
 import domainapp.modules.simple.integtests.SimpleModuleIntegTestAbstract;
 
 @Transactional
@@ -33,14 +33,14 @@ public class PetOwners_IntegTest extends SimpleModuleIntegTestAbstract {
         public void happyCase() {
 
             // given
-            fixtureScripts.run(new SimpleObject_persona.PersistAll());
+            fixtureScripts.run(new PetOwner_persona.PersistAll());
             transactionService.flushTransaction();
 
             // when
             final List<PetOwner> all = wrap(menu).listAll();
 
             // then
-            assertThat(all).hasSize(SimpleObject_persona.values().length);
+            assertThat(all).hasSize(PetOwner_persona.values().length);
         }
 
         @Test
@@ -71,7 +71,7 @@ public class PetOwners_IntegTest extends SimpleModuleIntegTestAbstract {
         public void whenAlreadyExists() {
 
             // given
-            fixtureScripts.runPersona(SimpleObject_persona.FIZZ);
+            fixtureScripts.runPersona(PetOwner_persona.FIZZ);
             transactionService.flushTransaction();
 
             // expect
diff --git a/module-pets/src/main/java/domainapp/modules/simple/fixture/SimpleObject_persona.java b/module-pets/src/main/java/domainapp/modules/simple/fixture/PetOwner_persona.java
similarity index 89%
rename from module-pets/src/main/java/domainapp/modules/simple/fixture/SimpleObject_persona.java
rename to module-pets/src/main/java/domainapp/modules/simple/fixture/PetOwner_persona.java
index f385997..c20b083 100644
--- a/module-pets/src/main/java/domainapp/modules/simple/fixture/SimpleObject_persona.java
+++ b/module-pets/src/main/java/domainapp/modules/simple/fixture/PetOwner_persona.java
@@ -11,7 +11,7 @@ import domainapp.modules.simple.dom.so.PetOwners;
 import lombok.AllArgsConstructor;
 
 @AllArgsConstructor
-public enum SimpleObject_persona
+public enum PetOwner_persona
 implements PersonaWithBuilderScript<SimpleObjectBuilder>, PersonaWithFinder<PetOwner> {
 
     FOO("Foo"),
@@ -39,10 +39,10 @@ implements PersonaWithBuilderScript<SimpleObjectBuilder>, PersonaWithFinder<PetO
     }
 
     public static class PersistAll
-    extends PersonaEnumPersistAll<SimpleObject_persona, PetOwner> {
+    extends PersonaEnumPersistAll<PetOwner_persona, PetOwner> {
 
         public PersistAll() {
-            super(SimpleObject_persona.class);
+            super(PetOwner_persona.class);
         }
     }
 }
diff --git a/webapp/src/main/java/domainapp/webapp/application/fixture/scenarios/DomainAppDemo.java b/webapp/src/main/java/domainapp/webapp/application/fixture/scenarios/DomainAppDemo.java
index 3b18a98..c8a92fa 100644
--- a/webapp/src/main/java/domainapp/webapp/application/fixture/scenarios/DomainAppDemo.java
+++ b/webapp/src/main/java/domainapp/webapp/application/fixture/scenarios/DomainAppDemo.java
@@ -5,14 +5,14 @@ import javax.inject.Inject;
 import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
 import org.apache.isis.testing.fixtures.applib.modules.ModuleWithFixturesService;
 
-import domainapp.modules.simple.fixture.SimpleObject_persona;
+import domainapp.modules.simple.fixture.PetOwner_persona;
 
 public class DomainAppDemo extends FixtureScript {
 
     @Override
     protected void execute(final ExecutionContext ec) {
         ec.executeChildren(this, moduleWithFixturesService.getTeardownFixture());
-        ec.executeChild(this, new SimpleObject_persona.PersistAll());
+        ec.executeChild(this, new PetOwner_persona.PersistAll());
     }
 
     @Inject ModuleWithFixturesService moduleWithFixturesService;

[isis-app-demo] 14/23: renames SimpleObjectBuilder to PetOwnerBuilder

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/isis-app-demo.git

commit fdbb6abdd71f0b4f59abeeba91d94003446f2da7
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Sep 29 07:03:44 2021 +0100

    renames SimpleObjectBuilder to PetOwnerBuilder
---
 .../fixture/{SimpleObjectBuilder.java => PetOwnerBuilder.java}      | 2 +-
 .../java/domainapp/modules/simple/fixture/PetOwner_persona.java     | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/module-pets/src/main/java/domainapp/modules/simple/fixture/SimpleObjectBuilder.java b/module-pets/src/main/java/domainapp/modules/simple/fixture/PetOwnerBuilder.java
similarity index 89%
rename from module-pets/src/main/java/domainapp/modules/simple/fixture/SimpleObjectBuilder.java
rename to module-pets/src/main/java/domainapp/modules/simple/fixture/PetOwnerBuilder.java
index dcf5c94..e85b2b9 100644
--- a/module-pets/src/main/java/domainapp/modules/simple/fixture/SimpleObjectBuilder.java
+++ b/module-pets/src/main/java/domainapp/modules/simple/fixture/PetOwnerBuilder.java
@@ -12,7 +12,7 @@ import lombok.Setter;
 import lombok.experimental.Accessors;
 
 @Accessors(chain = true)
-public class SimpleObjectBuilder extends BuilderScriptWithResult<PetOwner> {
+public class PetOwnerBuilder extends BuilderScriptWithResult<PetOwner> {
 
     @Getter @Setter
     private String name;
diff --git a/module-pets/src/main/java/domainapp/modules/simple/fixture/PetOwner_persona.java b/module-pets/src/main/java/domainapp/modules/simple/fixture/PetOwner_persona.java
index c20b083..63b66bc 100644
--- a/module-pets/src/main/java/domainapp/modules/simple/fixture/PetOwner_persona.java
+++ b/module-pets/src/main/java/domainapp/modules/simple/fixture/PetOwner_persona.java
@@ -12,7 +12,7 @@ import lombok.AllArgsConstructor;
 
 @AllArgsConstructor
 public enum PetOwner_persona
-implements PersonaWithBuilderScript<SimpleObjectBuilder>, PersonaWithFinder<PetOwner> {
+implements PersonaWithBuilderScript<PetOwnerBuilder>, PersonaWithFinder<PetOwner> {
 
     FOO("Foo"),
     BAR("Bar"),
@@ -28,8 +28,8 @@ implements PersonaWithBuilderScript<SimpleObjectBuilder>, PersonaWithFinder<PetO
     private final String name;
 
     @Override
-    public SimpleObjectBuilder builder() {
-        return new SimpleObjectBuilder().setName(name);
+    public PetOwnerBuilder builder() {
+        return new PetOwnerBuilder().setName(name);
     }
 
     @Override

[isis-app-demo] 02/23: renames module-simple dir to module-pets-dir, same for tests

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/isis-app-demo.git

commit e9c530841d19af2042cb8ce869c4849c4774f320
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Sep 29 06:33:47 2021 +0100

    renames module-simple dir to module-pets-dir, same for tests
---
 {module-simple => module-pets-tests}/.gitignore             |   0
 {module-simple-tests => module-pets-tests}/log4j2-test.xml  |   0
 {module-simple-tests => module-pets-tests}/pom.xml          |   0
 .../domainapp/modules/simple/dom/so/SimpleObject_Test.java  |   0
 .../domainapp/modules/simple/dom/so/SimpleObjects_Test.java |   0
 .../simple/integtests/SimpleModuleIntegTestAbstract.java    |   0
 .../simple/integtests/tests/SimpleObject_IntegTest.java     |   0
 .../simple/integtests/tests/SimpleObjects_IntegTest.java    |   0
 .../src/test/resources/application-test.yml                 |   0
 {module-simple-tests => module-pets}/.gitignore             |   0
 {module-simple => module-pets}/pom.xml                      |   0
 .../main/java/domainapp/modules/simple/SimpleModule.java    |   0
 .../simple/dom/so/SimpleObject#others.columnOrder.txt       |   0
 .../modules/simple/dom/so/SimpleObject.columnOrder.txt      |   0
 .../java/domainapp/modules/simple/dom/so/SimpleObject.java  |   0
 .../domainapp/modules/simple/dom/so/SimpleObject.layout.xml |   0
 .../java/domainapp/modules/simple/dom/so/SimpleObject.png   | Bin
 .../modules/simple/dom/so/SimpleObjectRepository.java       |   0
 .../java/domainapp/modules/simple/dom/so/SimpleObjects.java |   0
 .../modules/simple/fixture/SimpleObjectBuilder.java         |   0
 .../modules/simple/fixture/SimpleObject_persona.java        |   0
 .../src/main/java/domainapp/modules/simple/types/Name.java  |   0
 .../src/main/java/domainapp/modules/simple/types/Notes.java |   0
 pom.xml                                                     |   4 ++--
 24 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/module-simple/.gitignore b/module-pets-tests/.gitignore
similarity index 100%
rename from module-simple/.gitignore
rename to module-pets-tests/.gitignore
diff --git a/module-simple-tests/log4j2-test.xml b/module-pets-tests/log4j2-test.xml
similarity index 100%
rename from module-simple-tests/log4j2-test.xml
rename to module-pets-tests/log4j2-test.xml
diff --git a/module-simple-tests/pom.xml b/module-pets-tests/pom.xml
similarity index 100%
rename from module-simple-tests/pom.xml
rename to module-pets-tests/pom.xml
diff --git a/module-simple-tests/src/test/java/domainapp/modules/simple/dom/so/SimpleObject_Test.java b/module-pets-tests/src/test/java/domainapp/modules/simple/dom/so/SimpleObject_Test.java
similarity index 100%
rename from module-simple-tests/src/test/java/domainapp/modules/simple/dom/so/SimpleObject_Test.java
rename to module-pets-tests/src/test/java/domainapp/modules/simple/dom/so/SimpleObject_Test.java
diff --git a/module-simple-tests/src/test/java/domainapp/modules/simple/dom/so/SimpleObjects_Test.java b/module-pets-tests/src/test/java/domainapp/modules/simple/dom/so/SimpleObjects_Test.java
similarity index 100%
rename from module-simple-tests/src/test/java/domainapp/modules/simple/dom/so/SimpleObjects_Test.java
rename to module-pets-tests/src/test/java/domainapp/modules/simple/dom/so/SimpleObjects_Test.java
diff --git a/module-simple-tests/src/test/java/domainapp/modules/simple/integtests/SimpleModuleIntegTestAbstract.java b/module-pets-tests/src/test/java/domainapp/modules/simple/integtests/SimpleModuleIntegTestAbstract.java
similarity index 100%
rename from module-simple-tests/src/test/java/domainapp/modules/simple/integtests/SimpleModuleIntegTestAbstract.java
rename to module-pets-tests/src/test/java/domainapp/modules/simple/integtests/SimpleModuleIntegTestAbstract.java
diff --git a/module-simple-tests/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObject_IntegTest.java b/module-pets-tests/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObject_IntegTest.java
similarity index 100%
rename from module-simple-tests/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObject_IntegTest.java
rename to module-pets-tests/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObject_IntegTest.java
diff --git a/module-simple-tests/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObjects_IntegTest.java b/module-pets-tests/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObjects_IntegTest.java
similarity index 100%
rename from module-simple-tests/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObjects_IntegTest.java
rename to module-pets-tests/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObjects_IntegTest.java
diff --git a/module-simple-tests/src/test/resources/application-test.yml b/module-pets-tests/src/test/resources/application-test.yml
similarity index 100%
rename from module-simple-tests/src/test/resources/application-test.yml
rename to module-pets-tests/src/test/resources/application-test.yml
diff --git a/module-simple-tests/.gitignore b/module-pets/.gitignore
similarity index 100%
rename from module-simple-tests/.gitignore
rename to module-pets/.gitignore
diff --git a/module-simple/pom.xml b/module-pets/pom.xml
similarity index 100%
rename from module-simple/pom.xml
rename to module-pets/pom.xml
diff --git a/module-simple/src/main/java/domainapp/modules/simple/SimpleModule.java b/module-pets/src/main/java/domainapp/modules/simple/SimpleModule.java
similarity index 100%
rename from module-simple/src/main/java/domainapp/modules/simple/SimpleModule.java
rename to module-pets/src/main/java/domainapp/modules/simple/SimpleModule.java
diff --git a/module-simple/src/main/java/domainapp/modules/simple/dom/so/SimpleObject#others.columnOrder.txt b/module-pets/src/main/java/domainapp/modules/simple/dom/so/SimpleObject#others.columnOrder.txt
similarity index 100%
rename from module-simple/src/main/java/domainapp/modules/simple/dom/so/SimpleObject#others.columnOrder.txt
rename to module-pets/src/main/java/domainapp/modules/simple/dom/so/SimpleObject#others.columnOrder.txt
diff --git a/module-simple/src/main/java/domainapp/modules/simple/dom/so/SimpleObject.columnOrder.txt b/module-pets/src/main/java/domainapp/modules/simple/dom/so/SimpleObject.columnOrder.txt
similarity index 100%
rename from module-simple/src/main/java/domainapp/modules/simple/dom/so/SimpleObject.columnOrder.txt
rename to module-pets/src/main/java/domainapp/modules/simple/dom/so/SimpleObject.columnOrder.txt
diff --git a/module-simple/src/main/java/domainapp/modules/simple/dom/so/SimpleObject.java b/module-pets/src/main/java/domainapp/modules/simple/dom/so/SimpleObject.java
similarity index 100%
rename from module-simple/src/main/java/domainapp/modules/simple/dom/so/SimpleObject.java
rename to module-pets/src/main/java/domainapp/modules/simple/dom/so/SimpleObject.java
diff --git a/module-simple/src/main/java/domainapp/modules/simple/dom/so/SimpleObject.layout.xml b/module-pets/src/main/java/domainapp/modules/simple/dom/so/SimpleObject.layout.xml
similarity index 100%
rename from module-simple/src/main/java/domainapp/modules/simple/dom/so/SimpleObject.layout.xml
rename to module-pets/src/main/java/domainapp/modules/simple/dom/so/SimpleObject.layout.xml
diff --git a/module-simple/src/main/java/domainapp/modules/simple/dom/so/SimpleObject.png b/module-pets/src/main/java/domainapp/modules/simple/dom/so/SimpleObject.png
similarity index 100%
rename from module-simple/src/main/java/domainapp/modules/simple/dom/so/SimpleObject.png
rename to module-pets/src/main/java/domainapp/modules/simple/dom/so/SimpleObject.png
diff --git a/module-simple/src/main/java/domainapp/modules/simple/dom/so/SimpleObjectRepository.java b/module-pets/src/main/java/domainapp/modules/simple/dom/so/SimpleObjectRepository.java
similarity index 100%
rename from module-simple/src/main/java/domainapp/modules/simple/dom/so/SimpleObjectRepository.java
rename to module-pets/src/main/java/domainapp/modules/simple/dom/so/SimpleObjectRepository.java
diff --git a/module-simple/src/main/java/domainapp/modules/simple/dom/so/SimpleObjects.java b/module-pets/src/main/java/domainapp/modules/simple/dom/so/SimpleObjects.java
similarity index 100%
rename from module-simple/src/main/java/domainapp/modules/simple/dom/so/SimpleObjects.java
rename to module-pets/src/main/java/domainapp/modules/simple/dom/so/SimpleObjects.java
diff --git a/module-simple/src/main/java/domainapp/modules/simple/fixture/SimpleObjectBuilder.java b/module-pets/src/main/java/domainapp/modules/simple/fixture/SimpleObjectBuilder.java
similarity index 100%
rename from module-simple/src/main/java/domainapp/modules/simple/fixture/SimpleObjectBuilder.java
rename to module-pets/src/main/java/domainapp/modules/simple/fixture/SimpleObjectBuilder.java
diff --git a/module-simple/src/main/java/domainapp/modules/simple/fixture/SimpleObject_persona.java b/module-pets/src/main/java/domainapp/modules/simple/fixture/SimpleObject_persona.java
similarity index 100%
rename from module-simple/src/main/java/domainapp/modules/simple/fixture/SimpleObject_persona.java
rename to module-pets/src/main/java/domainapp/modules/simple/fixture/SimpleObject_persona.java
diff --git a/module-simple/src/main/java/domainapp/modules/simple/types/Name.java b/module-pets/src/main/java/domainapp/modules/simple/types/Name.java
similarity index 100%
rename from module-simple/src/main/java/domainapp/modules/simple/types/Name.java
rename to module-pets/src/main/java/domainapp/modules/simple/types/Name.java
diff --git a/module-simple/src/main/java/domainapp/modules/simple/types/Notes.java b/module-pets/src/main/java/domainapp/modules/simple/types/Notes.java
similarity index 100%
rename from module-simple/src/main/java/domainapp/modules/simple/types/Notes.java
rename to module-pets/src/main/java/domainapp/modules/simple/types/Notes.java
diff --git a/pom.xml b/pom.xml
index a8bb155..80b271c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,8 +67,8 @@
     </dependencies>
 
     <modules>
-        <module>module-simple</module>
-        <module>module-simple-tests</module>
+        <module>module-pets</module>
+        <module>module-pets-tests</module>
         <module>webapp</module>
         <module>webapp-tests</module>
     </modules>

[isis-app-demo] 01/23: renames groupId and artifactI

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/isis-app-demo.git

commit b05c988dec4bd9e50d63e461ec06df396348656c
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Sep 29 06:32:39 2021 +0100

    renames groupId and artifactI
---
 module-simple-tests/pom.xml |  8 ++++----
 module-simple/pom.xml       |  6 +++---
 pom.xml                     | 12 ++++++------
 webapp-tests/pom.xml        |  8 ++++----
 webapp/pom.xml              |  8 ++++----
 5 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/module-simple-tests/pom.xml b/module-simple-tests/pom.xml
index 93a3504..7b11bb5 100644
--- a/module-simple-tests/pom.xml
+++ b/module-simple-tests/pom.xml
@@ -5,12 +5,12 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.isis.starters</groupId>
-        <artifactId>simpleapp-jpa</artifactId>
+        <groupId>org.apache.isis.tutorials</groupId>
+        <artifactId>petclinic</artifactId>
         <version>1.0.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>simpleapp-jpa-module-simple-tests</artifactId>
+    <artifactId>petclinic-module-pets-tests</artifactId>
     <name>SimpleApp (JPA) - Simple Module (tests)</name>
 
     <description>
@@ -39,7 +39,7 @@
 
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>simpleapp-jpa-module-simple</artifactId>
+            <artifactId>petclinic-module-pets</artifactId>
         </dependency>
 
         <!-- TESTS -->
diff --git a/module-simple/pom.xml b/module-simple/pom.xml
index d295539..3252d95 100644
--- a/module-simple/pom.xml
+++ b/module-simple/pom.xml
@@ -5,12 +5,12 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.isis.starters</groupId>
-        <artifactId>simpleapp-jpa</artifactId>
+        <groupId>org.apache.isis.tutorials</groupId>
+        <artifactId>petclinic</artifactId>
         <version>1.0.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>simpleapp-jpa-module-simple</artifactId>
+    <artifactId>petclinic-module-pets</artifactId>
     <name>SimpleApp (JPA) - Simple Module</name>
 
     <build>
diff --git a/pom.xml b/pom.xml
index f35ab68..a8bb155 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,8 +10,8 @@
         <relativePath/>
     </parent>
 
-    <groupId>org.apache.isis.starters</groupId>
-    <artifactId>simpleapp-jpa</artifactId>
+    <groupId>org.apache.isis.tutorials</groupId>
+    <artifactId>petclinic</artifactId>
     <version>1.0.0-SNAPSHOT</version>
 
     <name>SimpleApp (JPA) - Parent</name>
@@ -32,24 +32,24 @@
             <!-- this project's own modules -->
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>simpleapp-jpa-module-simple</artifactId>
+                <artifactId>petclinic-module-pets</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>simpleapp-jpa-module-simple-tests</artifactId>
+                <artifactId>petclinic-module-pets-tests</artifactId>
                 <version>${project.version}</version>
                 <scope>test</scope>
                 <type>test-jar</type>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>simpleapp-jpa-webapp</artifactId>
+                <artifactId>petclinic-webapp</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>simpleapp-jpa-webapp-tests</artifactId>
+                <artifactId>petclinic-webapp-tests</artifactId>
                 <version>${project.version}</version>
                 <scope>test</scope>
                 <type>test-jar</type>
diff --git a/webapp-tests/pom.xml b/webapp-tests/pom.xml
index 6110fb2..f8ae122 100644
--- a/webapp-tests/pom.xml
+++ b/webapp-tests/pom.xml
@@ -3,12 +3,12 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.isis.starters</groupId>
-        <artifactId>simpleapp-jpa</artifactId>
+        <groupId>org.apache.isis.tutorials</groupId>
+        <artifactId>petclinic</artifactId>
         <version>1.0.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>simpleapp-jpa-webapp-tests</artifactId>
+    <artifactId>petclinic-webapp-tests</artifactId>
     <name>SimpleApp (JPA) - Webapp (tests)</name>
 
     <description>
@@ -36,7 +36,7 @@
 
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>simpleapp-jpa-webapp</artifactId>
+            <artifactId>petclinic-webapp</artifactId>
             <scope>test</scope>
         </dependency>
 
diff --git a/webapp/pom.xml b/webapp/pom.xml
index edc9b65..4fb3117 100644
--- a/webapp/pom.xml
+++ b/webapp/pom.xml
@@ -3,12 +3,12 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.isis.starters</groupId>
-        <artifactId>simpleapp-jpa</artifactId>
+        <groupId>org.apache.isis.tutorials</groupId>
+        <artifactId>petclinic</artifactId>
         <version>1.0.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>simpleapp-jpa-webapp</artifactId>
+    <artifactId>petclinic-webapp</artifactId>
     <name>SimpleApp (JPA) - Webapp</name>
 
     <description>
@@ -58,7 +58,7 @@
 
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>simpleapp-jpa-module-simple</artifactId>
+            <artifactId>petclinic-module-pets</artifactId>
         </dependency>
 
         <!-- isis -->

[isis-app-demo] 12/23: renames SimpleObjectRepository to PetOwnerRepository

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/isis-app-demo.git

commit 990fa3df9cf8f546d881236196e1d568157851e3
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Sep 29 07:02:16 2021 +0100

    renames SimpleObjectRepository to PetOwnerRepository
---
 .../test/java/domainapp/modules/simple/dom/so/PetOwners_Test.java | 6 +++---
 .../so/{SimpleObjectRepository.java => PetOwnerRepository.java}   | 2 +-
 .../src/main/java/domainapp/modules/simple/dom/so/PetOwners.java  | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/module-pets-tests/src/test/java/domainapp/modules/simple/dom/so/PetOwners_Test.java b/module-pets-tests/src/test/java/domainapp/modules/simple/dom/so/PetOwners_Test.java
index a18d82c..31f61bc 100644
--- a/module-pets-tests/src/test/java/domainapp/modules/simple/dom/so/PetOwners_Test.java
+++ b/module-pets-tests/src/test/java/domainapp/modules/simple/dom/so/PetOwners_Test.java
@@ -25,13 +25,13 @@ class PetOwners_Test {
 
     @Mock RepositoryService mockRepositoryService;
     @Mock JpaSupportService mockJpaSupportService;
-    @Mock SimpleObjectRepository mockSimpleObjectRepository;
+    @Mock PetOwnerRepository mockPetOwnerRepository;
 
     PetOwners objects;
 
     @BeforeEach
     public void setUp() {
-        objects = new PetOwners(mockRepositoryService, mockJpaSupportService, mockSimpleObjectRepository);
+        objects = new PetOwners(mockRepositoryService, mockJpaSupportService, mockPetOwnerRepository);
     }
 
     @Nested
@@ -67,7 +67,7 @@ class PetOwners_Test {
             final List<PetOwner> all = new ArrayList<>();
 
             // expecting
-            when(mockSimpleObjectRepository.findAll())
+            when(mockPetOwnerRepository.findAll())
                 .thenReturn(all);
 
             // when
diff --git a/module-pets/src/main/java/domainapp/modules/simple/dom/so/SimpleObjectRepository.java b/module-pets/src/main/java/domainapp/modules/simple/dom/so/PetOwnerRepository.java
similarity index 74%
rename from module-pets/src/main/java/domainapp/modules/simple/dom/so/SimpleObjectRepository.java
rename to module-pets/src/main/java/domainapp/modules/simple/dom/so/PetOwnerRepository.java
index c0b7fe7..63eb33d 100644
--- a/module-pets/src/main/java/domainapp/modules/simple/dom/so/SimpleObjectRepository.java
+++ b/module-pets/src/main/java/domainapp/modules/simple/dom/so/PetOwnerRepository.java
@@ -4,7 +4,7 @@ import java.util.List;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 
-public interface SimpleObjectRepository extends JpaRepository<PetOwner, Long> {
+public interface PetOwnerRepository extends JpaRepository<PetOwner, Long> {
 
     List<PetOwner> findByNameContaining(final String name);
 
diff --git a/module-pets/src/main/java/domainapp/modules/simple/dom/so/PetOwners.java b/module-pets/src/main/java/domainapp/modules/simple/dom/so/PetOwners.java
index bbbe161..b473ad2 100644
--- a/module-pets/src/main/java/domainapp/modules/simple/dom/so/PetOwners.java
+++ b/module-pets/src/main/java/domainapp/modules/simple/dom/so/PetOwners.java
@@ -30,7 +30,7 @@ public class PetOwners {
 
     final RepositoryService repositoryService;
     final JpaSupportService jpaSupportService;
-    final SimpleObjectRepository simpleObjectRepository;
+    final PetOwnerRepository petOwnerRepository;
 
 
     @Action(semantics = SemanticsOf.NON_IDEMPOTENT)
@@ -56,13 +56,13 @@ public class PetOwners {
     public List<PetOwner> findByName(
             @Name final String name
             ) {
-        return simpleObjectRepository.findByNameContaining(name);
+        return petOwnerRepository.findByNameContaining(name);
     }
 
 
     @Programmatic
     public PetOwner findByNameExact(final String name) {
-        return simpleObjectRepository.findByName(name);
+        return petOwnerRepository.findByName(name);
     }
 
 
@@ -70,7 +70,7 @@ public class PetOwners {
     @Action(semantics = SemanticsOf.SAFE)
     @ActionLayout(bookmarking = BookmarkPolicy.AS_ROOT)
     public List<PetOwner> listAll() {
-        return simpleObjectRepository.findAll();
+        return petOwnerRepository.findAll();
     }

[isis-app-demo] 20/23: renames packages in webapp-tests module

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/isis-app-demo.git

commit 7485f548c8cac00d523dcc05a1e812214d6d6a50
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Sep 29 07:14:53 2021 +0100

    renames packages in webapp-tests module
---
 .../webapp/integtests/WebAppIntegTestAbstract.java                    | 2 +-
 .../webapp/integtests/metamodel/SwaggerExport_IntegTest.java          | 4 ++--
 .../webapp/integtests/metamodel/ValidateDomainModel_IntegTest.java    | 4 ++--
 .../webapp/integtests/smoke/Smoke_IntegTest.java                      | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/webapp-tests/src/test/java/domainapp/webapp/integtests/WebAppIntegTestAbstract.java b/webapp-tests/src/test/java/petclinic/webapp/integtests/WebAppIntegTestAbstract.java
similarity index 98%
rename from webapp-tests/src/test/java/domainapp/webapp/integtests/WebAppIntegTestAbstract.java
rename to webapp-tests/src/test/java/petclinic/webapp/integtests/WebAppIntegTestAbstract.java
index a97f236..ba9ea41 100644
--- a/webapp-tests/src/test/java/domainapp/webapp/integtests/WebAppIntegTestAbstract.java
+++ b/webapp-tests/src/test/java/petclinic/webapp/integtests/WebAppIntegTestAbstract.java
@@ -1,4 +1,4 @@
-package domainapp.webapp.integtests;
+package petclinic.webapp.integtests;
 
 import org.springframework.boot.SpringBootConfiguration;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
diff --git a/webapp-tests/src/test/java/domainapp/webapp/integtests/metamodel/SwaggerExport_IntegTest.java b/webapp-tests/src/test/java/petclinic/webapp/integtests/metamodel/SwaggerExport_IntegTest.java
similarity index 90%
rename from webapp-tests/src/test/java/domainapp/webapp/integtests/metamodel/SwaggerExport_IntegTest.java
rename to webapp-tests/src/test/java/petclinic/webapp/integtests/metamodel/SwaggerExport_IntegTest.java
index d2b345d..c2b9ace 100644
--- a/webapp-tests/src/test/java/domainapp/webapp/integtests/metamodel/SwaggerExport_IntegTest.java
+++ b/webapp-tests/src/test/java/petclinic/webapp/integtests/metamodel/SwaggerExport_IntegTest.java
@@ -1,4 +1,4 @@
-package domainapp.webapp.integtests.metamodel;
+package petclinic.webapp.integtests.metamodel;
 
 import java.io.IOException;
 
@@ -16,7 +16,7 @@ import org.apache.isis.viewer.restfulobjects.jaxrsresteasy4.IsisModuleViewerRest
 
 import lombok.val;
 
-import domainapp.webapp.integtests.WebAppIntegTestAbstract;
+import petclinic.webapp.integtests.WebAppIntegTestAbstract;
 
 @Import({
         IsisModuleViewerRestfulObjectsJaxrsResteasy4.class
diff --git a/webapp-tests/src/test/java/domainapp/webapp/integtests/metamodel/ValidateDomainModel_IntegTest.java b/webapp-tests/src/test/java/petclinic/webapp/integtests/metamodel/ValidateDomainModel_IntegTest.java
similarity index 80%
rename from webapp-tests/src/test/java/domainapp/webapp/integtests/metamodel/ValidateDomainModel_IntegTest.java
rename to webapp-tests/src/test/java/petclinic/webapp/integtests/metamodel/ValidateDomainModel_IntegTest.java
index 84b9b0c..2a36424 100644
--- a/webapp-tests/src/test/java/domainapp/webapp/integtests/metamodel/ValidateDomainModel_IntegTest.java
+++ b/webapp-tests/src/test/java/petclinic/webapp/integtests/metamodel/ValidateDomainModel_IntegTest.java
@@ -1,4 +1,4 @@
-package domainapp.webapp.integtests.metamodel;
+package petclinic.webapp.integtests.metamodel;
 
 import javax.inject.Inject;
 
@@ -7,7 +7,7 @@ import org.junit.jupiter.api.Test;
 import org.apache.isis.applib.services.registry.ServiceRegistry;
 import org.apache.isis.testing.integtestsupport.applib.validate.DomainModelValidator;
 
-import domainapp.webapp.integtests.WebAppIntegTestAbstract;
+import petclinic.webapp.integtests.WebAppIntegTestAbstract;
 
 class ValidateDomainModel_IntegTest extends WebAppIntegTestAbstract {
 
diff --git a/webapp-tests/src/test/java/domainapp/webapp/integtests/smoke/Smoke_IntegTest.java b/webapp-tests/src/test/java/petclinic/webapp/integtests/smoke/Smoke_IntegTest.java
similarity index 95%
rename from webapp-tests/src/test/java/domainapp/webapp/integtests/smoke/Smoke_IntegTest.java
rename to webapp-tests/src/test/java/petclinic/webapp/integtests/smoke/Smoke_IntegTest.java
index 60d1a96..018a5e7 100644
--- a/webapp-tests/src/test/java/domainapp/webapp/integtests/smoke/Smoke_IntegTest.java
+++ b/webapp-tests/src/test/java/petclinic/webapp/integtests/smoke/Smoke_IntegTest.java
@@ -1,4 +1,4 @@
-package domainapp.webapp.integtests.smoke;
+package petclinic.webapp.integtests.smoke;
 
 import java.util.List;
 
@@ -14,7 +14,7 @@ import org.apache.isis.applib.services.xactn.TransactionService;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import petclinic.modules.pets.dom.petowner.PetOwner;
-import domainapp.webapp.integtests.WebAppIntegTestAbstract;
+import petclinic.webapp.integtests.WebAppIntegTestAbstract;
 import petclinic.modules.pets.dom.petowner.PetOwners;
 
 @Transactional

[isis-app-demo] 08/23: changes PetOwner uniqueness constraint

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/isis-app-demo.git

commit 94a17654116407cdeaffc3da589a3ff0b5b8d08f
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Sep 29 06:50:58 2021 +0100

    changes PetOwner uniqueness constraint
---
 module-pets/src/main/java/domainapp/modules/simple/dom/so/PetOwner.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module-pets/src/main/java/domainapp/modules/simple/dom/so/PetOwner.java b/module-pets/src/main/java/domainapp/modules/simple/dom/so/PetOwner.java
index 2b553a6..e179dd7 100644
--- a/module-pets/src/main/java/domainapp/modules/simple/dom/so/PetOwner.java
+++ b/module-pets/src/main/java/domainapp/modules/simple/dom/so/PetOwner.java
@@ -38,7 +38,7 @@ import domainapp.modules.simple.types.Notes;
 @javax.persistence.Table(
     schema="pets",
     uniqueConstraints = {
-        @javax.persistence.UniqueConstraint(name = "SimpleObject__name__UNQ", columnNames = {"NAME"})
+        @javax.persistence.UniqueConstraint(name = "PetOwner__name__UNQ", columnNames = {"NAME"})
     }
 )
 @javax.persistence.NamedQueries({

[isis-app-demo] 06/23: changes PetOwner schema to 'pets'

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/isis-app-demo.git

commit 0a0f465de8e337554f950d9c723344e0f66902b1
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Sep 29 06:50:30 2021 +0100

    changes PetOwner schema to 'pets'
---
 module-pets/src/main/java/domainapp/modules/simple/dom/so/PetOwner.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module-pets/src/main/java/domainapp/modules/simple/dom/so/PetOwner.java b/module-pets/src/main/java/domainapp/modules/simple/dom/so/PetOwner.java
index fb2d8c3..2b553a6 100644
--- a/module-pets/src/main/java/domainapp/modules/simple/dom/so/PetOwner.java
+++ b/module-pets/src/main/java/domainapp/modules/simple/dom/so/PetOwner.java
@@ -36,7 +36,7 @@ import domainapp.modules.simple.types.Notes;
 
 @javax.persistence.Entity
 @javax.persistence.Table(
-    schema="simple",
+    schema="pets",
     uniqueConstraints = {
         @javax.persistence.UniqueConstraint(name = "SimpleObject__name__UNQ", columnNames = {"NAME"})
     }

[isis-app-demo] 23/23: updates and slims down the README

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/isis-app-demo.git

commit 77982d593fd4a57451ee65df1918e98a1f10795e
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Sep 29 07:20:36 2021 +0100

    updates and slims down the README
---
 README.adoc | 213 +-----------------------------------------------------------
 1 file changed, 3 insertions(+), 210 deletions(-)

diff --git a/README.adoc b/README.adoc
index f17e6d0..7d17721 100644
--- a/README.adoc
+++ b/README.adoc
@@ -1,37 +1,15 @@
-= SimpleApp
+= PetClinic
 :toc:
 :toc-placement!:
 
-image:https://github.com/apache/isis-app-simpleapp/workflows/Build%20w/%20Maven%20+%20Jdk%208/badge.svg[]
-image:https://github.com/apache/isis-app-simpleapp/workflows/Build%20w/%20Maven%20+%20Jdk%2015/badge.svg[]
-
-This is a simple link:http://isis.apache.org[Apache Isis] application, structured so it can be used as a starting point for developing your own applications.
-
-[TIP]
-====
-If all you want is get a feel for what the framework is all about, then take a look at the link:https://github.com/apache/isis-app-helloworld[HelloWorld] starter app, which is even simpler.
-====
-
-toc::[]
+This is the PetClinic app, implemented as a simple link:http://isis.apache.org[Apache Isis] application.
 
 == Quick start
 
 * install prereqs:
 
-** Java 8 LTS (eg link:https://adoptopenjdk.net/[Adopt OpenJDK] distribution)
+** Java 11 LTS (eg link:https://adoptopenjdk.net/[Adopt OpenJDK] distribution)
 ** Maven 3.6 or later (http://maven.apache.org/download.cgi[download])
-* download and unzip
-+
-[source,bash]
-----
-APP=simpleapp
-BRANCH=master
-
-REPO=isis-app-$APP
-curl "https://codeload.github.com/apache/$REPO/zip/$BRANCH" | jar xv
-mv $REPO-$BRANCH $REPO
-cd $REPO
-----
 
 * Build using Maven:
 +
@@ -57,188 +35,3 @@ mvn -pl webapp spring-boot:run
 +
 The app runs with H2 running in-memory, with sample data set up using fixture scripts.
 
-* Build a Docker image
-+
-[source,bash]
-----
-export REVISION=...                 #<.>
-export DOCKER_REGISTRY_USERNAME     #<.>
-export DOCKER_REGISTRY_PASSWORD     #<.>
-
-mvn -pl webapp jib:build
-----
-<.> used as the image tag
-<.> Docker Hub registry username
-<.> Docker Hub registry password
-+
-To push to another container registry, change the `<image>` tag in the pom.xml
-
-== Application Structure
-
-The following table explains the contents of each of the directories:
-
-[width="100%",options="header,footer",stripes="none",cols="2a,4a"]
-|====================
-|Directory
-|Description
-
-|`module-simple`
-|Holds the "simple" module, consisting of the `PetOwner` entity and supporting services.
-It also contains module-specific unit- and integration tests.
-
-[TIP]
-====
-Larger applications should consist of multiple modules; each such module can be copied from this starter module.
-====
-
-|`webapp`
-|Holds the bootstrapping classes, along with application-level scoped services and home page.
-It also contains application-wide integration tests/BDD specs, and lockdown tests.
-
-The `pom.xml` also provides goals to run the app from the command line, or to be assembled into a Docker image.
-
-|====================
-
-
-== Development
-
-Apache Isis uses DataNucleus as its ORM, which requires that any entities are "enhanced", a post-compile process.
-
-Normally this is done as part of a "mvn clean install", but the entities can also be enhanced explicity using:
-
-[source,bash]
-----
-mvn -pl module-simple datanucleus:enhance -o
-----
-
-This is useful to know if the application or integration test fails to bootstrap, complaining of "unenhanced entities".
-
-TIP: You can also use `enhance-all.sh`
-
-
-== Testing
-
-The application has three types of tests.
-Each of these generates its own set of tests, and each can be disabled through a system property.
-
-.Testing types
-[cols="5a,12a,6a,3a", options="header"]
-|===
-
-| Test type
-| Report
-| Phase
-| Skip using
-
-
-| Unit test
-| `target/surefire-unittest-reports`
-| `test`
-| `-DskipUTs`
-
-| Integ test
-| `target/surefire-integtest-reports`
-| `integration-test`
-| `-DskipITs`
-
-| BDD (Cucumber) specs
-| `target/surefire-integbddspecs-reports` and +
-`target/cucumber-html-reports/overview-features.html`
-
-| `integration-test`
-| `-DskipBS`
-
-
-|===
-
-
-These outputs can for example be processed within/published by a continuous pipeline pipeline.
-
-
-=== Lockdown Tests
-
-Lockdown tests capture the state of the system, so that changes to that system can be captured and confirmed.
-There are two lockdown tests:
-
-* the metamodel (serialized as XML)
-+
-This is expected to change whenever the domain logic is changed, but generally should _not_ change when the Apache Isis framework is upgraded.
-
-* Maven dependencies (serialized as flat files)
-+
-This should only change when dependencies are bumped or new dependencies added.
-
-The lockdown tests are implemented as link:https://approvaltests.com/[approval test]s, meaning that the current state is compared to an "approved" state.
-If there are no differences then the test passes.
-If there are differences then the test fails, and a diff is shown using any available `diff` tool.
-
-The lockdown tests are disabled by default, and are enabled with system properties.
-
-* to compare the current metamodel with the previously approved metamodel:
-+
-[source,bash]
-----
-mvn integration-test -Dmetamodel.lockdown
-----
-
-* to compare the current Maven dependencies with the previously approved dependencies:
-+
-[source,bash]
-----
-mvn test -Dmavendeps.lockdown
-----
-
-When there are differences, the current state is written to the `current` subdirectory.
-If the current state is approved, it should be copied over to the corresponding `approved` subdirectory.
-
-
-
-
-== Translations
-
-Apache Isis supports i18n using link:https://www.gnu.org/software/gettext/manual/html_node/PO-Files.html[GNU .po file]s.
-The `WEB-INF/translations.po` is the fallback (an empty value means that the key is used "as-is"), while `WEB-INF/translations-XX.po` files provide translations for each "XX" locale.
-
-Translations are required for all domain classes and all members (actions, properties and collections) of all classes.
-This information is available from the metamodel, and so a new template `translations.po` is generated as a side-effect of running the integration tests (through a log4j2 logger).
-A good integration test to run is `ValidateDomainModel_IntegTest`.
-
-In addition, translations are required for any validation messages triggered by the test.
-Running an integration tests that trigger validations will result in these messages being captured as keys, for example `Smoke_IntegTest`.
-
-The generated file should be merged with any existing translations in `WEB-INF/translations.po`, and translations obtained for any new keys (there are numerous online services that support the format).
-
-
-== Flyway
-
-The application also demonstrates how to use Flyway to migrate the database schema.
-
-By default the app runs using an in-memory database.
-The Flyway example is activated using the "SQLSERVER" Spring Boot profile, eg:
-
-[source,bash]
-----
-mvn -Dspring.profiles.active=SQLSERVER -pl webapp install
-mvn -Dspring.profiles.active=SQLSERVER -pl webapp spring-boot:run
-----
-
-This causes the properties defined in  `config/application-SQLSERVER.properties` file to be used in preference to those in the default `config/application.properties` file.
-It defines the following:
-
-* `spring.flyway.url`, `spring.flyway.user` and `spring.flyway.password`
-+
-The presence of these is enough to enable the Flyway integration
-
-* `spring.flyway.enabled`
-+
-This is explicitly set to `true`, to override the value in the default `config/application.properties`.
-
-* `isis.persistence.jdo-datanucleus.impl.datanucleus.schema.autoCreateAll`
-+
-This is set to `false`, also overriding the value in the default `config/application.properties`.
-It instructs the JDO/DataNucleus object store not to automatically create any tables etc.
-
-The Spring Boot profile is also used to add the dependency to the SQL Server driver is included (it is hidden behind a Maven profile).
-
-The prerequisites to try this out are a SQL Server database running on `localhost` and with the credentials as specified in `config/application-SQLSERVER.properties`; adjust as necessary.
-

[isis-app-demo] 18/23: renames packages in pets module and pets-tests module

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/isis-app-demo.git

commit 5db6726671aae4463b16a171296bb2d39680347c
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Sep 29 07:10:56 2021 +0100

    renames packages in pets module and pets-tests module
---
 .../modules/pets/dom/petowner}/PetOwner_Test.java           |   4 +++-
 .../modules/pets/dom/petowner}/PetOwners_Test.java          |   6 +++++-
 .../pets}/integtests/PetsModuleIntegTestAbstract.java       |   4 ++--
 .../modules/pets}/integtests/tests/PetOwner_IntegTest.java  |   8 ++++----
 .../modules/pets}/integtests/tests/PetOwners_IntegTest.java |  10 +++++-----
 .../simple => petclinic/modules/pets}/PetsModule.java       |   4 ++--
 .../pets/dom/petowner}/PetOwner#others.columnOrder.txt      |   0
 .../modules/pets/dom/petowner}/PetOwner.columnOrder.txt     |   0
 .../modules/pets/dom/petowner}/PetOwner.java                |   6 +++---
 .../modules/pets/dom/petowner}/PetOwner.layout.xml          |   0
 .../so => petclinic/modules/pets/dom/petowner}/PetOwner.png | Bin
 .../modules/pets/dom/petowner}/PetOwnerRepository.java      |   4 +++-
 .../modules/pets/dom/petowner}/PetOwners.java               |   4 ++--
 .../modules/pets}/fixture/PetOwnerBuilder.java              |   6 +++---
 .../modules/pets}/fixture/PetOwner_persona.java             |   6 +++---
 .../simple => petclinic/modules/pets}/types/Name.java       |   2 +-
 .../simple => petclinic/modules/pets}/types/Notes.java      |   2 +-
 .../webapp/integtests/WebAppIntegTestAbstract.java          |   2 +-
 .../domainapp/webapp/integtests/smoke/Smoke_IntegTest.java  |   4 ++--
 .../domainapp/webapp/application/ApplicationModule.java     |   2 +-
 .../webapp/application/fixture/scenarios/DomainAppDemo.java |   2 +-
 .../application/services/health/HealthCheckServiceImpl.java |   2 +-
 .../application/services/homepage/HomePageViewModel.java    |   4 ++--
 .../domainapp/webapp/custom/restapi/CustomController.java   |   4 ++--
 .../main/java/domainapp/webapp/quartz/job/SampleJob.java    |   4 ++--
 25 files changed, 49 insertions(+), 41 deletions(-)

diff --git a/module-pets-tests/src/test/java/domainapp/modules/simple/dom/so/PetOwner_Test.java b/module-pets-tests/src/test/java/petclinic/modules/pets/dom/petowner/PetOwner_Test.java
similarity index 94%
rename from module-pets-tests/src/test/java/domainapp/modules/simple/dom/so/PetOwner_Test.java
rename to module-pets-tests/src/test/java/petclinic/modules/pets/dom/petowner/PetOwner_Test.java
index efcec71..ee187d3 100644
--- a/module-pets-tests/src/test/java/domainapp/modules/simple/dom/so/PetOwner_Test.java
+++ b/module-pets-tests/src/test/java/petclinic/modules/pets/dom/petowner/PetOwner_Test.java
@@ -1,4 +1,4 @@
-package domainapp.modules.simple.dom.so;
+package petclinic.modules.pets.dom.petowner;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Nested;
@@ -15,6 +15,8 @@ import org.apache.isis.applib.services.message.MessageService;
 import org.apache.isis.applib.services.repository.RepositoryService;
 import org.apache.isis.applib.services.title.TitleService;
 
+import petclinic.modules.pets.dom.petowner.PetOwner;
+
 @ExtendWith(MockitoExtension.class)
 class PetOwner_Test {
 
diff --git a/module-pets-tests/src/test/java/domainapp/modules/simple/dom/so/PetOwners_Test.java b/module-pets-tests/src/test/java/petclinic/modules/pets/dom/petowner/PetOwners_Test.java
similarity index 90%
rename from module-pets-tests/src/test/java/domainapp/modules/simple/dom/so/PetOwners_Test.java
rename to module-pets-tests/src/test/java/petclinic/modules/pets/dom/petowner/PetOwners_Test.java
index 31f61bc..663b53e 100644
--- a/module-pets-tests/src/test/java/domainapp/modules/simple/dom/so/PetOwners_Test.java
+++ b/module-pets-tests/src/test/java/petclinic/modules/pets/dom/petowner/PetOwners_Test.java
@@ -1,4 +1,4 @@
-package domainapp.modules.simple.dom.so;
+package petclinic.modules.pets.dom.petowner;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -20,6 +20,10 @@ import static org.mockito.Mockito.when;
 import org.apache.isis.applib.services.repository.RepositoryService;
 import org.apache.isis.persistence.jpa.applib.services.JpaSupportService;
 
+import petclinic.modules.pets.dom.petowner.PetOwner;
+import petclinic.modules.pets.dom.petowner.PetOwnerRepository;
+import petclinic.modules.pets.dom.petowner.PetOwners;
+
 @ExtendWith(MockitoExtension.class)
 class PetOwners_Test {
 
diff --git a/module-pets-tests/src/test/java/domainapp/modules/simple/integtests/PetsModuleIntegTestAbstract.java b/module-pets-tests/src/test/java/petclinic/modules/pets/integtests/PetsModuleIntegTestAbstract.java
similarity index 95%
rename from module-pets-tests/src/test/java/domainapp/modules/simple/integtests/PetsModuleIntegTestAbstract.java
rename to module-pets-tests/src/test/java/petclinic/modules/pets/integtests/PetsModuleIntegTestAbstract.java
index 6e899e6..00b32fe 100644
--- a/module-pets-tests/src/test/java/domainapp/modules/simple/integtests/PetsModuleIntegTestAbstract.java
+++ b/module-pets-tests/src/test/java/petclinic/modules/pets/integtests/PetsModuleIntegTestAbstract.java
@@ -1,4 +1,4 @@
-package domainapp.modules.simple.integtests;
+package petclinic.modules.pets.integtests;
 
 import org.springframework.boot.SpringBootConfiguration;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
@@ -15,7 +15,7 @@ import org.apache.isis.security.bypass.IsisModuleSecurityBypass;
 import org.apache.isis.testing.fixtures.applib.IsisIntegrationTestAbstractWithFixtures;
 import org.apache.isis.testing.fixtures.applib.IsisModuleTestingFixturesApplib;
 
-import domainapp.modules.simple.PetsModule;
+import petclinic.modules.pets.PetsModule;
 
 
 @SpringBootTest(
diff --git a/module-pets-tests/src/test/java/domainapp/modules/simple/integtests/tests/PetOwner_IntegTest.java b/module-pets-tests/src/test/java/petclinic/modules/pets/integtests/tests/PetOwner_IntegTest.java
similarity index 89%
rename from module-pets-tests/src/test/java/domainapp/modules/simple/integtests/tests/PetOwner_IntegTest.java
rename to module-pets-tests/src/test/java/petclinic/modules/pets/integtests/tests/PetOwner_IntegTest.java
index 011da32..195c6de 100644
--- a/module-pets-tests/src/test/java/domainapp/modules/simple/integtests/tests/PetOwner_IntegTest.java
+++ b/module-pets-tests/src/test/java/petclinic/modules/pets/integtests/tests/PetOwner_IntegTest.java
@@ -1,4 +1,4 @@
-package domainapp.modules.simple.integtests.tests;
+package petclinic.modules.pets.integtests.tests;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Nested;
@@ -11,9 +11,9 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
 import org.apache.isis.applib.services.wrapper.DisabledException;
 import org.apache.isis.applib.services.wrapper.InvalidException;
 
-import domainapp.modules.simple.dom.so.PetOwner;
-import domainapp.modules.simple.fixture.PetOwner_persona;
-import domainapp.modules.simple.integtests.PetsModuleIntegTestAbstract;
+import petclinic.modules.pets.dom.petowner.PetOwner;
+import petclinic.modules.pets.fixture.PetOwner_persona;
+import petclinic.modules.pets.integtests.PetsModuleIntegTestAbstract;
 
 @Transactional
 public class PetOwner_IntegTest extends PetsModuleIntegTestAbstract {
diff --git a/module-pets-tests/src/test/java/domainapp/modules/simple/integtests/tests/PetOwners_IntegTest.java b/module-pets-tests/src/test/java/petclinic/modules/pets/integtests/tests/PetOwners_IntegTest.java
similarity index 88%
rename from module-pets-tests/src/test/java/domainapp/modules/simple/integtests/tests/PetOwners_IntegTest.java
rename to module-pets-tests/src/test/java/petclinic/modules/pets/integtests/tests/PetOwners_IntegTest.java
index bae3024..6a76c81 100644
--- a/module-pets-tests/src/test/java/domainapp/modules/simple/integtests/tests/PetOwners_IntegTest.java
+++ b/module-pets-tests/src/test/java/petclinic/modules/pets/integtests/tests/PetOwners_IntegTest.java
@@ -1,4 +1,4 @@
-package domainapp.modules.simple.integtests.tests;
+package petclinic.modules.pets.integtests.tests;
 
 import java.util.List;
 
@@ -15,10 +15,10 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import org.apache.isis.testing.unittestsupport.applib.matchers.ThrowableMatchers;
 
-import domainapp.modules.simple.dom.so.PetOwner;
-import domainapp.modules.simple.dom.so.PetOwners;
-import domainapp.modules.simple.fixture.PetOwner_persona;
-import domainapp.modules.simple.integtests.PetsModuleIntegTestAbstract;
+import petclinic.modules.pets.dom.petowner.PetOwner;
+import petclinic.modules.pets.dom.petowner.PetOwners;
+import petclinic.modules.pets.fixture.PetOwner_persona;
+import petclinic.modules.pets.integtests.PetsModuleIntegTestAbstract;
 
 @Transactional
 public class PetOwners_IntegTest extends PetsModuleIntegTestAbstract {
diff --git a/module-pets/src/main/java/domainapp/modules/simple/PetsModule.java b/module-pets/src/main/java/petclinic/modules/pets/PetsModule.java
similarity index 91%
rename from module-pets/src/main/java/domainapp/modules/simple/PetsModule.java
rename to module-pets/src/main/java/petclinic/modules/pets/PetsModule.java
index a09d06d..96f447d 100644
--- a/module-pets/src/main/java/domainapp/modules/simple/PetsModule.java
+++ b/module-pets/src/main/java/petclinic/modules/pets/PetsModule.java
@@ -1,4 +1,4 @@
-package domainapp.modules.simple;
+package petclinic.modules.pets;
 
 import org.springframework.boot.autoconfigure.domain.EntityScan;
 import org.springframework.context.annotation.ComponentScan;
@@ -8,7 +8,7 @@ import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
 import org.apache.isis.testing.fixtures.applib.modules.ModuleWithFixtures;
 
-import domainapp.modules.simple.dom.so.PetOwner;
+import petclinic.modules.pets.dom.petowner.PetOwner;
 
 @Configuration
 @ComponentScan
diff --git a/module-pets/src/main/java/domainapp/modules/simple/dom/so/PetOwner#others.columnOrder.txt b/module-pets/src/main/java/petclinic/modules/pets/dom/petowner/PetOwner#others.columnOrder.txt
similarity index 100%
rename from module-pets/src/main/java/domainapp/modules/simple/dom/so/PetOwner#others.columnOrder.txt
rename to module-pets/src/main/java/petclinic/modules/pets/dom/petowner/PetOwner#others.columnOrder.txt
diff --git a/module-pets/src/main/java/domainapp/modules/simple/dom/so/PetOwner.columnOrder.txt b/module-pets/src/main/java/petclinic/modules/pets/dom/petowner/PetOwner.columnOrder.txt
similarity index 100%
rename from module-pets/src/main/java/domainapp/modules/simple/dom/so/PetOwner.columnOrder.txt
rename to module-pets/src/main/java/petclinic/modules/pets/dom/petowner/PetOwner.columnOrder.txt
diff --git a/module-pets/src/main/java/domainapp/modules/simple/dom/so/PetOwner.java b/module-pets/src/main/java/petclinic/modules/pets/dom/petowner/PetOwner.java
similarity index 97%
rename from module-pets/src/main/java/domainapp/modules/simple/dom/so/PetOwner.java
rename to module-pets/src/main/java/petclinic/modules/pets/dom/petowner/PetOwner.java
index 35e84a6..5eb374d 100644
--- a/module-pets/src/main/java/domainapp/modules/simple/dom/so/PetOwner.java
+++ b/module-pets/src/main/java/petclinic/modules/pets/dom/petowner/PetOwner.java
@@ -1,4 +1,4 @@
-package domainapp.modules.simple.dom.so;
+package petclinic.modules.pets.dom.petowner;
 
 import java.util.Comparator;
 
@@ -30,8 +30,8 @@ import lombok.Setter;
 import lombok.ToString;
 import lombok.val;
 
-import domainapp.modules.simple.types.Name;
-import domainapp.modules.simple.types.Notes;
+import petclinic.modules.pets.types.Name;
+import petclinic.modules.pets.types.Notes;
 
 
 @javax.persistence.Entity
diff --git a/module-pets/src/main/java/domainapp/modules/simple/dom/so/PetOwner.layout.xml b/module-pets/src/main/java/petclinic/modules/pets/dom/petowner/PetOwner.layout.xml
similarity index 100%
rename from module-pets/src/main/java/domainapp/modules/simple/dom/so/PetOwner.layout.xml
rename to module-pets/src/main/java/petclinic/modules/pets/dom/petowner/PetOwner.layout.xml
diff --git a/module-pets/src/main/java/domainapp/modules/simple/dom/so/PetOwner.png b/module-pets/src/main/java/petclinic/modules/pets/dom/petowner/PetOwner.png
similarity index 100%
rename from module-pets/src/main/java/domainapp/modules/simple/dom/so/PetOwner.png
rename to module-pets/src/main/java/petclinic/modules/pets/dom/petowner/PetOwner.png
diff --git a/module-pets/src/main/java/domainapp/modules/simple/dom/so/PetOwnerRepository.java b/module-pets/src/main/java/petclinic/modules/pets/dom/petowner/PetOwnerRepository.java
similarity index 73%
rename from module-pets/src/main/java/domainapp/modules/simple/dom/so/PetOwnerRepository.java
rename to module-pets/src/main/java/petclinic/modules/pets/dom/petowner/PetOwnerRepository.java
index 63eb33d..18c2cc7 100644
--- a/module-pets/src/main/java/domainapp/modules/simple/dom/so/PetOwnerRepository.java
+++ b/module-pets/src/main/java/petclinic/modules/pets/dom/petowner/PetOwnerRepository.java
@@ -1,9 +1,11 @@
-package domainapp.modules.simple.dom.so;
+package petclinic.modules.pets.dom.petowner;
 
 import java.util.List;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 
+import petclinic.modules.pets.dom.petowner.PetOwner;
+
 public interface PetOwnerRepository extends JpaRepository<PetOwner, Long> {
 
     List<PetOwner> findByNameContaining(final String name);
diff --git a/module-pets/src/main/java/domainapp/modules/simple/dom/so/PetOwners.java b/module-pets/src/main/java/petclinic/modules/pets/dom/petowner/PetOwners.java
similarity index 97%
rename from module-pets/src/main/java/domainapp/modules/simple/dom/so/PetOwners.java
rename to module-pets/src/main/java/petclinic/modules/pets/dom/petowner/PetOwners.java
index b473ad2..c471183 100644
--- a/module-pets/src/main/java/domainapp/modules/simple/dom/so/PetOwners.java
+++ b/module-pets/src/main/java/petclinic/modules/pets/dom/petowner/PetOwners.java
@@ -1,4 +1,4 @@
-package domainapp.modules.simple.dom.so;
+package petclinic.modules.pets.dom.petowner;
 
 import java.util.List;
 
@@ -18,7 +18,7 @@ import org.apache.isis.applib.query.Query;
 import org.apache.isis.applib.services.repository.RepositoryService;
 import org.apache.isis.persistence.jpa.applib.services.JpaSupportService;
 
-import domainapp.modules.simple.types.Name;
+import petclinic.modules.pets.types.Name;
 
 @DomainService(
         nature = NatureOfService.VIEW,
diff --git a/module-pets/src/main/java/domainapp/modules/simple/fixture/PetOwnerBuilder.java b/module-pets/src/main/java/petclinic/modules/pets/fixture/PetOwnerBuilder.java
similarity index 79%
rename from module-pets/src/main/java/domainapp/modules/simple/fixture/PetOwnerBuilder.java
rename to module-pets/src/main/java/petclinic/modules/pets/fixture/PetOwnerBuilder.java
index e85b2b9..2a75ae6 100644
--- a/module-pets/src/main/java/domainapp/modules/simple/fixture/PetOwnerBuilder.java
+++ b/module-pets/src/main/java/petclinic/modules/pets/fixture/PetOwnerBuilder.java
@@ -1,11 +1,11 @@
-package domainapp.modules.simple.fixture;
+package petclinic.modules.pets.fixture;
 
 import javax.inject.Inject;
 
 import org.apache.isis.testing.fixtures.applib.personas.BuilderScriptWithResult;
 
-import domainapp.modules.simple.dom.so.PetOwner;
-import domainapp.modules.simple.dom.so.PetOwners;
+import petclinic.modules.pets.dom.petowner.PetOwner;
+import petclinic.modules.pets.dom.petowner.PetOwners;
 
 import lombok.Getter;
 import lombok.Setter;
diff --git a/module-pets/src/main/java/domainapp/modules/simple/fixture/PetOwner_persona.java b/module-pets/src/main/java/petclinic/modules/pets/fixture/PetOwner_persona.java
similarity index 89%
rename from module-pets/src/main/java/domainapp/modules/simple/fixture/PetOwner_persona.java
rename to module-pets/src/main/java/petclinic/modules/pets/fixture/PetOwner_persona.java
index 63b66bc..d96cc17 100644
--- a/module-pets/src/main/java/domainapp/modules/simple/fixture/PetOwner_persona.java
+++ b/module-pets/src/main/java/petclinic/modules/pets/fixture/PetOwner_persona.java
@@ -1,12 +1,12 @@
-package domainapp.modules.simple.fixture;
+package petclinic.modules.pets.fixture;
 
 import org.apache.isis.applib.services.registry.ServiceRegistry;
 import org.apache.isis.testing.fixtures.applib.personas.PersonaWithBuilderScript;
 import org.apache.isis.testing.fixtures.applib.personas.PersonaWithFinder;
 import org.apache.isis.testing.fixtures.applib.setup.PersonaEnumPersistAll;
 
-import domainapp.modules.simple.dom.so.PetOwner;
-import domainapp.modules.simple.dom.so.PetOwners;
+import petclinic.modules.pets.dom.petowner.PetOwner;
+import petclinic.modules.pets.dom.petowner.PetOwners;
 
 import lombok.AllArgsConstructor;
 
diff --git a/module-pets/src/main/java/domainapp/modules/simple/types/Name.java b/module-pets/src/main/java/petclinic/modules/pets/types/Name.java
similarity index 93%
rename from module-pets/src/main/java/domainapp/modules/simple/types/Name.java
rename to module-pets/src/main/java/petclinic/modules/pets/types/Name.java
index 8c3955c..9af83f0 100644
--- a/module-pets/src/main/java/domainapp/modules/simple/types/Name.java
+++ b/module-pets/src/main/java/petclinic/modules/pets/types/Name.java
@@ -1,4 +1,4 @@
-package domainapp.modules.simple.types;
+package petclinic.modules.pets.types;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/module-pets/src/main/java/domainapp/modules/simple/types/Notes.java b/module-pets/src/main/java/petclinic/modules/pets/types/Notes.java
similarity index 95%
rename from module-pets/src/main/java/domainapp/modules/simple/types/Notes.java
rename to module-pets/src/main/java/petclinic/modules/pets/types/Notes.java
index 73525e5..74156e1 100644
--- a/module-pets/src/main/java/domainapp/modules/simple/types/Notes.java
+++ b/module-pets/src/main/java/petclinic/modules/pets/types/Notes.java
@@ -1,4 +1,4 @@
-package domainapp.modules.simple.types;
+package petclinic.modules.pets.types;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/webapp-tests/src/test/java/domainapp/webapp/integtests/WebAppIntegTestAbstract.java b/webapp-tests/src/test/java/domainapp/webapp/integtests/WebAppIntegTestAbstract.java
index 4057e7e..260c893 100644
--- a/webapp-tests/src/test/java/domainapp/webapp/integtests/WebAppIntegTestAbstract.java
+++ b/webapp-tests/src/test/java/domainapp/webapp/integtests/WebAppIntegTestAbstract.java
@@ -16,7 +16,7 @@ import org.apache.isis.security.bypass.IsisModuleSecurityBypass;
 import org.apache.isis.testing.fixtures.applib.IsisModuleTestingFixturesApplib;
 import org.apache.isis.testing.integtestsupport.applib.IsisIntegrationTestAbstract;
 
-import domainapp.modules.simple.PetsModule;
+import petclinic.modules.pets.PetsModule;
 import domainapp.webapp.application.ApplicationModule;
 
 @SpringBootTest(
diff --git a/webapp-tests/src/test/java/domainapp/webapp/integtests/smoke/Smoke_IntegTest.java b/webapp-tests/src/test/java/domainapp/webapp/integtests/smoke/Smoke_IntegTest.java
index 2d5a057..60d1a96 100644
--- a/webapp-tests/src/test/java/domainapp/webapp/integtests/smoke/Smoke_IntegTest.java
+++ b/webapp-tests/src/test/java/domainapp/webapp/integtests/smoke/Smoke_IntegTest.java
@@ -13,9 +13,9 @@ import org.apache.isis.applib.services.xactn.TransactionService;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import domainapp.modules.simple.dom.so.PetOwner;
+import petclinic.modules.pets.dom.petowner.PetOwner;
 import domainapp.webapp.integtests.WebAppIntegTestAbstract;
-import domainapp.modules.simple.dom.so.PetOwners;
+import petclinic.modules.pets.dom.petowner.PetOwners;
 
 @Transactional
 class Smoke_IntegTest extends WebAppIntegTestAbstract {
diff --git a/webapp/src/main/java/domainapp/webapp/application/ApplicationModule.java b/webapp/src/main/java/domainapp/webapp/application/ApplicationModule.java
index 1e6bd4d..2e09ee6 100644
--- a/webapp/src/main/java/domainapp/webapp/application/ApplicationModule.java
+++ b/webapp/src/main/java/domainapp/webapp/application/ApplicationModule.java
@@ -4,7 +4,7 @@ import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 
-import domainapp.modules.simple.PetsModule;
+import petclinic.modules.pets.PetsModule;
 
 @Configuration
 @Import(PetsModule.class)
diff --git a/webapp/src/main/java/domainapp/webapp/application/fixture/scenarios/DomainAppDemo.java b/webapp/src/main/java/domainapp/webapp/application/fixture/scenarios/DomainAppDemo.java
index c8a92fa..80bcee1 100644
--- a/webapp/src/main/java/domainapp/webapp/application/fixture/scenarios/DomainAppDemo.java
+++ b/webapp/src/main/java/domainapp/webapp/application/fixture/scenarios/DomainAppDemo.java
@@ -5,7 +5,7 @@ import javax.inject.Inject;
 import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
 import org.apache.isis.testing.fixtures.applib.modules.ModuleWithFixturesService;
 
-import domainapp.modules.simple.fixture.PetOwner_persona;
+import petclinic.modules.pets.fixture.PetOwner_persona;
 
 public class DomainAppDemo extends FixtureScript {
 
diff --git a/webapp/src/main/java/domainapp/webapp/application/services/health/HealthCheckServiceImpl.java b/webapp/src/main/java/domainapp/webapp/application/services/health/HealthCheckServiceImpl.java
index 6ae3bed..6916370 100644
--- a/webapp/src/main/java/domainapp/webapp/application/services/health/HealthCheckServiceImpl.java
+++ b/webapp/src/main/java/domainapp/webapp/application/services/health/HealthCheckServiceImpl.java
@@ -8,7 +8,7 @@ import org.springframework.stereotype.Service;
 import org.apache.isis.applib.services.health.Health;
 import org.apache.isis.applib.services.health.HealthCheckService;
 
-import domainapp.modules.simple.dom.so.PetOwners;
+import petclinic.modules.pets.dom.petowner.PetOwners;
 
 @Service
 @Named("domainapp.HealthCheckServiceImpl")
diff --git a/webapp/src/main/java/domainapp/webapp/application/services/homepage/HomePageViewModel.java b/webapp/src/main/java/domainapp/webapp/application/services/homepage/HomePageViewModel.java
index 4963f86..5b10a47 100644
--- a/webapp/src/main/java/domainapp/webapp/application/services/homepage/HomePageViewModel.java
+++ b/webapp/src/main/java/domainapp/webapp/application/services/homepage/HomePageViewModel.java
@@ -9,8 +9,8 @@ import org.apache.isis.applib.annotation.DomainObjectLayout;
 import org.apache.isis.applib.annotation.HomePage;
 import org.apache.isis.applib.annotation.Nature;
 
-import domainapp.modules.simple.dom.so.PetOwner;
-import domainapp.modules.simple.dom.so.PetOwners;
+import petclinic.modules.pets.dom.petowner.PetOwner;
+import petclinic.modules.pets.dom.petowner.PetOwners;
 
 @DomainObject(
         nature = Nature.VIEW_MODEL,
diff --git a/webapp/src/main/java/domainapp/webapp/custom/restapi/CustomController.java b/webapp/src/main/java/domainapp/webapp/custom/restapi/CustomController.java
index a43598b..ef9ad58 100644
--- a/webapp/src/main/java/domainapp/webapp/custom/restapi/CustomController.java
+++ b/webapp/src/main/java/domainapp/webapp/custom/restapi/CustomController.java
@@ -17,8 +17,8 @@ import org.apache.isis.applib.services.xactn.TransactionalProcessor;
 
 import lombok.RequiredArgsConstructor;
 
-import domainapp.modules.simple.dom.so.PetOwner;
-import domainapp.modules.simple.dom.so.PetOwners;
+import petclinic.modules.pets.dom.petowner.PetOwner;
+import petclinic.modules.pets.dom.petowner.PetOwners;
 
 @RestController
 @RequiredArgsConstructor(onConstructor_ = {@Inject})
diff --git a/webapp/src/main/java/domainapp/webapp/quartz/job/SampleJob.java b/webapp/src/main/java/domainapp/webapp/quartz/job/SampleJob.java
index b7adf92..d22c301 100644
--- a/webapp/src/main/java/domainapp/webapp/quartz/job/SampleJob.java
+++ b/webapp/src/main/java/domainapp/webapp/quartz/job/SampleJob.java
@@ -20,8 +20,8 @@ import org.apache.isis.applib.services.xactn.TransactionalProcessor;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.log4j.Log4j2;
 
-import domainapp.modules.simple.dom.so.PetOwner;
-import domainapp.modules.simple.dom.so.PetOwners;
+import petclinic.modules.pets.dom.petowner.PetOwner;
+import petclinic.modules.pets.dom.petowner.PetOwners;
 
 @Component
 @RequiredArgsConstructor(onConstructor_ = {@Inject})

[isis-app-demo] 09/23: changes PetOwner logicalTypeName

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/isis-app-demo.git

commit fea5b50798c23ca30ad7a5650c147ad38c9b8d76
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Sep 29 06:52:03 2021 +0100

    changes PetOwner logicalTypeName
---
 module-pets/src/main/java/domainapp/modules/simple/dom/so/PetOwner.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module-pets/src/main/java/domainapp/modules/simple/dom/so/PetOwner.java b/module-pets/src/main/java/domainapp/modules/simple/dom/so/PetOwner.java
index e179dd7..35e84a6 100644
--- a/module-pets/src/main/java/domainapp/modules/simple/dom/so/PetOwner.java
+++ b/module-pets/src/main/java/domainapp/modules/simple/dom/so/PetOwner.java
@@ -50,7 +50,7 @@ import domainapp.modules.simple.types.Notes;
         )
 })
 @javax.persistence.EntityListeners(IsisEntityListener.class)
-@DomainObject(logicalTypeName = "simple.PetOwner", entityChangePublishing = Publishing.ENABLED)
+@DomainObject(logicalTypeName = "pets.PetOwner", entityChangePublishing = Publishing.ENABLED)
 @DomainObjectLayout()
 @NoArgsConstructor(access = AccessLevel.PUBLIC)
 @XmlJavaTypeAdapter(PersistentEntityAdapter.class)

[isis-app-demo] 17/23: renames SimpleModuleIntegTestAbstract to PetsModuleIntegTestAbstract

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/isis-app-demo.git

commit 5d3fb15c105be44c00e2502679d8d294ca4097dd
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Sep 29 07:06:50 2021 +0100

    renames SimpleModuleIntegTestAbstract to PetsModuleIntegTestAbstract
---
 ...eModuleIntegTestAbstract.java => PetsModuleIntegTestAbstract.java} | 4 ++--
 .../domainapp/modules/simple/integtests/tests/PetOwner_IntegTest.java | 4 ++--
 .../modules/simple/integtests/tests/PetOwners_IntegTest.java          | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/module-pets-tests/src/test/java/domainapp/modules/simple/integtests/SimpleModuleIntegTestAbstract.java b/module-pets-tests/src/test/java/domainapp/modules/simple/integtests/PetsModuleIntegTestAbstract.java
similarity index 91%
rename from module-pets-tests/src/test/java/domainapp/modules/simple/integtests/SimpleModuleIntegTestAbstract.java
rename to module-pets-tests/src/test/java/domainapp/modules/simple/integtests/PetsModuleIntegTestAbstract.java
index 4868b0f..6e899e6 100644
--- a/module-pets-tests/src/test/java/domainapp/modules/simple/integtests/SimpleModuleIntegTestAbstract.java
+++ b/module-pets-tests/src/test/java/domainapp/modules/simple/integtests/PetsModuleIntegTestAbstract.java
@@ -19,10 +19,10 @@ import domainapp.modules.simple.PetsModule;
 
 
 @SpringBootTest(
-        classes = SimpleModuleIntegTestAbstract.TestApp.class
+        classes = PetsModuleIntegTestAbstract.TestApp.class
 )
 @ActiveProfiles("test")
-public abstract class SimpleModuleIntegTestAbstract extends IsisIntegrationTestAbstractWithFixtures {
+public abstract class PetsModuleIntegTestAbstract extends IsisIntegrationTestAbstractWithFixtures {
 
     /**
      * Compared to the production app manifest <code>domainapp.webapp.AppManifest</code>,
diff --git a/module-pets-tests/src/test/java/domainapp/modules/simple/integtests/tests/PetOwner_IntegTest.java b/module-pets-tests/src/test/java/domainapp/modules/simple/integtests/tests/PetOwner_IntegTest.java
index f5660dd..011da32 100644
--- a/module-pets-tests/src/test/java/domainapp/modules/simple/integtests/tests/PetOwner_IntegTest.java
+++ b/module-pets-tests/src/test/java/domainapp/modules/simple/integtests/tests/PetOwner_IntegTest.java
@@ -13,10 +13,10 @@ import org.apache.isis.applib.services.wrapper.InvalidException;
 
 import domainapp.modules.simple.dom.so.PetOwner;
 import domainapp.modules.simple.fixture.PetOwner_persona;
-import domainapp.modules.simple.integtests.SimpleModuleIntegTestAbstract;
+import domainapp.modules.simple.integtests.PetsModuleIntegTestAbstract;
 
 @Transactional
-public class PetOwner_IntegTest extends SimpleModuleIntegTestAbstract {
+public class PetOwner_IntegTest extends PetsModuleIntegTestAbstract {
 
     PetOwner petOwner;
 
diff --git a/module-pets-tests/src/test/java/domainapp/modules/simple/integtests/tests/PetOwners_IntegTest.java b/module-pets-tests/src/test/java/domainapp/modules/simple/integtests/tests/PetOwners_IntegTest.java
index b570c58..bae3024 100644
--- a/module-pets-tests/src/test/java/domainapp/modules/simple/integtests/tests/PetOwners_IntegTest.java
+++ b/module-pets-tests/src/test/java/domainapp/modules/simple/integtests/tests/PetOwners_IntegTest.java
@@ -18,10 +18,10 @@ import org.apache.isis.testing.unittestsupport.applib.matchers.ThrowableMatchers
 import domainapp.modules.simple.dom.so.PetOwner;
 import domainapp.modules.simple.dom.so.PetOwners;
 import domainapp.modules.simple.fixture.PetOwner_persona;
-import domainapp.modules.simple.integtests.SimpleModuleIntegTestAbstract;
+import domainapp.modules.simple.integtests.PetsModuleIntegTestAbstract;
 
 @Transactional
-public class PetOwners_IntegTest extends SimpleModuleIntegTestAbstract {
+public class PetOwners_IntegTest extends PetsModuleIntegTestAbstract {
 
     @Inject
     PetOwners menu;