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/11 18:31:35 UTC
[isis] branch master updated: ISIS-2259: makes module names more
consistent
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.git
The following commit(s) were added to refs/heads/master by this push:
new 1d05632 ISIS-2259: makes module names more consistent
1d05632 is described below
commit 1d056326ed3c9bccf7dcd6829301e0e44ac8e9d4
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sat Jan 11 18:31:05 2020 +0000
ISIS-2259: makes module names more consistent
---
...duleRuntime.java => IsisModuleCoreRuntime.java} | 2 +-
.../IsisModuleCoreRuntimeServices.java | 4 +--
.../isis/core/webapp/IsisModuleCoreWebapp.java | 4 +--
.../demo/src/main/java/demoapp/webapp/DemoApp.java | 32 +++++++++++-----------
.../testdomain/conf/Configuration_usingJdo.java | 4 +--
.../conf/Configuration_usingJdoAndShiro.java | 4 +--
.../isis/testdomain/rest/RestServiceTest.java | 4 +--
.../isis/testdomain/shiro/ShiroSecmanLdapTest.java | 16 +++++------
.../shiro/ShiroSecmanLdap_restfulStressTest.java | 20 +++++++-------
.../isis/testdomain/shiro/ShiroSecmanTest.java | 16 +++++------
...a => IsisModuleExtSecmanEncryptionJbcrypt.java} | 2 +-
...manModel.java => IsisModuleExtSecmanModel.java} | 4 +--
...java => IsisModuleExtSecmanPersistenceJdo.java} | 4 +--
...iro.java => IsisModuleExtSecmanRealmShiro.java} | 2 +-
...adUi.java => IsisModuleExtExcelDownloadUi.java} | 2 +-
...Model.java => IsisModuleExtPdfjsMetaModel.java} | 2 +-
...icketPdfjsUi.java => IsisModuleExtPdfjsUi.java} | 6 ++--
...ib.java => IsisModulePersistenceJdoApplib.java} | 2 +-
.../datanucleus5/IsisModuleJdoDataNucleus5.java | 8 +++---
...ib.java => IsisModuleSubdomainsBaseApplib.java} | 2 +-
...ib.java => IsisModuleSubdomainsDocxApplib.java} | 2 +-
...b.java => IsisModuleSubdomainsExcelApplib.java} | 2 +-
...java => IsisModuleSubdomainsExcelFixtures.java} | 10 +++----
.../integtests/ExcelModuleIntegTestAbstract.java | 8 +++---
....java => IsisModuleSubdomainsExcelTesting.java} | 2 +-
...a => IsisModuleSubdomainsFreemarkerApplib.java} | 2 +-
...ib.java => IsisModuleSubdomainsOgnlApplib.java} | 2 +-
....java => IsisModuleSubdomainsPdfBoxApplib.java} | 2 +-
....java => IsisModuleSubdomainsSpringApplib.java} | 2 +-
...a => IsisModuleSubdomainsXDocReportApplib.java} | 2 +-
...b.java => IsisModuleTestingFakeDataApplib.java} | 2 +-
...java => IsisModuleTestingFakeDataFixtures.java} | 6 ++--
.../FakeDataModuleIntegTestAbstract.java | 8 +++---
...b.java => IsisModuleTestingFixturesApplib.java} | 6 ++--
.../applib/IsisModuleTestingSpecSupportApplib.java | 7 +++++
.../applib/IsisModuleTstSpecSupportAplib.java | 4 ---
...=> IsisModuleTestingUnitTestSupportApplib.java} | 2 +-
...a => IsisModuleViewerRestfulObjectsApplib.java} | 2 +-
...sModuleViewerRestfulObjectsJaxrsResteasy4.java} | 6 ++--
.../IsisModuleRestfulObjectsRendering.java | 8 +++---
...a => IsisModuleViewerRestfulObjectsViewer.java} | 2 +-
...Model.java => IsisModuleViewerWicketModel.java} | 2 +-
...WicketUi.java => IsisModuleViewerWicketUi.java} | 6 ++--
...ewer.java => IsisModuleViewerWicketViewer.java} | 6 ++--
44 files changed, 122 insertions(+), 119 deletions(-)
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/IsisCoreModuleRuntime.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/IsisModuleCoreRuntime.java
similarity index 98%
rename from core/runtime/src/main/java/org/apache/isis/core/runtime/IsisCoreModuleRuntime.java
rename to core/runtime/src/main/java/org/apache/isis/core/runtime/IsisModuleCoreRuntime.java
index 5a70cfd..ce3fa17 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/IsisCoreModuleRuntime.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/IsisModuleCoreRuntime.java
@@ -49,6 +49,6 @@ import org.apache.isis.core.runtime.session.IsisSessionFactoryDefault;
PersistenceEventService_Spring.class,
})
-public class IsisCoreModuleRuntime {
+public class IsisModuleCoreRuntime {
}
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/IsisModuleCoreRuntimeServices.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/IsisModuleCoreRuntimeServices.java
index 3e63ffd..9a04711 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/IsisModuleCoreRuntimeServices.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/IsisModuleCoreRuntimeServices.java
@@ -22,7 +22,7 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import org.apache.isis.core.codegen.bytebuddy.IsisModuleCoreCodegenByteBuddy;
-import org.apache.isis.core.runtime.IsisCoreModuleRuntime;
+import org.apache.isis.core.runtime.IsisModuleCoreRuntime;
import org.apache.isis.core.runtimeservices.auth.AuthenticationSessionProviderDefault;
import org.apache.isis.core.runtimeservices.bookmarks.BookmarkServiceInternalDefault;
import org.apache.isis.core.runtimeservices.command.CommandDtoServiceInternalDefault;
@@ -53,7 +53,7 @@ import org.apache.isis.core.runtimeservices.sudo.SudoServiceDefault;
@Configuration
@Import({
// modules
- IsisCoreModuleRuntime.class,
+ IsisModuleCoreRuntime.class,
IsisModuleCoreCodegenByteBuddy.class,
// @Service's
diff --git a/core/webapp/src/main/java/org/apache/isis/core/webapp/IsisModuleCoreWebapp.java b/core/webapp/src/main/java/org/apache/isis/core/webapp/IsisModuleCoreWebapp.java
index 0d95e1d..e8b7ec8 100644
--- a/core/webapp/src/main/java/org/apache/isis/core/webapp/IsisModuleCoreWebapp.java
+++ b/core/webapp/src/main/java/org/apache/isis/core/webapp/IsisModuleCoreWebapp.java
@@ -21,7 +21,7 @@ package org.apache.isis.core.webapp;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
-import org.apache.isis.core.runtime.IsisCoreModuleRuntime;
+import org.apache.isis.core.runtime.IsisModuleCoreRuntime;
import org.apache.isis.core.webapp.modules.logonlog.WebModuleLogOnExceptionLogger;
import org.apache.isis.core.webapp.modules.templresources.WebModuleTemplateResources;
import org.apache.isis.core.webapp.health.HealthIndicatorUsingHealthCheckService;
@@ -30,7 +30,7 @@ import org.apache.isis.core.webapp.webappctx.IsisWebAppContextInitializer;
@Configuration
@Import({
// modules
- IsisCoreModuleRuntime.class,
+ IsisModuleCoreRuntime.class,
// @Service's
WebModuleLogOnExceptionLogger.class,
diff --git a/examples/demo/src/main/java/demoapp/webapp/DemoApp.java b/examples/demo/src/main/java/demoapp/webapp/DemoApp.java
index aadac64..190680e 100644
--- a/examples/demo/src/main/java/demoapp/webapp/DemoApp.java
+++ b/examples/demo/src/main/java/demoapp/webapp/DemoApp.java
@@ -31,22 +31,22 @@ import org.springframework.context.annotation.PropertySource;
import org.springframework.context.annotation.PropertySources;
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.extensions.secman.api.SecurityModuleConfig;
import org.apache.isis.extensions.secman.api.permission.PermissionsEvaluationService;
import org.apache.isis.extensions.secman.api.permission.PermissionsEvaluationServiceAllowBeatsVeto;
-import org.apache.isis.extensions.secman.encryption.jbcrypt.IsisModuleSecmanEncryptionJbcrypt;
-import org.apache.isis.extensions.secman.jdo.IsisModuleSecmanPersistenceJdo;
-import org.apache.isis.extensions.secman.model.IsisModuleSecmanModel;
-import org.apache.isis.extensions.secman.shiro.IsisModuleSecmanRealmShiro;
+import org.apache.isis.extensions.secman.encryption.jbcrypt.IsisModuleExtSecmanEncryptionJbcrypt;
+import org.apache.isis.extensions.secman.jdo.IsisModuleExtSecmanPersistenceJdo;
+import org.apache.isis.extensions.secman.model.IsisModuleExtSecmanModel;
+import org.apache.isis.extensions.secman.shiro.IsisModuleExtSecmanRealmShiro;
import org.apache.isis.valuetypes.sse.applib.IsisModuleValSseApplib;
import org.apache.isis.incubator.model.metamodel.IsisModuleIncModelMetaModel;
import org.apache.isis.persistence.jdo.datanucleus5.IsisModuleJdoDataNucleus5;
import org.apache.isis.security.shiro.IsisModuleSecurityShiro;
import org.apache.isis.valuetypes.asciidoc.ui.IsisModuleValAsciidocUi;
-import org.apache.isis.viewer.restfulobjects.jaxrsresteasy4.IsisModuleRestfulObjectsJaxrsResteasy4;
-import org.apache.isis.viewer.restfulobjects.viewer.IsisModuleRestfulObjectsViewer;
-import org.apache.isis.viewer.wicket.viewer.IsisModuleWicketViewer;
+import org.apache.isis.viewer.restfulobjects.jaxrsresteasy4.IsisModuleViewerRestfulObjectsJaxrsResteasy4;
+import org.apache.isis.viewer.restfulobjects.viewer.IsisModuleViewerRestfulObjectsViewer;
+import org.apache.isis.viewer.wicket.viewer.IsisModuleViewerWicketViewer;
import org.apache.isis.core.webspringboot.IsisModuleCoreWebSpringBoot;
import demoapp.dom.DemoModule;
@@ -86,21 +86,21 @@ public class DemoApp extends SpringBootServletInitializer {
IsisModuleCoreWebSpringBoot.class,
IsisModuleSecurityShiro.class,
IsisModuleJdoDataNucleus5.class,
- IsisModuleWicketViewer.class,
+ IsisModuleViewerWicketViewer.class,
IsisModuleValSseApplib.class, // server sent events
IsisModuleValAsciidocUi.class, // ascii-doc rendering support
// REST
- IsisModuleRestfulObjectsViewer.class,
- IsisModuleRestfulObjectsJaxrsResteasy4.class,
+ IsisModuleViewerRestfulObjectsViewer.class,
+ IsisModuleViewerRestfulObjectsJaxrsResteasy4.class,
// Security Manager Extension (secman)
- IsisModuleSecmanModel.class,
- IsisModuleSecmanRealmShiro.class,
- IsisModuleSecmanPersistenceJdo.class,
- IsisModuleSecmanEncryptionJbcrypt.class,
+ IsisModuleExtSecmanModel.class,
+ IsisModuleExtSecmanRealmShiro.class,
+ IsisModuleExtSecmanPersistenceJdo.class,
+ IsisModuleExtSecmanEncryptionJbcrypt.class,
- IsisModuleTstFixturesApplib.class,
+ IsisModuleTestingFixturesApplib.class,
IsisModuleIncModelMetaModel.class, // @Model support (incubator)
diff --git a/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingJdo.java b/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingJdo.java
index 95df259..97534f7 100644
--- a/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingJdo.java
+++ b/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingJdo.java
@@ -25,7 +25,7 @@ import org.springframework.context.annotation.PropertySource;
import org.springframework.context.annotation.PropertySources;
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.persistence.jdo.datanucleus5.IsisModuleJdoDataNucleus5;
import org.apache.isis.security.bypass.IsisModuleSecurityBypass;
import org.apache.isis.testdomain.jdo.JdoTestDomainModule;
@@ -36,7 +36,7 @@ import org.apache.isis.core.webspringboot.IsisModuleCoreWebSpringBoot;
IsisModuleCoreWebSpringBoot.class,
IsisModuleSecurityBypass.class,
IsisModuleJdoDataNucleus5.class,
- IsisModuleTstFixturesApplib.class
+ IsisModuleTestingFixturesApplib.class
})
@ComponentScan(
basePackageClasses= {
diff --git a/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingJdoAndShiro.java b/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingJdoAndShiro.java
index 9b7ade7..1f92459 100644
--- a/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingJdoAndShiro.java
+++ b/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingJdoAndShiro.java
@@ -28,7 +28,7 @@ import org.springframework.context.annotation.PropertySource;
import org.springframework.context.annotation.PropertySources;
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.extensions.secman.api.SecurityModuleConfig;
import org.apache.isis.extensions.secman.api.permission.PermissionsEvaluationService;
import org.apache.isis.extensions.secman.api.permission.PermissionsEvaluationServiceAllowBeatsVeto;
@@ -44,7 +44,7 @@ import org.apache.isis.core.webspringboot.IsisModuleCoreWebSpringBoot;
IsisModuleSecurityShiro.class,
IsisModuleJdoDataNucleus5.class,
- IsisModuleTstFixturesApplib.class
+ IsisModuleTestingFixturesApplib.class
})
@ComponentScan(
basePackageClasses= {
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/rest/RestServiceTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/rest/RestServiceTest.java
index 47eb998..a4245e5 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/rest/RestServiceTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/rest/RestServiceTest.java
@@ -35,7 +35,7 @@ import static org.junit.jupiter.api.Assertions.fail;
import org.apache.isis.core.config.presets.IsisPresets;
import org.apache.isis.testdomain.conf.Configuration_usingJdo;
import org.apache.isis.testdomain.jdo.Book;
-import org.apache.isis.viewer.restfulobjects.jaxrsresteasy4.IsisModuleRestfulObjectsJaxrsResteasy4;
+import org.apache.isis.viewer.restfulobjects.jaxrsresteasy4.IsisModuleViewerRestfulObjectsJaxrsResteasy4;
import lombok.val;
@@ -45,7 +45,7 @@ import lombok.val;
@TestPropertySource(IsisPresets.UseLog4j2Test)
@Import({
Configuration_usingJdo.class,
- IsisModuleRestfulObjectsJaxrsResteasy4.class
+ IsisModuleViewerRestfulObjectsJaxrsResteasy4.class
})
class RestServiceTest {
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdapTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdapTest.java
index cc5127b..3adf52e 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdapTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdapTest.java
@@ -42,10 +42,10 @@ import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
import org.apache.isis.extensions.secman.api.SecurityModuleConfig;
import org.apache.isis.extensions.secman.api.role.ApplicationRoleRepository;
import org.apache.isis.extensions.secman.api.user.ApplicationUserRepository;
-import org.apache.isis.extensions.secman.encryption.jbcrypt.IsisModuleSecmanEncryptionJbcrypt;
-import org.apache.isis.extensions.secman.jdo.IsisModuleSecmanPersistenceJdo;
-import org.apache.isis.extensions.secman.model.IsisModuleSecmanModel;
-import org.apache.isis.extensions.secman.shiro.IsisModuleSecmanRealmShiro;
+import org.apache.isis.extensions.secman.encryption.jbcrypt.IsisModuleExtSecmanEncryptionJbcrypt;
+import org.apache.isis.extensions.secman.jdo.IsisModuleExtSecmanPersistenceJdo;
+import org.apache.isis.extensions.secman.model.IsisModuleExtSecmanModel;
+import org.apache.isis.extensions.secman.shiro.IsisModuleExtSecmanRealmShiro;
import org.apache.isis.testdomain.Incubating;
import org.apache.isis.testdomain.Smoketest;
import org.apache.isis.testdomain.conf.Configuration_usingJdoAndShiro;
@@ -72,10 +72,10 @@ import lombok.val;
LdapServerService.class,
// Security Manager Extension (secman)
- IsisModuleSecmanModel.class,
- IsisModuleSecmanRealmShiro.class,
- IsisModuleSecmanPersistenceJdo.class,
- IsisModuleSecmanEncryptionJbcrypt.class,
+ IsisModuleExtSecmanModel.class,
+ IsisModuleExtSecmanRealmShiro.class,
+ IsisModuleExtSecmanPersistenceJdo.class,
+ IsisModuleExtSecmanEncryptionJbcrypt.class,
})
@Incubating("does not work with surefire")
class ShiroSecmanLdapTest extends AbstractShiroTest {
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdap_restfulStressTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdap_restfulStressTest.java
index 066083e..2c225e5 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdap_restfulStressTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdap_restfulStressTest.java
@@ -40,10 +40,10 @@ import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
import org.apache.isis.extensions.secman.api.SecurityModuleConfig;
import org.apache.isis.extensions.secman.api.role.ApplicationRoleRepository;
import org.apache.isis.extensions.secman.api.user.ApplicationUserRepository;
-import org.apache.isis.extensions.secman.encryption.jbcrypt.IsisModuleSecmanEncryptionJbcrypt;
-import org.apache.isis.extensions.secman.jdo.IsisModuleSecmanPersistenceJdo;
-import org.apache.isis.extensions.secman.model.IsisModuleSecmanModel;
-import org.apache.isis.extensions.secman.shiro.IsisModuleSecmanRealmShiro;
+import org.apache.isis.extensions.secman.encryption.jbcrypt.IsisModuleExtSecmanEncryptionJbcrypt;
+import org.apache.isis.extensions.secman.jdo.IsisModuleExtSecmanPersistenceJdo;
+import org.apache.isis.extensions.secman.model.IsisModuleExtSecmanModel;
+import org.apache.isis.extensions.secman.shiro.IsisModuleExtSecmanRealmShiro;
import org.apache.isis.security.shiro.webmodule.WebModuleShiro;
import org.apache.isis.testdomain.Incubating;
import org.apache.isis.testdomain.Smoketest;
@@ -51,7 +51,7 @@ import org.apache.isis.testdomain.conf.Configuration_usingJdoAndShiro;
import org.apache.isis.testdomain.jdo.JdoTestDomainPersona;
import org.apache.isis.testdomain.ldap.LdapServerService;
import org.apache.isis.testdomain.rest.RestEndpointService;
-import org.apache.isis.viewer.restfulobjects.viewer.IsisModuleRestfulObjectsViewer;
+import org.apache.isis.viewer.restfulobjects.viewer.IsisModuleViewerRestfulObjectsViewer;
import lombok.val;
@@ -71,17 +71,17 @@ import lombok.val;
@Import({
// Restful server
- IsisModuleRestfulObjectsViewer.class,
+ IsisModuleViewerRestfulObjectsViewer.class,
RestEndpointService.class,
// Embedded LDAP server for testing
LdapServerService.class,
// Security Manager Extension (secman)
- IsisModuleSecmanModel.class,
- IsisModuleSecmanRealmShiro.class,
- IsisModuleSecmanPersistenceJdo.class,
- IsisModuleSecmanEncryptionJbcrypt.class,
+ IsisModuleExtSecmanModel.class,
+ IsisModuleExtSecmanRealmShiro.class,
+ IsisModuleExtSecmanPersistenceJdo.class,
+ IsisModuleExtSecmanEncryptionJbcrypt.class,
})
@Incubating("does not work, when executed in sequence with other smoketests")
class ShiroSecmanLdap_restfulStressTest extends AbstractShiroTest {
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanTest.java
index d84f701..806c981 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanTest.java
@@ -39,10 +39,10 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.core.config.presets.IsisPresets;
import org.apache.isis.extensions.secman.api.SecurityModuleConfig;
-import org.apache.isis.extensions.secman.encryption.jbcrypt.IsisModuleSecmanEncryptionJbcrypt;
-import org.apache.isis.extensions.secman.jdo.IsisModuleSecmanPersistenceJdo;
-import org.apache.isis.extensions.secman.model.IsisModuleSecmanModel;
-import org.apache.isis.extensions.secman.shiro.IsisModuleSecmanRealmShiro;
+import org.apache.isis.extensions.secman.encryption.jbcrypt.IsisModuleExtSecmanEncryptionJbcrypt;
+import org.apache.isis.extensions.secman.jdo.IsisModuleExtSecmanPersistenceJdo;
+import org.apache.isis.extensions.secman.model.IsisModuleExtSecmanModel;
+import org.apache.isis.extensions.secman.shiro.IsisModuleExtSecmanRealmShiro;
import org.apache.isis.testdomain.Incubating;
import org.apache.isis.testdomain.Smoketest;
import org.apache.isis.testdomain.conf.Configuration_usingJdoAndShiro;
@@ -56,10 +56,10 @@ import lombok.val;
})
@Import({
// Security Manager Extension (secman)
- IsisModuleSecmanModel.class,
- IsisModuleSecmanRealmShiro.class,
- IsisModuleSecmanPersistenceJdo.class,
- IsisModuleSecmanEncryptionJbcrypt.class,
+ IsisModuleExtSecmanModel.class,
+ IsisModuleExtSecmanRealmShiro.class,
+ IsisModuleExtSecmanPersistenceJdo.class,
+ IsisModuleExtSecmanEncryptionJbcrypt.class,
})
@TestPropertySource(IsisPresets.UseLog4j2Test)
@Incubating("does not work with surefire")
diff --git a/extensions/security/secman/encryption-jbcrypt/src/main/java/org/apache/isis/extensions/secman/encryption/jbcrypt/IsisModuleSecmanEncryptionJbcrypt.java b/extensions/security/secman/encryption-jbcrypt/src/main/java/org/apache/isis/extensions/secman/encryption/jbcrypt/IsisModuleExtSecmanEncryptionJbcrypt.java
similarity index 95%
rename from extensions/security/secman/encryption-jbcrypt/src/main/java/org/apache/isis/extensions/secman/encryption/jbcrypt/IsisModuleSecmanEncryptionJbcrypt.java
rename to extensions/security/secman/encryption-jbcrypt/src/main/java/org/apache/isis/extensions/secman/encryption/jbcrypt/IsisModuleExtSecmanEncryptionJbcrypt.java
index a8dafd9..d97f6a6 100644
--- a/extensions/security/secman/encryption-jbcrypt/src/main/java/org/apache/isis/extensions/secman/encryption/jbcrypt/IsisModuleSecmanEncryptionJbcrypt.java
+++ b/extensions/security/secman/encryption-jbcrypt/src/main/java/org/apache/isis/extensions/secman/encryption/jbcrypt/IsisModuleExtSecmanEncryptionJbcrypt.java
@@ -27,6 +27,6 @@ import org.apache.isis.extensions.secman.encryption.jbcrypt.services.PasswordEnc
@Import({
PasswordEncryptionServiceUsingJBcrypt.class
})
-public class IsisModuleSecmanEncryptionJbcrypt {
+public class IsisModuleExtSecmanEncryptionJbcrypt {
}
diff --git a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/IsisModuleSecmanModel.java b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/IsisModuleExtSecmanModel.java
similarity index 92%
rename from extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/IsisModuleSecmanModel.java
rename to extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/IsisModuleExtSecmanModel.java
index b165795..c591c89 100644
--- a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/IsisModuleSecmanModel.java
+++ b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/IsisModuleExtSecmanModel.java
@@ -24,8 +24,8 @@ import org.springframework.context.annotation.Configuration;
@Configuration
@ComponentScan(
basePackageClasses= {
- IsisModuleSecmanModel.class
+ IsisModuleExtSecmanModel.class
})
-public class IsisModuleSecmanModel {
+public class IsisModuleExtSecmanModel {
}
diff --git a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/IsisModuleSecmanPersistenceJdo.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/IsisModuleExtSecmanPersistenceJdo.java
similarity index 91%
rename from extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/IsisModuleSecmanPersistenceJdo.java
rename to extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/IsisModuleExtSecmanPersistenceJdo.java
index cdd9832..d98e1f2 100644
--- a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/IsisModuleSecmanPersistenceJdo.java
+++ b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/IsisModuleExtSecmanPersistenceJdo.java
@@ -24,8 +24,8 @@ import org.springframework.context.annotation.Configuration;
@Configuration
@ComponentScan(
basePackageClasses= {
- IsisModuleSecmanPersistenceJdo.class
+ IsisModuleExtSecmanPersistenceJdo.class
})
-public class IsisModuleSecmanPersistenceJdo {
+public class IsisModuleExtSecmanPersistenceJdo {
}
diff --git a/extensions/security/secman/shiro-realm/src/main/java/org/apache/isis/extensions/secman/shiro/IsisModuleSecmanRealmShiro.java b/extensions/security/secman/shiro-realm/src/main/java/org/apache/isis/extensions/secman/shiro/IsisModuleExtSecmanRealmShiro.java
similarity index 96%
rename from extensions/security/secman/shiro-realm/src/main/java/org/apache/isis/extensions/secman/shiro/IsisModuleSecmanRealmShiro.java
rename to extensions/security/secman/shiro-realm/src/main/java/org/apache/isis/extensions/secman/shiro/IsisModuleExtSecmanRealmShiro.java
index 7cb39d4..476b831 100644
--- a/extensions/security/secman/shiro-realm/src/main/java/org/apache/isis/extensions/secman/shiro/IsisModuleSecmanRealmShiro.java
+++ b/extensions/security/secman/shiro-realm/src/main/java/org/apache/isis/extensions/secman/shiro/IsisModuleExtSecmanRealmShiro.java
@@ -27,6 +27,6 @@ import org.apache.isis.extensions.secman.shiro.services.SecurityRealmServiceUsin
@Import({
SecurityRealmServiceUsingShiro.class
})
-public class IsisModuleSecmanRealmShiro {
+public class IsisModuleExtSecmanRealmShiro {
}
diff --git a/extensions/vw/exceldownload/ui/src/main/java/org/apache/isis/extensions/viewer/wicket/exceldownload/ui/IsisModuleExtViewerWicketExcelDownloadUi.java b/extensions/vw/exceldownload/ui/src/main/java/org/apache/isis/extensions/viewer/wicket/exceldownload/ui/IsisModuleExtExcelDownloadUi.java
similarity index 95%
rename from extensions/vw/exceldownload/ui/src/main/java/org/apache/isis/extensions/viewer/wicket/exceldownload/ui/IsisModuleExtViewerWicketExcelDownloadUi.java
rename to extensions/vw/exceldownload/ui/src/main/java/org/apache/isis/extensions/viewer/wicket/exceldownload/ui/IsisModuleExtExcelDownloadUi.java
index ed2192b..a393815 100644
--- a/extensions/vw/exceldownload/ui/src/main/java/org/apache/isis/extensions/viewer/wicket/exceldownload/ui/IsisModuleExtViewerWicketExcelDownloadUi.java
+++ b/extensions/vw/exceldownload/ui/src/main/java/org/apache/isis/extensions/viewer/wicket/exceldownload/ui/IsisModuleExtExcelDownloadUi.java
@@ -28,5 +28,5 @@ import org.apache.isis.extensions.viewer.wicket.exceldownload.ui.components.Coll
// @Component's
CollectionContentsAsExcelFactory.class
})
-public class IsisModuleExtViewerWicketExcelDownloadUi {
+public class IsisModuleExtExcelDownloadUi {
}
diff --git a/extensions/vw/pdfjs/metamodel/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/metamodel/IsisModuleExtViewerWicketPdfjsMetaModel.java b/extensions/vw/pdfjs/metamodel/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/metamodel/IsisModuleExtPdfjsMetaModel.java
similarity index 88%
rename from extensions/vw/pdfjs/metamodel/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/metamodel/IsisModuleExtViewerWicketPdfjsMetaModel.java
rename to extensions/vw/pdfjs/metamodel/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/metamodel/IsisModuleExtPdfjsMetaModel.java
index 7b1cbe0..bd34ea9 100644
--- a/extensions/vw/pdfjs/metamodel/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/metamodel/IsisModuleExtViewerWicketPdfjsMetaModel.java
+++ b/extensions/vw/pdfjs/metamodel/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/metamodel/IsisModuleExtPdfjsMetaModel.java
@@ -10,5 +10,5 @@ import org.apache.isis.extensions.viewer.wicket.pdfjs.metamodel.facet.PdfJsViewe
// @Component's
PdfJsViewerFacetFromAnnotationFactory.Register.class
})
-public class IsisModuleExtViewerWicketPdfjsMetaModel {
+public class IsisModuleExtPdfjsMetaModel {
}
diff --git a/extensions/vw/pdfjs/ui/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/ui/IsisModuleExtViewerWicketPdfjsUi.java b/extensions/vw/pdfjs/ui/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/ui/IsisModuleExtPdfjsUi.java
similarity index 76%
rename from extensions/vw/pdfjs/ui/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/ui/IsisModuleExtViewerWicketPdfjsUi.java
rename to extensions/vw/pdfjs/ui/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/ui/IsisModuleExtPdfjsUi.java
index 7721ff7..79601df 100644
--- a/extensions/vw/pdfjs/ui/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/ui/IsisModuleExtViewerWicketPdfjsUi.java
+++ b/extensions/vw/pdfjs/ui/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/ui/IsisModuleExtPdfjsUi.java
@@ -3,16 +3,16 @@ package org.apache.isis.extensions.viewer.wicket.pdfjs.ui;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
-import org.apache.isis.extensions.viewer.wicket.pdfjs.metamodel.IsisModuleExtViewerWicketPdfjsMetaModel;
+import org.apache.isis.extensions.viewer.wicket.pdfjs.metamodel.IsisModuleExtPdfjsMetaModel;
import org.apache.isis.extensions.viewer.wicket.pdfjs.ui.components.PdfJsViewerPanelComponentFactory;
@Configuration
@Import({
// modules
- IsisModuleExtViewerWicketPdfjsMetaModel.class,
+ IsisModuleExtPdfjsMetaModel.class,
// @Component's
PdfJsViewerPanelComponentFactory.class,
})
-public class IsisModuleExtViewerWicketPdfjsUi {
+public class IsisModuleExtPdfjsUi {
}
diff --git a/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/IsisModuleJdoApplib.java b/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/IsisModulePersistenceJdoApplib.java
similarity index 95%
rename from persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/IsisModuleJdoApplib.java
rename to persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/IsisModulePersistenceJdoApplib.java
index 310ee16..bad4667 100644
--- a/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/IsisModuleJdoApplib.java
+++ b/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/IsisModulePersistenceJdoApplib.java
@@ -21,5 +21,5 @@ package org.apache.isis.persistence.jdo.applib;
import org.springframework.context.annotation.Configuration;
@Configuration
-public class IsisModuleJdoApplib {
+public class IsisModulePersistenceJdoApplib {
}
diff --git a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/IsisModuleJdoDataNucleus5.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/IsisModuleJdoDataNucleus5.java
index bafa317..ae358d0 100644
--- a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/IsisModuleJdoDataNucleus5.java
+++ b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/IsisModuleJdoDataNucleus5.java
@@ -26,7 +26,7 @@ import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
-import org.apache.isis.persistence.jdo.applib.IsisModuleJdoApplib;
+import org.apache.isis.persistence.jdo.applib.IsisModulePersistenceJdoApplib;
import org.apache.isis.persistence.jdo.datanucleus5.datanucleus.DataNucleusSettings;
import org.apache.isis.persistence.jdo.datanucleus5.datanucleus.service.JdoPersistenceLifecycleService;
import org.apache.isis.persistence.jdo.datanucleus5.exceprecog.ExceptionRecognizerCompositeForJdoObjectStore;
@@ -39,13 +39,13 @@ import org.apache.isis.persistence.jdo.datanucleus5.metamodel.JdoProgrammingMode
import org.apache.isis.persistence.jdo.datanucleus5.metrics.MetricsServiceDefault;
import org.apache.isis.persistence.jdo.datanucleus5.persistence.IsisPlatformTransactionManagerForJdo;
import org.apache.isis.persistence.jdo.datanucleus5.persistence.PersistenceSessionFactory5;
-import org.apache.isis.core.runtime.IsisCoreModuleRuntime;
+import org.apache.isis.core.runtime.IsisModuleCoreRuntime;
@Configuration
@Import({
// modules
- IsisCoreModuleRuntime.class,
- IsisModuleJdoApplib.class,
+ IsisModuleCoreRuntime.class,
+ IsisModulePersistenceJdoApplib.class,
// @Component's
JdoProgrammingModelPlugin.class,
diff --git a/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/IsisModuleSubBaseApplib.java b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/IsisModuleSubdomainsBaseApplib.java
similarity index 73%
rename from subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/IsisModuleSubBaseApplib.java
rename to subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/IsisModuleSubdomainsBaseApplib.java
index 0e82dcd..3af6745 100644
--- a/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/IsisModuleSubBaseApplib.java
+++ b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/IsisModuleSubdomainsBaseApplib.java
@@ -3,5 +3,5 @@ package org.apache.isis.subdomains.base.applib;
import org.springframework.context.annotation.Configuration;
@Configuration
-public class IsisModuleSubBaseApplib {
+public class IsisModuleSubdomainsBaseApplib {
}
diff --git a/subdomains/docx/applib/src/main/java/org/apache/isis/subdomains/docx/applib/IsisModuleSubDocxApplib.java b/subdomains/docx/applib/src/main/java/org/apache/isis/subdomains/docx/applib/IsisModuleSubdomainsDocxApplib.java
similarity index 95%
rename from subdomains/docx/applib/src/main/java/org/apache/isis/subdomains/docx/applib/IsisModuleSubDocxApplib.java
rename to subdomains/docx/applib/src/main/java/org/apache/isis/subdomains/docx/applib/IsisModuleSubdomainsDocxApplib.java
index a01a597..a120f8e 100644
--- a/subdomains/docx/applib/src/main/java/org/apache/isis/subdomains/docx/applib/IsisModuleSubDocxApplib.java
+++ b/subdomains/docx/applib/src/main/java/org/apache/isis/subdomains/docx/applib/IsisModuleSubdomainsDocxApplib.java
@@ -22,6 +22,6 @@ import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
@Configuration
-public class IsisModuleSubDocxApplib {
+public class IsisModuleSubdomainsDocxApplib {
}
diff --git a/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/IsisModuleSubExcelApplib.java b/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/IsisModuleSubdomainsExcelApplib.java
similarity index 81%
rename from subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/IsisModuleSubExcelApplib.java
rename to subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/IsisModuleSubdomainsExcelApplib.java
index 43bf630..3e7d23e 100644
--- a/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/IsisModuleSubExcelApplib.java
+++ b/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/IsisModuleSubdomainsExcelApplib.java
@@ -5,5 +5,5 @@ import org.springframework.context.annotation.Configuration;
@Configuration
@ComponentScan
-public class IsisModuleSubExcelApplib {
+public class IsisModuleSubdomainsExcelApplib {
}
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/IsisModuleSubExcelFixtures.java b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/IsisModuleSubdomainsExcelFixtures.java
similarity index 66%
rename from subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/IsisModuleSubExcelFixtures.java
rename to subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/IsisModuleSubdomainsExcelFixtures.java
index a743477..f66e979 100644
--- a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/IsisModuleSubExcelFixtures.java
+++ b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/IsisModuleSubdomainsExcelFixtures.java
@@ -4,19 +4,19 @@ import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
-import org.apache.isis.subdomains.excel.applib.IsisModuleSubExcelApplib;
+import org.apache.isis.subdomains.excel.applib.IsisModuleSubdomainsExcelApplib;
import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.fixturescripts.ExcelDemoToDoItem_tearDown;
-import org.apache.isis.testing.fixtures.applib.IsisModuleTstFixturesApplib;
+import org.apache.isis.testing.fixtures.applib.IsisModuleTestingFixturesApplib;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
import org.apache.isis.testing.fixtures.applib.modules.ModuleWithFixtures;
@Configuration
@Import({
- IsisModuleSubExcelApplib.class,
- IsisModuleTstFixturesApplib.class
+ IsisModuleSubdomainsExcelApplib.class,
+ IsisModuleTestingFixturesApplib.class
})
@ComponentScan
-public class IsisModuleSubExcelFixtures implements ModuleWithFixtures {
+public class IsisModuleSubdomainsExcelFixtures implements ModuleWithFixtures {
@Override public FixtureScript getTeardownFixture() {
return new ExcelDemoToDoItem_tearDown();
diff --git a/subdomains/excel/integtests/src/test/java/org/apache/isis/subdomains/excel/integtests/ExcelModuleIntegTestAbstract.java b/subdomains/excel/integtests/src/test/java/org/apache/isis/subdomains/excel/integtests/ExcelModuleIntegTestAbstract.java
index 04cdd8f..82d3cee 100644
--- a/subdomains/excel/integtests/src/test/java/org/apache/isis/subdomains/excel/integtests/ExcelModuleIntegTestAbstract.java
+++ b/subdomains/excel/integtests/src/test/java/org/apache/isis/subdomains/excel/integtests/ExcelModuleIntegTestAbstract.java
@@ -13,9 +13,9 @@ import org.apache.isis.core.config.presets.IsisPresets;
import org.apache.isis.core.webspringboot.IsisModuleCoreWebSpringBoot;
import org.apache.isis.persistence.jdo.datanucleus5.IsisModuleJdoDataNucleus5;
import org.apache.isis.security.bypass.IsisModuleSecurityBypass;
-import org.apache.isis.subdomains.excel.fixtures.IsisModuleSubExcelFixtures;
+import org.apache.isis.subdomains.excel.fixtures.IsisModuleSubdomainsExcelFixtures;
import org.apache.isis.testing.fixtures.applib.IsisIntegrationTestAbstractWithFixtures;
-import org.apache.isis.testing.fixtures.applib.IsisModuleTstFixturesApplib;
+import org.apache.isis.testing.fixtures.applib.IsisModuleTestingFixturesApplib;
@SpringBootTest(
classes = ExcelModuleIntegTestAbstract.AppManifest.class
@@ -35,13 +35,13 @@ public abstract class ExcelModuleIntegTestAbstract extends IsisIntegrationTestAb
IsisModuleCoreWebSpringBoot.class,
IsisModuleSecurityBypass.class,
IsisModuleJdoDataNucleus5.class,
- IsisModuleTstFixturesApplib.class,
+ IsisModuleTestingFixturesApplib.class,
/*
new ExcelFixturesModule(),
FakeDataModule.class
*/
- IsisModuleSubExcelFixtures.class
+ IsisModuleSubdomainsExcelFixtures.class
})
public static class AppManifest {
}
diff --git a/subdomains/excel/testing/src/main/java/org/apache/isis/subdomains/excel/testing/IsisModuleSubExcelTesting.java b/subdomains/excel/testing/src/main/java/org/apache/isis/subdomains/excel/testing/IsisModuleSubdomainsExcelTesting.java
similarity index 81%
rename from subdomains/excel/testing/src/main/java/org/apache/isis/subdomains/excel/testing/IsisModuleSubExcelTesting.java
rename to subdomains/excel/testing/src/main/java/org/apache/isis/subdomains/excel/testing/IsisModuleSubdomainsExcelTesting.java
index 2f6cd70..c1bcd52 100644
--- a/subdomains/excel/testing/src/main/java/org/apache/isis/subdomains/excel/testing/IsisModuleSubExcelTesting.java
+++ b/subdomains/excel/testing/src/main/java/org/apache/isis/subdomains/excel/testing/IsisModuleSubdomainsExcelTesting.java
@@ -5,5 +5,5 @@ import org.springframework.context.annotation.Configuration;
@Configuration
@ComponentScan
-public class IsisModuleSubExcelTesting {
+public class IsisModuleSubdomainsExcelTesting {
}
diff --git a/subdomains/freemarker/applib/src/main/java/org/apache/isis/subdomains/freemarker/applib/IsisModuleSubFreemarkerApplib.java b/subdomains/freemarker/applib/src/main/java/org/apache/isis/subdomains/freemarker/applib/IsisModuleSubdomainsFreemarkerApplib.java
similarity index 95%
rename from subdomains/freemarker/applib/src/main/java/org/apache/isis/subdomains/freemarker/applib/IsisModuleSubFreemarkerApplib.java
rename to subdomains/freemarker/applib/src/main/java/org/apache/isis/subdomains/freemarker/applib/IsisModuleSubdomainsFreemarkerApplib.java
index 4e69c2a..866b0d4 100644
--- a/subdomains/freemarker/applib/src/main/java/org/apache/isis/subdomains/freemarker/applib/IsisModuleSubFreemarkerApplib.java
+++ b/subdomains/freemarker/applib/src/main/java/org/apache/isis/subdomains/freemarker/applib/IsisModuleSubdomainsFreemarkerApplib.java
@@ -23,6 +23,6 @@ import org.springframework.context.annotation.Configuration;
@Configuration
@ComponentScan
-public class IsisModuleSubFreemarkerApplib {
+public class IsisModuleSubdomainsFreemarkerApplib {
}
diff --git a/subdomains/ognl/applib/src/main/java/org/apache/isis/subdomains/ognl/applib/IsisModuleSubOgnlApplib.java b/subdomains/ognl/applib/src/main/java/org/apache/isis/subdomains/ognl/applib/IsisModuleSubdomainsOgnlApplib.java
similarity index 95%
rename from subdomains/ognl/applib/src/main/java/org/apache/isis/subdomains/ognl/applib/IsisModuleSubOgnlApplib.java
rename to subdomains/ognl/applib/src/main/java/org/apache/isis/subdomains/ognl/applib/IsisModuleSubdomainsOgnlApplib.java
index 3dbee72..3b04652 100644
--- a/subdomains/ognl/applib/src/main/java/org/apache/isis/subdomains/ognl/applib/IsisModuleSubOgnlApplib.java
+++ b/subdomains/ognl/applib/src/main/java/org/apache/isis/subdomains/ognl/applib/IsisModuleSubdomainsOgnlApplib.java
@@ -23,6 +23,6 @@ import org.springframework.context.annotation.Configuration;
@Configuration
@ComponentScan
-public class IsisModuleSubOgnlApplib {
+public class IsisModuleSubdomainsOgnlApplib {
}
diff --git a/subdomains/pdfbox/applib/src/main/java/org/apache/isis/subdomains/pdfbox/applib/IsisModuleSubPdfBoxApplib.java b/subdomains/pdfbox/applib/src/main/java/org/apache/isis/subdomains/pdfbox/applib/IsisModuleSubdomainsPdfBoxApplib.java
similarity index 95%
rename from subdomains/pdfbox/applib/src/main/java/org/apache/isis/subdomains/pdfbox/applib/IsisModuleSubPdfBoxApplib.java
rename to subdomains/pdfbox/applib/src/main/java/org/apache/isis/subdomains/pdfbox/applib/IsisModuleSubdomainsPdfBoxApplib.java
index fe2733c..68fa12d 100644
--- a/subdomains/pdfbox/applib/src/main/java/org/apache/isis/subdomains/pdfbox/applib/IsisModuleSubPdfBoxApplib.java
+++ b/subdomains/pdfbox/applib/src/main/java/org/apache/isis/subdomains/pdfbox/applib/IsisModuleSubdomainsPdfBoxApplib.java
@@ -23,6 +23,6 @@ import org.springframework.context.annotation.Configuration;
@Configuration
@ComponentScan
-public class IsisModuleSubPdfBoxApplib {
+public class IsisModuleSubdomainsPdfBoxApplib {
}
diff --git a/subdomains/spring/applib/src/main/java/org/apache/isis/subdomains/spring/applib/IsisModuleSubSpringApplib.java b/subdomains/spring/applib/src/main/java/org/apache/isis/subdomains/spring/applib/IsisModuleSubdomainsSpringApplib.java
similarity index 95%
rename from subdomains/spring/applib/src/main/java/org/apache/isis/subdomains/spring/applib/IsisModuleSubSpringApplib.java
rename to subdomains/spring/applib/src/main/java/org/apache/isis/subdomains/spring/applib/IsisModuleSubdomainsSpringApplib.java
index 3768961..48fdd9e 100644
--- a/subdomains/spring/applib/src/main/java/org/apache/isis/subdomains/spring/applib/IsisModuleSubSpringApplib.java
+++ b/subdomains/spring/applib/src/main/java/org/apache/isis/subdomains/spring/applib/IsisModuleSubdomainsSpringApplib.java
@@ -27,6 +27,6 @@ import org.apache.isis.subdomains.spring.applib.service.SpringBeansService;
@Import({
SpringBeansService.class
})
-public class IsisModuleSubSpringApplib {
+public class IsisModuleSubdomainsSpringApplib {
}
diff --git a/subdomains/xdocreport/applib/src/main/java/org/apache/isis/subdomains/xdocreport/applib/IsisModuleSubXDocReportApplib.java b/subdomains/xdocreport/applib/src/main/java/org/apache/isis/subdomains/xdocreport/applib/IsisModuleSubdomainsXDocReportApplib.java
similarity index 95%
rename from subdomains/xdocreport/applib/src/main/java/org/apache/isis/subdomains/xdocreport/applib/IsisModuleSubXDocReportApplib.java
rename to subdomains/xdocreport/applib/src/main/java/org/apache/isis/subdomains/xdocreport/applib/IsisModuleSubdomainsXDocReportApplib.java
index 19cb83d..b781134 100644
--- a/subdomains/xdocreport/applib/src/main/java/org/apache/isis/subdomains/xdocreport/applib/IsisModuleSubXDocReportApplib.java
+++ b/subdomains/xdocreport/applib/src/main/java/org/apache/isis/subdomains/xdocreport/applib/IsisModuleSubdomainsXDocReportApplib.java
@@ -23,6 +23,6 @@ import org.springframework.context.annotation.Configuration;
@Configuration
@ComponentScan
-public class IsisModuleSubXDocReportApplib {
+public class IsisModuleSubdomainsXDocReportApplib {
}
diff --git a/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/IsisModuleTstFakeDataApplib.java b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/IsisModuleTestingFakeDataApplib.java
similarity index 81%
rename from testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/IsisModuleTstFakeDataApplib.java
rename to testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/IsisModuleTestingFakeDataApplib.java
index 56a5724..b85eade 100644
--- a/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/IsisModuleTstFakeDataApplib.java
+++ b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/IsisModuleTestingFakeDataApplib.java
@@ -5,6 +5,6 @@ import org.springframework.context.annotation.Configuration;
@Configuration
@ComponentScan
-public class IsisModuleTstFakeDataApplib {
+public class IsisModuleTestingFakeDataApplib {
}
diff --git a/testing/fakedata/fixtures/src/main/java/org/apache/isis/testing/fakedata/fixtures/IsisModuleTstFakeDataFixtures.java b/testing/fakedata/fixtures/src/main/java/org/apache/isis/testing/fakedata/fixtures/IsisModuleTestingFakeDataFixtures.java
similarity index 76%
rename from testing/fakedata/fixtures/src/main/java/org/apache/isis/testing/fakedata/fixtures/IsisModuleTstFakeDataFixtures.java
rename to testing/fakedata/fixtures/src/main/java/org/apache/isis/testing/fakedata/fixtures/IsisModuleTestingFakeDataFixtures.java
index e1068df..21ce1c3 100644
--- a/testing/fakedata/fixtures/src/main/java/org/apache/isis/testing/fakedata/fixtures/IsisModuleTstFakeDataFixtures.java
+++ b/testing/fakedata/fixtures/src/main/java/org/apache/isis/testing/fakedata/fixtures/IsisModuleTestingFakeDataFixtures.java
@@ -4,17 +4,17 @@ import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
-import org.apache.isis.testing.fakedata.applib.IsisModuleTstFakeDataApplib;
+import org.apache.isis.testing.fakedata.applib.IsisModuleTestingFakeDataApplib;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
import org.apache.isis.testing.fixtures.applib.modules.ModuleWithFixtures;
import org.apache.isis.testing.fakedata.fixtures.demoapp.demomodule.fixturescripts.FakeDataDemoObjectWithAll_tearDown;
@Configuration
@Import({
- IsisModuleTstFakeDataApplib.class
+ IsisModuleTestingFakeDataApplib.class
})
@ComponentScan
-public class IsisModuleTstFakeDataFixtures implements ModuleWithFixtures {
+public class IsisModuleTestingFakeDataFixtures implements ModuleWithFixtures {
@Override public FixtureScript getTeardownFixture() {
return new FakeDataDemoObjectWithAll_tearDown();
diff --git a/testing/fakedata/integtests/src/test/java/org/apache/isis/testing/fakedata/integtests/FakeDataModuleIntegTestAbstract.java b/testing/fakedata/integtests/src/test/java/org/apache/isis/testing/fakedata/integtests/FakeDataModuleIntegTestAbstract.java
index ba4252e..740e92a 100644
--- a/testing/fakedata/integtests/src/test/java/org/apache/isis/testing/fakedata/integtests/FakeDataModuleIntegTestAbstract.java
+++ b/testing/fakedata/integtests/src/test/java/org/apache/isis/testing/fakedata/integtests/FakeDataModuleIntegTestAbstract.java
@@ -14,9 +14,9 @@ import org.apache.isis.core.config.presets.IsisPresets;
import org.apache.isis.core.webspringboot.IsisModuleCoreWebSpringBoot;
import org.apache.isis.persistence.jdo.datanucleus5.IsisModuleJdoDataNucleus5;
import org.apache.isis.security.bypass.IsisModuleSecurityBypass;
-import org.apache.isis.testing.fakedata.fixtures.IsisModuleTstFakeDataFixtures;
+import org.apache.isis.testing.fakedata.fixtures.IsisModuleTestingFakeDataFixtures;
import org.apache.isis.testing.fixtures.applib.IsisIntegrationTestAbstractWithFixtures;
-import org.apache.isis.testing.fixtures.applib.IsisModuleTstFixturesApplib;
+import org.apache.isis.testing.fixtures.applib.IsisModuleTestingFixturesApplib;
@SpringBootTest(
classes = FakeDataModuleIntegTestAbstract.AppManifest.class
@@ -36,8 +36,8 @@ public abstract class FakeDataModuleIntegTestAbstract extends IsisIntegrationTes
IsisModuleCoreWebSpringBoot.class,
IsisModuleSecurityBypass.class,
IsisModuleJdoDataNucleus5.class,
- IsisModuleTstFixturesApplib.class,
- IsisModuleTstFakeDataFixtures.class
+ IsisModuleTestingFixturesApplib.class,
+ IsisModuleTestingFakeDataFixtures.class
})
public static class AppManifest {
}
diff --git a/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/IsisModuleTstFixturesApplib.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/IsisModuleTestingFixturesApplib.java
similarity index 90%
rename from testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/IsisModuleTstFixturesApplib.java
rename to testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/IsisModuleTestingFixturesApplib.java
index de8ea35..8361deb 100644
--- a/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/IsisModuleTstFixturesApplib.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/IsisModuleTestingFixturesApplib.java
@@ -25,13 +25,13 @@ import org.apache.isis.testing.fixtures.applib.fixturescripts.ExecutionParameter
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
import org.apache.isis.testing.fixtures.applib.legacy.queryresultscache.QueryResultsCacheControlDefault;
import org.apache.isis.testing.fixtures.applib.modules.ModuleWithFixturesService;
-import org.apache.isis.subdomains.spring.applib.IsisModuleSubSpringApplib;
+import org.apache.isis.subdomains.spring.applib.IsisModuleSubdomainsSpringApplib;
import org.apache.isis.testing.fixtures.applib.services.FixturesLifecycleService;
@Configuration
@Import({
// modules
- IsisModuleSubSpringApplib.class,
+ IsisModuleSubdomainsSpringApplib.class,
// @Service's
FixturesLifecycleService.class,
@@ -42,6 +42,6 @@ import org.apache.isis.testing.fixtures.applib.services.FixturesLifecycleService
// @DomainService's
FixtureScripts.class,
})
-public class IsisModuleTstFixturesApplib {
+public class IsisModuleTestingFixturesApplib {
}
diff --git a/testing/specsupport/applib/src/main/java/org/apache/isis/testing/specsupport/applib/IsisModuleTestingSpecSupportApplib.java b/testing/specsupport/applib/src/main/java/org/apache/isis/testing/specsupport/applib/IsisModuleTestingSpecSupportApplib.java
new file mode 100644
index 0000000..0466316
--- /dev/null
+++ b/testing/specsupport/applib/src/main/java/org/apache/isis/testing/specsupport/applib/IsisModuleTestingSpecSupportApplib.java
@@ -0,0 +1,7 @@
+package org.apache.isis.testing.specsupport.applib;
+
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class IsisModuleTestingSpecSupportApplib {
+}
diff --git a/testing/specsupport/applib/src/main/java/org/apache/isis/testing/specsupport/applib/IsisModuleTstSpecSupportAplib.java b/testing/specsupport/applib/src/main/java/org/apache/isis/testing/specsupport/applib/IsisModuleTstSpecSupportAplib.java
deleted file mode 100644
index cd576b7..0000000
--- a/testing/specsupport/applib/src/main/java/org/apache/isis/testing/specsupport/applib/IsisModuleTstSpecSupportAplib.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package org.apache.isis.testing.specsupport.applib;
-
-public class IsisModuleTstSpecSupportAplib {
-}
diff --git a/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/IsisModuleTstUnitTestSupportApplib.java b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/IsisModuleTestingUnitTestSupportApplib.java
similarity index 71%
rename from testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/IsisModuleTstUnitTestSupportApplib.java
rename to testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/IsisModuleTestingUnitTestSupportApplib.java
index a5318f6..9aca4f3 100644
--- a/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/IsisModuleTstUnitTestSupportApplib.java
+++ b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/IsisModuleTestingUnitTestSupportApplib.java
@@ -3,5 +3,5 @@ package org.apache.isis.testing.unittestsupport.applib;
import org.springframework.context.annotation.Configuration;
@Configuration
-public class IsisModuleTstUnitTestSupportApplib {
+public class IsisModuleTestingUnitTestSupportApplib {
}
diff --git a/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/IsisModuleRestfulObjectsApplib.java b/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/IsisModuleViewerRestfulObjectsApplib.java
similarity index 72%
rename from viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/IsisModuleRestfulObjectsApplib.java
rename to viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/IsisModuleViewerRestfulObjectsApplib.java
index 540d534..7432a1e 100644
--- a/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/IsisModuleRestfulObjectsApplib.java
+++ b/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/IsisModuleViewerRestfulObjectsApplib.java
@@ -3,5 +3,5 @@ package org.apache.isis.viewer.restfulobjects.applib;
import org.springframework.context.annotation.Configuration;
@Configuration
-public class IsisModuleRestfulObjectsApplib {
+public class IsisModuleViewerRestfulObjectsApplib {
}
diff --git a/viewers/restfulobjects/jaxrs-resteasy-4/src/main/java/org/apache/isis/viewer/restfulobjects/jaxrsresteasy4/IsisModuleRestfulObjectsJaxrsResteasy4.java b/viewers/restfulobjects/jaxrs-resteasy-4/src/main/java/org/apache/isis/viewer/restfulobjects/jaxrsresteasy4/IsisModuleViewerRestfulObjectsJaxrsResteasy4.java
similarity index 73%
rename from viewers/restfulobjects/jaxrs-resteasy-4/src/main/java/org/apache/isis/viewer/restfulobjects/jaxrsresteasy4/IsisModuleRestfulObjectsJaxrsResteasy4.java
rename to viewers/restfulobjects/jaxrs-resteasy-4/src/main/java/org/apache/isis/viewer/restfulobjects/jaxrsresteasy4/IsisModuleViewerRestfulObjectsJaxrsResteasy4.java
index c254076..e2a0fbc 100644
--- a/viewers/restfulobjects/jaxrs-resteasy-4/src/main/java/org/apache/isis/viewer/restfulobjects/jaxrsresteasy4/IsisModuleRestfulObjectsJaxrsResteasy4.java
+++ b/viewers/restfulobjects/jaxrs-resteasy-4/src/main/java/org/apache/isis/viewer/restfulobjects/jaxrsresteasy4/IsisModuleViewerRestfulObjectsJaxrsResteasy4.java
@@ -5,12 +5,12 @@ import org.springframework.context.annotation.Import;
import org.apache.isis.viewer.restfulobjects.jaxrsresteasy4.conneg.RestfulObjectsJaxbWriterForXml;
import org.apache.isis.viewer.restfulobjects.jaxrsresteasy4.webmodule.WebModuleJaxrsResteasy4;
-import org.apache.isis.viewer.restfulobjects.viewer.IsisModuleRestfulObjectsViewer;
+import org.apache.isis.viewer.restfulobjects.viewer.IsisModuleViewerRestfulObjectsViewer;
@Configuration
@Import({
// modules
- IsisModuleRestfulObjectsViewer.class,
+ IsisModuleViewerRestfulObjectsViewer.class,
// @Service's
WebModuleJaxrsResteasy4.class,
@@ -20,6 +20,6 @@ import org.apache.isis.viewer.restfulobjects.viewer.IsisModuleRestfulObjectsView
})
-public class IsisModuleRestfulObjectsJaxrsResteasy4 {
+public class IsisModuleViewerRestfulObjectsJaxrsResteasy4 {
}
diff --git a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/IsisModuleRestfulObjectsRendering.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/IsisModuleRestfulObjectsRendering.java
index f1bc2a4..7c589a7 100644
--- a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/IsisModuleRestfulObjectsRendering.java
+++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/IsisModuleRestfulObjectsRendering.java
@@ -3,8 +3,8 @@ package org.apache.isis.viewer.restfulobjects.rendering;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
-import org.apache.isis.core.runtime.IsisCoreModuleRuntime;
-import org.apache.isis.viewer.restfulobjects.applib.IsisModuleRestfulObjectsApplib;
+import org.apache.isis.core.runtime.IsisModuleCoreRuntime;
+import org.apache.isis.viewer.restfulobjects.applib.IsisModuleViewerRestfulObjectsApplib;
import org.apache.isis.viewer.restfulobjects.rendering.domainobjects.JsonValueEncoder;
import org.apache.isis.viewer.restfulobjects.rendering.service.RepresentationServiceContentNegotiator;
import org.apache.isis.viewer.restfulobjects.rendering.service.acceptheader.AcceptHeaderServiceForRest;
@@ -21,8 +21,8 @@ import org.apache.isis.viewer.restfulobjects.rendering.service.swagger.internal.
@Configuration
@Import({
// modules
- IsisModuleRestfulObjectsApplib.class,
- IsisCoreModuleRuntime.class,
+ IsisModuleViewerRestfulObjectsApplib.class,
+ IsisModuleCoreRuntime.class,
// @Component's
ClassExcluderDefault.class,
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/IsisModuleRestfulObjectsViewer.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/IsisModuleViewerRestfulObjectsViewer.java
similarity index 98%
rename from viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/IsisModuleRestfulObjectsViewer.java
rename to viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/IsisModuleViewerRestfulObjectsViewer.java
index a7cef34..9924ffb 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/IsisModuleRestfulObjectsViewer.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/IsisModuleViewerRestfulObjectsViewer.java
@@ -66,6 +66,6 @@ import org.apache.isis.core.webapp.IsisModuleCoreWebapp;
AcceptHeaderServiceForRest.ResponseFilter.class,
})
-public class IsisModuleRestfulObjectsViewer {
+public class IsisModuleViewerRestfulObjectsViewer {
}
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/IsisModuleWicketModel.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/IsisModuleViewerWicketModel.java
similarity index 87%
rename from viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/IsisModuleWicketModel.java
rename to viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/IsisModuleViewerWicketModel.java
index 85ce320..0ab3aea 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/IsisModuleWicketModel.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/IsisModuleViewerWicketModel.java
@@ -10,5 +10,5 @@ import org.apache.isis.core.webapp.IsisModuleCoreWebapp;
// modules
IsisModuleCoreWebapp.class,
})
-public class IsisModuleWicketModel {
+public class IsisModuleViewerWicketModel {
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/IsisModuleWicketUi.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/IsisModuleViewerWicketUi.java
similarity index 88%
rename from viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/IsisModuleWicketUi.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/IsisModuleViewerWicketUi.java
index 9ac09a1..cb86715 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/IsisModuleWicketUi.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/IsisModuleViewerWicketUi.java
@@ -21,16 +21,16 @@ package org.apache.isis.viewer.wicket.ui;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
-import org.apache.isis.viewer.wicket.model.IsisModuleWicketModel;
+import org.apache.isis.viewer.wicket.model.IsisModuleViewerWicketModel;
import org.apache.isis.viewer.wicket.ui.components.widgets.themepicker.IsisWicketThemeSupportDefault;
@Configuration
@Import({
// modules
- IsisModuleWicketModel.class,
+ IsisModuleViewerWicketModel.class,
// @Service's
IsisWicketThemeSupportDefault.class,
})
-public class IsisModuleWicketUi {
+public class IsisModuleViewerWicketUi {
}
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisModuleWicketViewer.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisModuleViewerWicketViewer.java
similarity index 95%
rename from viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisModuleWicketViewer.java
rename to viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisModuleViewerWicketViewer.java
index 4252a47..0241aea 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisModuleWicketViewer.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisModuleViewerWicketViewer.java
@@ -22,7 +22,7 @@ package org.apache.isis.viewer.wicket.viewer;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
-import org.apache.isis.viewer.wicket.ui.IsisModuleWicketUi;
+import org.apache.isis.viewer.wicket.ui.IsisModuleViewerWicketUi;
import org.apache.isis.viewer.wicket.viewer.mixins.Object_clearHints;
import org.apache.isis.viewer.wicket.viewer.registries.components.ComponentFactoryRegistrarDefault;
import org.apache.isis.viewer.wicket.viewer.registries.components.ComponentFactoryRegistryDefault;
@@ -46,7 +46,7 @@ import org.apache.isis.viewer.wicket.viewer.webmodule.WebModuleWicket;
@Configuration
@Import({
// modules
- IsisModuleWicketUi.class,
+ IsisModuleViewerWicketUi.class,
// @Service's
BookmarkUiServiceWicket.class,
@@ -68,6 +68,6 @@ import org.apache.isis.viewer.wicket.viewer.webmodule.WebModuleWicket;
Object_clearHints.class,
})
-public class IsisModuleWicketViewer {
+public class IsisModuleViewerWicketViewer {
}