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:58 UTC
[isis-app-demo] 18/23: renames packages in pets module and
pets-tests module
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})