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:59 UTC
[isis-app-demo] 19/23: renames packages in webapp 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 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