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 2020/01/16 15:06:39 UTC

[isis-app-simpleapp] 04/05: renames module class names, for latest v2 interim.

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

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

commit 61a7f42e89120ed5d3d0a2d1712fcebc09678357
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sun Jan 12 08:01:28 2020 +0000

    renames module class names, for latest v2 interim.
---
 .../simple/integtests/SimpleModuleIntegTestAbstract.java     |  4 ++--
 webapp/src/main/java/domainapp/webapp/SimpleApp.java         | 12 ++++++------
 .../webapp/integtests/ApplicationIntegTestAbstract.java      |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/module-simple/src/test/java/domainapp/modules/simple/integtests/SimpleModuleIntegTestAbstract.java b/module-simple/src/test/java/domainapp/modules/simple/integtests/SimpleModuleIntegTestAbstract.java
index 5c110e4..f0c54e4 100644
--- a/module-simple/src/test/java/domainapp/modules/simple/integtests/SimpleModuleIntegTestAbstract.java
+++ b/module-simple/src/test/java/domainapp/modules/simple/integtests/SimpleModuleIntegTestAbstract.java
@@ -4,7 +4,7 @@ import domainapp.modules.simple.SimpleModule;
 
 import org.apache.isis.core.config.presets.IsisPresets;
 import org.apache.isis.core.webspringboot.IsisModuleCoreWebSpringBoot;
-import org.apache.isis.testing.fixtures.applib.IsisModuleTstFixturesApplib;
+import org.apache.isis.testing.fixtures.applib.IsisModuleTestingFixturesApplib;
 import org.apache.isis.testing.fixtures.applib.IsisIntegrationTestAbstractWithFixtures;
 import org.apache.isis.testing.integtestsupport.applib.IsisIntegrationTestAbstract;
 import org.apache.isis.persistence.jdo.datanucleus5.IsisModuleJdoDataNucleus5;
@@ -30,7 +30,7 @@ public abstract class SimpleModuleIntegTestAbstract extends IsisIntegrationTestA
         IsisModuleCoreWebSpringBoot.class,
         IsisModuleSecurityBypass.class,
         IsisModuleJdoDataNucleus5.class,
-        IsisModuleTstFixturesApplib.class,
+        IsisModuleTestingFixturesApplib.class,
 
         IsisIntegrationTestAbstract.CommandSupport.class,
 
diff --git a/webapp/src/main/java/domainapp/webapp/SimpleApp.java b/webapp/src/main/java/domainapp/webapp/SimpleApp.java
index c82a423..f38e7bb 100644
--- a/webapp/src/main/java/domainapp/webapp/SimpleApp.java
+++ b/webapp/src/main/java/domainapp/webapp/SimpleApp.java
@@ -3,13 +3,13 @@ package domainapp.webapp;
 import domainapp.webapp.application.ApplicationModule;
 import domainapp.webapp.application.fixture.scenarios.DomainAppDemo;
 
-import org.apache.isis.testing.fixtures.applib.IsisModuleTstFixturesApplib;
+import org.apache.isis.testing.fixtures.applib.IsisModuleTestingFixturesApplib;
 import org.apache.isis.testing.h2console.ui.IsisModuleTestingH2ConsoleUi;
 import org.apache.isis.persistence.jdo.datanucleus5.IsisModuleJdoDataNucleus5;
-import org.apache.isis.viewer.restfulobjects.jaxrsresteasy4.IsisModuleRestfulObjectsJaxrsResteasy4;
+import org.apache.isis.viewer.restfulobjects.jaxrsresteasy4.IsisModuleViewerRestfulObjectsJaxrsResteasy4;
 import org.apache.isis.core.webspringboot.IsisModuleCoreWebSpringBoot;
 import org.apache.isis.security.shiro.IsisModuleSecurityShiro;
-import org.apache.isis.viewer.wicket.viewer.IsisModuleWicketViewer;
+import org.apache.isis.viewer.wicket.viewer.IsisModuleViewerWicketViewer;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
@@ -36,10 +36,10 @@ public class SimpleApp extends SpringBootServletInitializer {
             IsisModuleCoreWebSpringBoot.class,
             IsisModuleSecurityShiro.class,
             IsisModuleJdoDataNucleus5.class,
-            IsisModuleRestfulObjectsJaxrsResteasy4.class,
-            IsisModuleWicketViewer.class,
+            IsisModuleViewerRestfulObjectsJaxrsResteasy4.class,
+            IsisModuleViewerWicketViewer.class,
 
-            IsisModuleTstFixturesApplib.class,
+            IsisModuleTestingFixturesApplib.class,
             IsisModuleTestingH2ConsoleUi.class,
 
             ApplicationModule.class,
diff --git a/webapp/src/test/java/domainapp/webapp/integtests/ApplicationIntegTestAbstract.java b/webapp/src/test/java/domainapp/webapp/integtests/ApplicationIntegTestAbstract.java
index 8015080..dd150e9 100644
--- a/webapp/src/test/java/domainapp/webapp/integtests/ApplicationIntegTestAbstract.java
+++ b/webapp/src/test/java/domainapp/webapp/integtests/ApplicationIntegTestAbstract.java
@@ -3,7 +3,7 @@ package domainapp.webapp.integtests;
 import domainapp.webapp.application.ApplicationModule;
 
 import org.apache.isis.core.config.presets.IsisPresets;
-import org.apache.isis.testing.fixtures.applib.IsisModuleTstFixturesApplib;
+import org.apache.isis.testing.fixtures.applib.IsisModuleTestingFixturesApplib;
 import org.apache.isis.testing.integtestsupport.applib.IsisIntegrationTestAbstract;
 import org.apache.isis.persistence.jdo.datanucleus5.IsisModuleJdoDataNucleus5;
 import org.apache.isis.core.webspringboot.IsisModuleCoreWebSpringBoot;
@@ -30,7 +30,7 @@ public abstract class ApplicationIntegTestAbstract extends IsisIntegrationTestAb
             IsisModuleCoreWebSpringBoot.class,
             IsisModuleJdoDataNucleus5.class,
             IsisModuleSecurityBypass.class,
-            IsisModuleTstFixturesApplib.class,
+            IsisModuleTestingFixturesApplib.class,
             ApplicationModule.class
     })
     public static class AppManifest {