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:55 UTC
[isis-app-demo] 15/23: renames SimpleModule to PetsModule
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 {