You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2022/10/21 06:49:43 UTC
[isis] branch master updated: ISIS-3142: rename IsisInteraction, IsisPresets, IsisBeanTypeRegistry, IsisBeanMetaData, IsisBeanTypeClassifier, IsisWicketApplication, IsisWicketAjaxRequestListenerUtil, IsisLdapContextFactory, IsisLdapRealm, IsisPermissionResolver, IsisPermission
This is an automated email from the ASF dual-hosted git repository.
ahuber 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 9fcc51aa79 ISIS-3142: rename IsisInteraction, IsisPresets, IsisBeanTypeRegistry, IsisBeanMetaData, IsisBeanTypeClassifier, IsisWicketApplication, IsisWicketAjaxRequestListenerUtil, IsisLdapContextFactory, IsisLdapRealm, IsisPermissionResolver, IsisPermission
9fcc51aa79 is described below
commit 9fcc51aa7914282bb572d3028d603d884a5102d2
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Oct 21 08:49:28 2022 +0200
ISIS-3142: rename IsisInteraction, IsisPresets, IsisBeanTypeRegistry,
IsisBeanMetaData, IsisBeanTypeClassifier, IsisWicketApplication,
IsisWicketAjaxRequestListenerUtil, IsisLdapContextFactory,
IsisLdapRealm, IsisPermissionResolver, IsisPermission
- also rename entries in shiro.ini files
---
.../config/pages/sections/isis.viewer.wicket.adoc | 2 +-
core/config/src/main/java/module-info.java | 2 +-
.../core/config/CausewayConfiguration.java | 6 ++--
...BeanMetaData.java => CausewayBeanMetaData.java} | 16 ++++-----
...sifier.java => CausewayBeanTypeClassifier.java} | 12 +++----
...Registry.java => CausewayBeanTypeRegistry.java} | 24 ++++++-------
.../IsisBeanFactoryPostProcessorForSpring.java | 10 +++---
.../beans/IsisBeanTypeClassifierDefault.java | 40 +++++++++++-----------
.../config/beans/IsisBeanTypeRegistryDefault.java | 22 ++++++------
.../config/beans/IsisComponentScanInterceptor.java | 4 +--
.../beans/IsisComponentScanInterceptorImpl.java | 6 ++--
.../{IsisPresets.java => CausewayPresets.java} | 2 +-
...teractionAwareTransactionalBoundaryHandler.java | 8 ++---
...isInteraction.java => CausewayInteraction.java} | 4 +--
.../interaction/InteractionDefaultTest_next.java | 4 +--
.../_testing/MetaModelContext_forTesting.java | 12 +++----
.../ClassSubstitutorForDomainObjects.java | 10 +++---
.../services/registry/ServiceRegistryDefault.java | 4 +--
.../specloader/SpecificationLoaderDefault.java | 34 +++++++++---------
.../specimpl/ObjectSpecificationAbstract.java | 25 +++++++-------
.../specimpl/dflt/ObjectSpecificationDefault.java | 4 +--
.../homepage/HomePageResolverServiceDefault.java | 6 ++--
.../session/InteractionServiceDefault.java | 18 +++++-----
.../webappctx/IsisWebAppContextInitializer.java | 15 ++++----
.../main/java/demoapp/dom/DemoModuleCommon.java | 6 ++--
.../src/main/java/demoapp/dom/DemoModuleJdo.java | 4 +--
.../jpa/ActionCommandPublishingJpa.java | 4 +--
.../jpa/ActionExecutionPublishingJpa.java | 4 +--
...ainObjectEntityChangePublishingDisabledJpa.java | 4 +--
...mainObjectEntityChangePublishingEnabledJpa.java | 4 +--
...ityChangePublishingEnabledMetaAnnotatedJpa.java | 4 +--
...ngePublishingEnabledMetaAnnotOverriddenJpa.java | 4 +--
.../viewmodels/jaxbrefentity/jpa/JaxbRefJpa.java | 4 +--
.../other/embedded/jpa/NumberConstantJpa.java | 4 +--
.../jpa/PropertyCommandPublishingJpa.java | 4 +--
.../jpa/PropertyExecutionPublishingJpa.java | 4 +--
.../projecting/jpa/PropertyProjectingChildJpa.java | 4 +--
.../core/wrapperFactory/jpa/WrapperFactoryJpa.java | 4 +--
.../secman/apptenancy/jpa/TenantedJpa.java | 4 +--
.../dom/types/isis/blobs/jpa/IsisBlobJpa.java | 4 +--
.../dom/types/isis/clobs/jpa/IsisClobJpa.java | 4 +--
.../jpa/IsisLocalResourcePathJpa.java | 4 +--
.../dom/types/isis/markups/jpa/IsisMarkupJpa.java | 4 +--
.../types/isis/passwords/jpa/IsisPasswordJpa.java | 4 +--
.../isisext/cal/jpa/IsisCalendarEventJpa.java | 4 +--
.../isisval/asciidocs/jpa/IsisAsciiDocJpa.java | 4 +--
.../isisval/markdowns/jpa/IsisMarkdownJpa.java | 4 +--
.../dom/types/isisval/vegas/jpa/IsisVegaJpa.java | 4 +--
.../images/jpa/JavaAwtBufferedImageJpa.java | 4 +--
.../javalang/booleans/jpa/WrapperBooleanJpa.java | 4 +--
.../types/javalang/bytes/jpa/WrapperByteJpa.java | 4 +--
.../characters/jpa/WrapperCharacterJpa.java | 4 +--
.../javalang/doubles/jpa/WrapperDoubleJpa.java | 4 +--
.../types/javalang/enums/jpa/JavaLangEnumJpa.java | 4 +--
.../types/javalang/floats/jpa/WrapperFloatJpa.java | 4 +--
.../javalang/integers/jpa/WrapperIntegerJpa.java | 4 +--
.../types/javalang/longs/jpa/WrapperLongJpa.java | 4 +--
.../types/javalang/shorts/jpa/WrapperShortJpa.java | 4 +--
.../javalang/strings/jpa/JavaLangStringJpa.java | 4 +--
.../bigdecimals/jpa/JavaMathBigDecimalJpa.java | 4 +--
.../bigintegers/jpa/JavaMathBigIntegerJpa.java | 4 +--
.../dom/types/javanet/urls/jpa/JavaNetUrlJpa.java | 4 +--
.../javasql/javasqldate/jpa/JavaSqlDateJpa.java | 4 +--
.../javasqltimestamp/jpa/JavaSqlTimestampJpa.java | 4 +--
.../jpa/JavaTimeLocalDateJpa.java | 4 +--
.../jpa/JavaTimeLocalDateTimeJpa.java | 4 +--
.../jpa/JavaTimeLocalTimeJpa.java | 4 +--
.../jpa/JavaTimeOffsetDateTimeJpa.java | 4 +--
.../jpa/JavaTimeOffsetTimeJpa.java | 4 +--
.../jpa/JavaTimeZonedDateTimeJpa.java | 4 +--
.../javautil/javautildate/jpa/JavaUtilDateJpa.java | 4 +--
.../types/javautil/uuids/jpa/JavaUtilUuidJpa.java | 4 +--
.../booleans/jpa/PrimitiveBooleanJpa.java | 4 +--
.../primitive/bytes/jpa/PrimitiveByteJpa.java | 4 +--
.../primitive/chars/jpa/PrimitiveCharJpa.java | 4 +--
.../primitive/doubles/jpa/PrimitiveDoubleJpa.java | 4 +--
.../primitive/floats/jpa/PrimitiveFloatJpa.java | 4 +--
.../types/primitive/ints/jpa/PrimitiveIntJpa.java | 4 +--
.../primitive/longs/jpa/PrimitiveLongJpa.java | 4 +--
.../primitive/shorts/jpa/PrimitiveShortJpa.java | 4 +--
examples/demo/domain/src/main/resources/shiro.ini | 6 ++--
.../main/java/demoapp/javafx/DemoAppJavaFx.java | 8 ++---
.../integtest/DemoFxTestConfig_usingJdo.java | 6 ++--
.../java/demoapp/web/linebreaker/LineBreaker.java | 4 +--
.../webapp/wicket/jdo/DemoAppWicketJdo.java | 4 +--
.../webapp/wicket/jpa/DemoAppWicketJpa.java | 4 +--
.../webapp/wicket/jpa/DemoAppWicketJpa.java | 4 +--
.../integtest/CommandLog_IntegTestAbstract.java | 8 ++---
.../jdo/integtests/CommandLog_IntegTest.java | 4 +--
.../commandlog/jpa/dom/CommandLogEntry.java | 4 +--
.../jpa/integtests/CommandLog_IntegTest.java | 4 +--
.../integtests/ExcelModuleIntegTestAbstract.java | 8 ++---
.../integtest/ExecutionLog_IntegTestAbstract.java | 4 +--
.../jdo/integtests/ExecutionLog_IntegTest.java | 4 +--
.../executionlog/jpa/dom/ExecutionLogEntry.java | 4 +--
.../jpa/integtests/ExecutionLog_IntegTest.java | 4 +--
.../ExecutionOutbox_IntegTestAbstract.java | 4 +--
.../jdo/integtests/ExecutionOutbox_IntegTest.java | 4 +--
.../jpa/dom/ExecutionOutboxEntry.java | 4 +--
.../jpa/integtests/ExecutionOutbox_IntegTest.java | 4 +--
.../integtests/OutboxRestClient_IntegTest.java | 6 ++--
.../integtests/AuditTrail_IntegTestAbstract.java | 4 +--
.../jdo/integtests/AuditTrail_IntegTest.java | 4 +--
.../audittrail/jpa/dom/AuditTrailEntry.java | 4 +--
.../jpa/integtests/AuditTrail_IntegTest.java | 8 ++---
.../audittrail/jpa/integtests/model/Counter.java | 4 +--
.../ApplicationPermissionRepository_IntegTest.java | 4 +--
.../jpa/permission/dom/ApplicationPermission.java | 4 +--
.../secman/jpa/role/dom/ApplicationRole.java | 4 +--
.../secman/jpa/tenancy/dom/ApplicationTenancy.java | 4 +--
.../secman/jpa/user/dom/ApplicationUser.java | 4 +--
.../ApplicationPermissionRepository_IntegTest.java | 4 +--
.../jdo/integtests/SessionLog_IntegTest.java | 4 +--
.../sessionlog/jpa/dom/SessionLogEntry.java | 4 +--
.../jpa/integtests/SessionLog_IntegTest.java | 4 +--
.../modules/shiro-realm-ldap/examples/shiro.ini | 4 +--
...actory.java => CausewayLdapContextFactory.java} | 4 +--
.../{IsisLdapRealm.java => CausewayLdapRealm.java} | 4 +--
.../secondary/fetch/CommandFetcher_Test.java | 4 +--
.../graphql/viewer/test/source/ScratchPad.java | 2 +-
.../source/TestDomainModuleIntegTestAbstract.java | 10 +++---
.../CausewayModulePersistenceJdoDatanucleus.java | 10 +++---
.../jdo/metamodel/beans/JdoBeanTypeClassifier.java | 10 +++---
...y.core.config.beans.CausewayBeanTypeClassifier} | 0
...tyListener.java => CausewayEntityListener.java} | 2 +-
.../domainmodel/SpecloaderPerformanceTest.java | 6 ++--
.../jdo/JdoEntityChangePublishingTest.java | 6 ++--
.../testdomain/ldap/LdapEmbeddedServerTest.java | 4 +--
.../publishing/jdo/JdoCommandPublishingTest.java | 4 +--
.../publishing/jdo/JdoEntityPublishingTest.java | 4 +--
.../publishing/jdo/JdoExecutionPublishingTest.java | 4 +--
.../jdo/JdoLifecycleEventPublishingTest.java | 4 +--
.../publishing/jdo/JdoPropertyPublishingTest.java | 4 +--
.../causeway/testdomain/rest/CorsFilterTest.java | 4 +--
.../testdomain/rest/DomainObjectResourceTest.java | 6 ++--
.../testdomain/rest/MenuBarsResourceTest.java | 6 ++--
.../RestServiceSimpifiedRepresentationTest.java | 4 +--
.../causeway/testdomain/shiro/ShiroLdapTest.java | 4 +--
.../testdomain/shiro/ShiroSecmanLdapTest.java | 4 +--
.../shiro/ShiroSecmanLdap_restfulStressTest.java | 4 +--
.../causeway/testdomain/shiro/ShiroSecmanTest.java | 4 +--
.../testdomain/wrapper/WrapperAsyncTest.java | 4 +--
.../incubating/src/test/resources/shiro-ldap.ini | 4 +--
.../test/resources/shiro-secman-ldap-cached.ini | 12 +++----
.../src/test/resources/shiro-secman-ldap.ini | 10 +++---
.../incubating/src/test/resources/shiro-secman.ini | 4 +--
.../bootstrapping/AutoConfigurationTest.java | 12 +++----
.../SpringServiceInjectPriorityTest.java | 8 ++---
.../SpringServiceProvisioningTest.java | 8 ++---
.../CmdExecAuditSessLog_IntegTestAbstract.java | 8 ++---
.../integtests/CmdExecAuditSessLog_IntegTest.java | 4 +--
.../integtests/CmdExecAuditSessLog_IntegTest.java | 4 +--
.../apache/causeway/testdomain/config/FooTest.java | 4 +--
.../testdomain/config/IsisConfigBeanTest.java | 4 +--
.../config/IsisConfigBeanTest_usingHeadless.java | 4 +--
.../CoreWrapperFactory_IntegTestAbstract.java | 12 +++----
.../domainmodel/AnnotationSyntesizerTest.java | 6 ++--
.../domainmodel/DomainModelTest_forEditing.java | 10 +++---
.../DomainModelTest_usingBadDomain.java | 6 ++--
...elTest_usingBadDomain_noAnnotationEnforced.java | 6 ++--
.../DomainModelTest_usingGoodDomain.java | 6 ++--
.../domainmodel/MetaModelRegressionTest.java | 6 ++--
.../testdomain/domainmodel/SpecLoaderTest.java | 6 ++--
.../testdomain/factory/ViewModelFactoryTest.java | 4 +--
.../testdomain/interact/ActionInteractionTest.java | 6 ++--
.../interact/CollectionInteractionTest.java | 6 ++--
.../testdomain/interact/CommandArgumentTest.java | 6 ++--
.../testdomain/interact/CustomContextTest.java | 6 ++--
.../testdomain/interact/NewParameterModelTest.java | 6 ++--
.../testdomain/interact/PropertyBindingTest.java | 6 ++--
.../interact/PropertyInteractionTest.java | 6 ++--
.../interact/ScalarParamNegotiationTest.java | 6 ++--
.../interact/WrapperInteractionTest.java | 6 ++--
.../interact/WrapperInteractionTest2.java | 6 ++--
.../interact/WrapperInteractionTest3.java | 6 ++--
.../interact/WrapperInteractionTest4.java | 6 ++--
.../integtest/Layout_Counter_IntegTest.java | 10 +++---
.../integtest/Layout_SimpleObject_IntegTest.java | 10 +++---
.../domainmodel/jdo/DomainModelTest.java | 6 ++--
.../injecting/jdo/JdoEntityInjectingTest.java | 4 +--
.../persistence/jdo/JdoBootstrappingTest.java | 4 +--
.../jdo/JdoExceptionTranslationTest.java | 4 +--
...xceptionTranslationTest_usingTransactional.java | 4 +--
.../testdomain/persistence/jdo/JdoJaxbTest.java | 4 +--
.../testdomain/persistence/jdo/JdoQueryTest.java | 4 +--
...actionRollbackTest_usingTransactionService.java | 4 +--
.../jdo/JdoTransactionScopeListenerTest.java | 4 +--
.../testdomain/wrapper/jdo/JdoWrapperSyncTest.java | 4 +--
.../injecting/jpa/JpaEntityInjectingTest.java | 4 +--
.../persistence/jpa/JpaBootstrappingTest.java | 4 +--
.../jpa/JpaExceptionTranslationTest.java | 4 +--
...xceptionTranslationTest_usingTransactional.java | 4 +--
.../testdomain/persistence/jpa/JpaJaxbTest.java | 4 +--
.../testdomain/persistence/jpa/JpaQueryTest.java | 4 +--
.../JpaGeneratedLongIdEntityLifecycleTest.java | 4 +--
...JpaNonGeneratedStringIdEntityLifecycleTest.java | 4 +--
.../springdata/SpringDataJpaBootstrappingTest.java | 4 +--
...actionRollbackTest_usingInteractionService.java | 4 +--
...actionRollbackTest_usingTransactionService.java | 4 +--
...TransactionRollbackTest_usingTransactional.java | 4 +--
.../jpa/JpaTransactionScopeListenerTest.java | 4 +--
.../publishing/jpa/JpaCommandPublishingTest.java | 4 +--
.../publishing/jpa/JpaEntityPublishingTest.java | 4 +--
.../publishing/jpa/JpaExecutionPublishingTest.java | 4 +--
.../jpa/JpaLifecycleEventPublishingTest.java | 4 +--
.../publishing/jpa/JpaPropertyPublishingTest.java | 4 +--
.../testdomain/rest/JsonValueEncoderTest.java | 4 +--
.../testdomain/rest/RestServiceStressTest.java | 4 +--
.../causeway/testdomain/rest/RestServiceTest.java | 4 +--
.../testdomain/value/ValueSemanticsTest.java | 6 ++--
.../viewers/common/wkt/InteractionTestWkt.java | 6 ++--
.../viewers/common/wkt/LoggerSetupTestWkt.java | 4 +--
.../testdomain/viewers/jdo/wkt/TestAppJdoWkt.java | 4 +--
.../viewers/jdo/wkt/InteractionTestJdoWkt.java | 6 ++--
.../testdomain/viewers/jpa/wkt/TestAppJpaWkt.java | 4 +--
.../viewers/jpa/wkt/InteractionTestJpaWkt.java | 6 ++--
.../testdomain/conf/Configuration_headless.java | 4 +--
.../testdomain/conf/Configuration_usingJdo.java | 8 ++---
.../conf/Configuration_usingJdoAndShiro.java | 8 ++---
.../testdomain/conf/Configuration_usingJpa.java | 6 ++--
.../conf/Configuration_usingSpringDataJpa.java | 6 ++--
.../testdomain/conf/Configuration_usingWicket.java | 4 +--
.../causeway/testdomain/jpa/entities/JpaBook.java | 4 +--
.../EntityPropertyChangeSubscriberForTesting.java | 4 +--
.../shiro/authorization/AuthorizorShiro.java | 2 +-
...IsisPermission.java => CausewayPermission.java} | 22 ++++++------
...solver.java => CausewayPermissionResolver.java} | 6 ++--
.../shiro/IsisPermissionTest_setParts.java | 12 +++----
.../shiro/IsisPermissionTest_typicalUsage.java | 10 +++---
.../authorization/IsisPermissionTest_equals.java | 6 ++--
security/shiro/src/test/resources/shiro.ini | 2 +-
.../applib/classrules/ArchitectureJpaRules.java | 6 ++--
.../applib/entity/jpa/dom/JpaEntity.java | 4 +--
.../applib/entity/jpa/dom/JpaEntity2.java | 4 +--
.../FakeDataModuleIntegTestAbstract.java | 8 ++---
.../context/ResourceContext_getArg_Test.java | 4 +--
.../pages/extending/custom-bootstrap-theme.adoc | 2 +-
.../model/isis/WicketApplicationInitializer.java | 2 +-
.../models/EntityCollectionModelAbstract.java | 7 ++--
.../viewer/wicket/ui/ComponentFactory.java | 5 ++-
.../wicket/ui/app/logout/LogoutHandlerWkt.java | 4 +--
.../ajaxtable/PrototypingMessageProvider.java | 4 +--
.../viewer/wicket/ui/pages/entity/EntityPage.java | 28 +++++++--------
.../viewer/integration/LocalizerForIsis.java | 4 +--
... => CausewayWicketAjaxRequestListenerUtil.java} | 2 +-
...ication.java => CausewayWicketApplication.java} | 10 +++---
.../wicket/viewer/wicketapp/_PageFactory.java | 2 +-
.../config/WicketViewerCssBundleInit.java | 7 ++--
...ava => CausewayWicketApplication_Defaults.java} | 8 ++---
...s.java => CausewayWicketApplication_Pages.java} | 10 +++---
250 files changed, 713 insertions(+), 718 deletions(-)
diff --git a/core/config/src/main/adoc/modules/config/pages/sections/isis.viewer.wicket.adoc b/core/config/src/main/adoc/modules/config/pages/sections/isis.viewer.wicket.adoc
index eb5562557a..726dc86a7a 100644
--- a/core/config/src/main/adoc/modules/config/pages/sections/isis.viewer.wicket.adoc
+++ b/core/config/src/main/adoc/modules/config/pages/sections/isis.viewer.wicket.adoc
@@ -24,7 +24,7 @@ isis.viewer.wicket.ajax-debug-mode
isis.viewer.wicket.app
|
-| Specifies the subclass of ``IsisWicketApplication`` that is used to bootstrap Wicket.
+| Specifies the subclass of ``CausewayWicketApplication`` that is used to bootstrap Wicket.
There is usually very little reason to change this from its default.
diff --git a/core/config/src/main/java/module-info.java b/core/config/src/main/java/module-info.java
index 4e3373a32d..b1e40e92d1 100644
--- a/core/config/src/main/java/module-info.java
+++ b/core/config/src/main/java/module-info.java
@@ -54,7 +54,7 @@ module org.apache.causeway.core.config {
requires spring.core;
requires spring.tx;
- uses org.apache.causeway.core.config.beans.IsisBeanTypeClassifier;
+ uses org.apache.causeway.core.config.beans.CausewayBeanTypeClassifier;
opens org.apache.causeway.core.config to spring.core, org.hibernate.validator;
opens org.apache.causeway.core.config.environment to spring.core;
diff --git a/core/config/src/main/java/org/apache/causeway/core/config/CausewayConfiguration.java b/core/config/src/main/java/org/apache/causeway/core/config/CausewayConfiguration.java
index 2838887673..d4431ff49c 100644
--- a/core/config/src/main/java/org/apache/causeway/core/config/CausewayConfiguration.java
+++ b/core/config/src/main/java/org/apache/causeway/core/config/CausewayConfiguration.java
@@ -66,6 +66,8 @@ import org.apache.causeway.applib.services.userui.UserMenu;
import org.apache.causeway.applib.value.semantics.TemporalValueSemantics.TemporalEditingPattern;
import org.apache.causeway.commons.internal.base._NullSafe;
import org.apache.causeway.commons.internal.context._Context;
+import org.apache.causeway.core.config.CausewayConfiguration.Core;
+import org.apache.causeway.core.config.CausewayConfiguration.Viewer;
import org.apache.causeway.core.config.metamodel.facets.ActionConfigOptions;
import org.apache.causeway.core.config.metamodel.facets.CollectionLayoutConfigOptions;
import org.apache.causeway.core.config.metamodel.facets.DomainObjectConfigOptions;
@@ -1980,14 +1982,14 @@ public class CausewayConfiguration {
/**
* Specifies the subclass of
- * <code>org.apache.causeway.viewer.wicket.viewer.wicketapp.IsisWicketApplication</code> that is used to
+ * <code>org.apache.causeway.viewer.wicket.viewer.wicketapp.CausewayWicketApplication</code> that is used to
* bootstrap Wicket.
*
* <p>
* There is usually very little reason to change this from its default.
* </p>
*/
- private String app = "org.apache.causeway.viewer.wicket.viewer.wicketapp.IsisWicketApplication";
+ private String app = "org.apache.causeway.viewer.wicket.viewer.wicketapp.CausewayWicketApplication";
/**
* Whether the Ajax debug should be shown, by default this is disabled.
diff --git a/core/config/src/main/java/org/apache/causeway/core/config/beans/IsisBeanMetaData.java b/core/config/src/main/java/org/apache/causeway/core/config/beans/CausewayBeanMetaData.java
similarity index 90%
rename from core/config/src/main/java/org/apache/causeway/core/config/beans/IsisBeanMetaData.java
rename to core/config/src/main/java/org/apache/causeway/core/config/beans/CausewayBeanMetaData.java
index 59fd143de2..44c439bb68 100644
--- a/core/config/src/main/java/org/apache/causeway/core/config/beans/IsisBeanMetaData.java
+++ b/core/config/src/main/java/org/apache/causeway/core/config/beans/CausewayBeanMetaData.java
@@ -25,7 +25,7 @@ import lombok.NonNull;
import lombok.Value;
@Value(staticConstructor = "of")
-public class IsisBeanMetaData {
+public class CausewayBeanMetaData {
public enum ManagedBy {
NONE,
@@ -72,19 +72,19 @@ public class IsisBeanMetaData {
// -- FACTORIES
- public static IsisBeanMetaData notManaged(
+ public static CausewayBeanMetaData notManaged(
final @NonNull BeanSort beanSort,
final @NonNull LogicalType logicalType) {
return of(beanSort, logicalType, ManagedBy.NONE);
}
- public static IsisBeanMetaData notManaged(
+ public static CausewayBeanMetaData notManaged(
final @NonNull BeanSort beanSort,
final @NonNull Class<?> type) {
return notManaged(beanSort, LogicalType.infer(type));
}
- public static IsisBeanMetaData injectable(
+ public static CausewayBeanMetaData injectable(
final @NonNull BeanSort beanSort,
final @NonNull LogicalType logicalType) {
return of(beanSort, logicalType, ManagedBy.SPRING);
@@ -92,7 +92,7 @@ public class IsisBeanMetaData {
/** @deprecated in support of deprecated {@code @DomainService(logicalTypeName=...)}*/
@Deprecated
- public static IsisBeanMetaData injectableNamedByIsis(
+ public static CausewayBeanMetaData injectableNamedByIsis(
final @NonNull BeanSort beanSort,
final @NonNull LogicalType logicalType) {
return of(beanSort, logicalType, ManagedBy.SPRING_NAMED_BY_ISIS);
@@ -101,20 +101,20 @@ public class IsisBeanMetaData {
/**
* Let <i>Spring</i> decide.
*/
- public static IsisBeanMetaData indifferent(
+ public static CausewayBeanMetaData indifferent(
final @NonNull BeanSort beanSort,
final @NonNull Class<?> type) {
return of(beanSort, LogicalType.infer(type),
ManagedBy.INDIFFERENT);
}
- public static IsisBeanMetaData isisManaged(
+ public static CausewayBeanMetaData isisManaged(
final @NonNull BeanSort beanSort,
final @NonNull LogicalType logicalType) {
return of(beanSort, logicalType, ManagedBy.ISIS);
}
- public static IsisBeanMetaData isisManaged(
+ public static CausewayBeanMetaData isisManaged(
final @NonNull BeanSort beanSort,
final @NonNull Class<?> type) {
return isisManaged(beanSort, LogicalType.infer(type));
diff --git a/core/config/src/main/java/org/apache/causeway/core/config/beans/IsisBeanTypeClassifier.java b/core/config/src/main/java/org/apache/causeway/core/config/beans/CausewayBeanTypeClassifier.java
similarity index 83%
rename from core/config/src/main/java/org/apache/causeway/core/config/beans/IsisBeanTypeClassifier.java
rename to core/config/src/main/java/org/apache/causeway/core/config/beans/CausewayBeanTypeClassifier.java
index 39f43faa13..f47b618a23 100644
--- a/core/config/src/main/java/org/apache/causeway/core/config/beans/IsisBeanTypeClassifier.java
+++ b/core/config/src/main/java/org/apache/causeway/core/config/beans/CausewayBeanTypeClassifier.java
@@ -31,7 +31,7 @@ import lombok.NonNull;
* ServiceLoader SPI that allows for implementing instances to have a say during bean type scanning.
* @since 2.0
*/
-public interface IsisBeanTypeClassifier {
+public interface CausewayBeanTypeClassifier {
// -- INTERFACE
@@ -43,27 +43,27 @@ public interface IsisBeanTypeClassifier {
* but later used by the {@code SpecificationLoader} to also
* classify non-concrete types (interfaces and abstract classes).
*/
- IsisBeanMetaData classify(Class<?> type);
+ CausewayBeanMetaData classify(Class<?> type);
// -- FACTORY
/**
* in support of JUnit testing
*/
- static IsisBeanTypeClassifier createInstance() {
+ static CausewayBeanTypeClassifier createInstance() {
return new IsisBeanTypeClassifierDefault(Can.empty());
}
- static IsisBeanTypeClassifier createInstance(final @NonNull ApplicationContext applicationContext) {
+ static CausewayBeanTypeClassifier createInstance(final @NonNull ApplicationContext applicationContext) {
return new IsisBeanTypeClassifierDefault(
Can.ofArray(applicationContext.getEnvironment().getActiveProfiles()));
}
// -- LOOKUP
- public static Can<IsisBeanTypeClassifier> get() {
+ public static Can<CausewayBeanTypeClassifier> get() {
return Can.ofStream(ServiceLoader
- .load(IsisBeanTypeClassifier.class, _Context.getDefaultClassLoader())
+ .load(CausewayBeanTypeClassifier.class, _Context.getDefaultClassLoader())
.stream()
.map(Provider::get));
}
diff --git a/core/config/src/main/java/org/apache/causeway/core/config/beans/IsisBeanTypeRegistry.java b/core/config/src/main/java/org/apache/causeway/core/config/beans/CausewayBeanTypeRegistry.java
similarity index 73%
rename from core/config/src/main/java/org/apache/causeway/core/config/beans/IsisBeanTypeRegistry.java
rename to core/config/src/main/java/org/apache/causeway/core/config/beans/CausewayBeanTypeRegistry.java
index b6c7c0a23f..2394dcc0e6 100644
--- a/core/config/src/main/java/org/apache/causeway/core/config/beans/IsisBeanTypeRegistry.java
+++ b/core/config/src/main/java/org/apache/causeway/core/config/beans/CausewayBeanTypeRegistry.java
@@ -28,17 +28,17 @@ import org.apache.causeway.applib.value.semantics.ValueSemanticsProvider;
* Holds the set of domain services, persistent entities and fixture scripts etc., but not values.
* @since 2.0
*/
-public interface IsisBeanTypeRegistry {
+public interface CausewayBeanTypeRegistry {
- Optional<IsisBeanMetaData> lookupIntrospectableType(Class<?> type);
- Stream<IsisBeanMetaData> streamIntrospectableTypes();
+ Optional<CausewayBeanMetaData> lookupIntrospectableType(Class<?> type);
+ Stream<CausewayBeanMetaData> streamIntrospectableTypes();
- Map<Class<?>, IsisBeanMetaData> getManagedBeansContributing();
- Map<Class<?>, IsisBeanMetaData> getEntityTypes();
- Map<Class<?>, IsisBeanMetaData> getMixinTypes();
- Map<Class<?>, IsisBeanMetaData> getViewModelTypes();
+ Map<Class<?>, CausewayBeanMetaData> getManagedBeansContributing();
+ Map<Class<?>, CausewayBeanMetaData> getEntityTypes();
+ Map<Class<?>, CausewayBeanMetaData> getMixinTypes();
+ Map<Class<?>, CausewayBeanMetaData> getViewModelTypes();
/** discovered per {@code @Value} annotation (vs. registered using a {@link ValueSemanticsProvider})*/
- Map<Class<?>, IsisBeanMetaData> getDiscoveredValueTypes();
+ Map<Class<?>, CausewayBeanMetaData> getDiscoveredValueTypes();
// -- LOOKUPS
@@ -51,17 +51,17 @@ public interface IsisBeanTypeRegistry {
*/
default Optional<String> lookupManagedBeanNameForType(final Class<?> type) {
return Optional.ofNullable(getManagedBeansContributing().get(type))
- .map(IsisBeanMetaData::getBeanName);
+ .map(CausewayBeanMetaData::getBeanName);
}
/**
- * Returns either 'JDO' or 'JPA' based on what {@link IsisBeanTypeClassifier} we find
+ * Returns either 'JDO' or 'JPA' based on what {@link CausewayBeanTypeClassifier} we find
* registered with <i>Spring</i>.
* Alternative implementations could be considered, however this works for now.
*/
default PersistenceStack determineCurrentPersistenceStack() {
- return IsisBeanTypeClassifier.get().stream()
- .map(IsisBeanTypeClassifier::getClass)
+ return CausewayBeanTypeClassifier.get().stream()
+ .map(CausewayBeanTypeClassifier::getClass)
.map(Class::getSimpleName)
.anyMatch(classifierName->classifierName.startsWith("Jdo"))
? PersistenceStack.JDO
diff --git a/core/config/src/main/java/org/apache/causeway/core/config/beans/IsisBeanFactoryPostProcessorForSpring.java b/core/config/src/main/java/org/apache/causeway/core/config/beans/IsisBeanFactoryPostProcessorForSpring.java
index 32dea9cc7a..3505d92efa 100644
--- a/core/config/src/main/java/org/apache/causeway/core/config/beans/IsisBeanFactoryPostProcessorForSpring.java
+++ b/core/config/src/main/java/org/apache/causeway/core/config/beans/IsisBeanFactoryPostProcessorForSpring.java
@@ -64,12 +64,12 @@ implements
BeanFactoryPostProcessor,
ApplicationContextAware {
- private IsisBeanTypeClassifier isisBeanTypeClassifier;
+ private CausewayBeanTypeClassifier isisBeanTypeClassifier;
private IsisComponentScanInterceptor isisComponentScanInterceptor;
@Override
public void setApplicationContext(final ApplicationContext applicationContext) throws BeansException {
- isisBeanTypeClassifier = IsisBeanTypeClassifier.createInstance(applicationContext);
+ isisBeanTypeClassifier = CausewayBeanTypeClassifier.createInstance(applicationContext);
isisComponentScanInterceptor = IsisComponentScanInterceptor.createInstance(isisBeanTypeClassifier);
}
@@ -117,14 +117,14 @@ implements
}
@Bean
- public IsisBeanTypeClassifier getIsisBeanTypeClassifier() {
+ public CausewayBeanTypeClassifier getIsisBeanTypeClassifier() {
return isisBeanTypeClassifier!=null
? isisBeanTypeClassifier
- : (isisBeanTypeClassifier = IsisBeanTypeClassifier.createInstance()); // JUnit support
+ : (isisBeanTypeClassifier = CausewayBeanTypeClassifier.createInstance()); // JUnit support
}
@Bean("isis.bean-meta-data")
- public Can<IsisBeanMetaData> getComponentScanResult() {
+ public Can<CausewayBeanMetaData> getComponentScanResult() {
return isisComponentScanInterceptor.getAndDrainIntrospectableTypes();
}
diff --git a/core/config/src/main/java/org/apache/causeway/core/config/beans/IsisBeanTypeClassifierDefault.java b/core/config/src/main/java/org/apache/causeway/core/config/beans/IsisBeanTypeClassifierDefault.java
index 0cd691eb32..c1a07fdc6a 100644
--- a/core/config/src/main/java/org/apache/causeway/core/config/beans/IsisBeanTypeClassifierDefault.java
+++ b/core/config/src/main/java/org/apache/causeway/core/config/beans/IsisBeanTypeClassifierDefault.java
@@ -45,15 +45,15 @@ import lombok.val;
@RequiredArgsConstructor(access = AccessLevel.PACKAGE)
//@Log4j2
final class IsisBeanTypeClassifierDefault
-implements IsisBeanTypeClassifier {
+implements CausewayBeanTypeClassifier {
private final Can<String> activeProfiles;
- private final Can<IsisBeanTypeClassifier> classifierPlugins = IsisBeanTypeClassifier.get();
+ private final Can<CausewayBeanTypeClassifier> classifierPlugins = CausewayBeanTypeClassifier.get();
// handle arbitrary types ...
@SuppressWarnings("deprecation")
@Override
- public IsisBeanMetaData classify(
+ public CausewayBeanMetaData classify(
final @NonNull Class<?> type) {
//debug
@@ -63,11 +63,11 @@ implements IsisBeanTypeClassifier {
if(ClassUtils.isPrimitiveOrWrapper(type)
|| type.isEnum()) {
- return IsisBeanMetaData.notManaged(BeanSort.VALUE, type);
+ return CausewayBeanMetaData.notManaged(BeanSort.VALUE, type);
}
if(ProgrammingModelConstants.CollectionSemantics.valueOf(type).isPresent()) {
- return IsisBeanMetaData.isisManaged(BeanSort.COLLECTION, type);
+ return CausewayBeanMetaData.isisManaged(BeanSort.COLLECTION, type);
}
if(type.isInterface()
@@ -79,12 +79,12 @@ implements IsisBeanTypeClassifier {
// and should also never be identified as ENTITY, VIEWMODEL or MIXIN
// however, concrete types that inherit abstract ones with vetoes,
// will effectively be vetoed through means of annotation synthesis
- return IsisBeanMetaData.indifferent(BeanSort.ABSTRACT, type);
+ return CausewayBeanMetaData.indifferent(BeanSort.ABSTRACT, type);
}
// handle vetoing ...
if(TypeExcludeMarker.anyMatchOn(type)) {
- return IsisBeanMetaData.notManaged(BeanSort.VETOED, type); // reject
+ return CausewayBeanMetaData.notManaged(BeanSort.VETOED, type); // reject
}
val profiles = Can.ofArray(_Annotations.synthesize(type, Profile.class)
@@ -92,7 +92,7 @@ implements IsisBeanTypeClassifier {
.orElse(null));
if(profiles.isNotEmpty()
&& !profiles.stream().anyMatch(this::isProfileActive)) {
- return IsisBeanMetaData.notManaged(BeanSort.VETOED, type); // reject
+ return CausewayBeanMetaData.notManaged(BeanSort.VETOED, type); // reject
}
// handle value types ...
@@ -100,7 +100,7 @@ implements IsisBeanTypeClassifier {
val aValue = _Annotations.synthesize(type, org.apache.causeway.applib.annotation.Value.class)
.orElse(null);
if(aValue!=null) {
- return IsisBeanMetaData.notManaged(BeanSort.VALUE, type);
+ return CausewayBeanMetaData.notManaged(BeanSort.VALUE, type);
}
// handle actual bean types ...
@@ -118,9 +118,9 @@ implements IsisBeanTypeClassifier {
.orElse(false);
return namedByIsis
- ? IsisBeanMetaData
+ ? CausewayBeanMetaData
.injectableNamedByIsis(BeanSort.MANAGED_BEAN_CONTRIBUTING, logicalType)
- : IsisBeanMetaData
+ : CausewayBeanMetaData
.injectable(BeanSort.MANAGED_BEAN_CONTRIBUTING, logicalType);
}
@@ -133,12 +133,12 @@ implements IsisBeanTypeClassifier {
}
if(org.apache.causeway.applib.ViewModel.class.isAssignableFrom(type)) {
- return IsisBeanMetaData.isisManaged(BeanSort.VIEW_MODEL, type);
+ return CausewayBeanMetaData.isisManaged(BeanSort.VIEW_MODEL, type);
}
val entityAnnotation = _Annotations.synthesize(type, Entity.class).orElse(null);
if(entityAnnotation!=null) {
- return IsisBeanMetaData.isisManaged(BeanSort.ENTITY, LogicalType.infer(type));
+ return CausewayBeanMetaData.isisManaged(BeanSort.ENTITY, LogicalType.infer(type));
}
val aDomainObject = _Annotations.synthesize(type, DomainObject.class).orElse(null);
@@ -146,28 +146,28 @@ implements IsisBeanTypeClassifier {
switch (aDomainObject.nature()) {
case BEAN:
val logicalType = LogicalType.infer(type);
- return IsisBeanMetaData
+ return CausewayBeanMetaData
.injectableNamedByIsis(BeanSort.MANAGED_BEAN_CONTRIBUTING, logicalType);
case MIXIN:
- return IsisBeanMetaData.isisManaged(BeanSort.MIXIN, type);
+ return CausewayBeanMetaData.isisManaged(BeanSort.MIXIN, type);
case ENTITY:
- return IsisBeanMetaData.isisManaged(BeanSort.ENTITY, type);
+ return CausewayBeanMetaData.isisManaged(BeanSort.ENTITY, type);
case VIEW_MODEL:
case NOT_SPECIFIED:
//because object is not associated with a persistence context unless discovered above
- return IsisBeanMetaData.isisManaged(BeanSort.VIEW_MODEL, type);
+ return CausewayBeanMetaData.isisManaged(BeanSort.VIEW_MODEL, type);
}
}
if(_Annotations.isPresent(type, Component.class)) {
- return IsisBeanMetaData.indifferent(BeanSort.MANAGED_BEAN_NOT_CONTRIBUTING, type);
+ return CausewayBeanMetaData.indifferent(BeanSort.MANAGED_BEAN_NOT_CONTRIBUTING, type);
}
if(Serializable.class.isAssignableFrom(type)) {
- return IsisBeanMetaData.indifferent(BeanSort.VALUE, type);
+ return CausewayBeanMetaData.indifferent(BeanSort.VALUE, type);
}
- return IsisBeanMetaData.indifferent(BeanSort.UNKNOWN, type);
+ return CausewayBeanMetaData.indifferent(BeanSort.UNKNOWN, type);
}
// -- HELPER
diff --git a/core/config/src/main/java/org/apache/causeway/core/config/beans/IsisBeanTypeRegistryDefault.java b/core/config/src/main/java/org/apache/causeway/core/config/beans/IsisBeanTypeRegistryDefault.java
index 8ba46528b9..45fefb1277 100644
--- a/core/config/src/main/java/org/apache/causeway/core/config/beans/IsisBeanTypeRegistryDefault.java
+++ b/core/config/src/main/java/org/apache/causeway/core/config/beans/IsisBeanTypeRegistryDefault.java
@@ -45,50 +45,50 @@ import lombok.val;
@Priority(PriorityPrecedence.EARLY)
@Qualifier("Default")
public class IsisBeanTypeRegistryDefault
-implements IsisBeanTypeRegistry {
+implements CausewayBeanTypeRegistry {
/**
* (immutable) scan result, as used by the SpecificationLoader for introspection
*/
- private final Can<IsisBeanMetaData> introspectableTypes;
+ private final Can<CausewayBeanMetaData> introspectableTypes;
- private final Map<Class<?>, IsisBeanMetaData> introspectableTypesByClass = _Maps.newHashMap();
+ private final Map<Class<?>, CausewayBeanMetaData> introspectableTypesByClass = _Maps.newHashMap();
// -- DISTINCT CATEGORIES OF BEAN SORTS
@Getter(onMethod_ = {@Override})
- private final Map<Class<?>, IsisBeanMetaData> managedBeansContributing = new HashMap<>();
+ private final Map<Class<?>, CausewayBeanMetaData> managedBeansContributing = new HashMap<>();
@Getter(onMethod_ = {@Override})
- private final Map<Class<?>, IsisBeanMetaData> entityTypes = new HashMap<>();
+ private final Map<Class<?>, CausewayBeanMetaData> entityTypes = new HashMap<>();
@Getter(onMethod_ = {@Override})
- private final Map<Class<?>, IsisBeanMetaData> mixinTypes = new HashMap<>();
+ private final Map<Class<?>, CausewayBeanMetaData> mixinTypes = new HashMap<>();
@Getter(onMethod_ = {@Override})
- private final Map<Class<?>, IsisBeanMetaData> viewModelTypes = new HashMap<>();
+ private final Map<Class<?>, CausewayBeanMetaData> viewModelTypes = new HashMap<>();
@Getter(onMethod_ = {@Override})
- private final Map<Class<?>, IsisBeanMetaData> discoveredValueTypes = new HashMap<>();
+ private final Map<Class<?>, CausewayBeanMetaData> discoveredValueTypes = new HashMap<>();
// -- LOOKUPS
@Override
- public Optional<IsisBeanMetaData> lookupIntrospectableType(final Class<?> type) {
+ public Optional<CausewayBeanMetaData> lookupIntrospectableType(final Class<?> type) {
return Optional.ofNullable(introspectableTypesByClass.get(type));
}
// -- ITERATORS
@Override
- public Stream<IsisBeanMetaData> streamIntrospectableTypes() {
+ public Stream<CausewayBeanMetaData> streamIntrospectableTypes() {
return _NullSafe.stream(introspectableTypes);
}
// -- CONSTRUCTOR
@Inject @Named("isis.bean-meta-data")
- public IsisBeanTypeRegistryDefault(final @NonNull Can<IsisBeanMetaData> introspectableTypes) {
+ public IsisBeanTypeRegistryDefault(final @NonNull Can<CausewayBeanMetaData> introspectableTypes) {
this.introspectableTypes = introspectableTypes;
introspectableTypes.forEach(typeMeta->{
diff --git a/core/config/src/main/java/org/apache/causeway/core/config/beans/IsisComponentScanInterceptor.java b/core/config/src/main/java/org/apache/causeway/core/config/beans/IsisComponentScanInterceptor.java
index dc4d6e4e5e..b69d466cf3 100644
--- a/core/config/src/main/java/org/apache/causeway/core/config/beans/IsisComponentScanInterceptor.java
+++ b/core/config/src/main/java/org/apache/causeway/core/config/beans/IsisComponentScanInterceptor.java
@@ -45,12 +45,12 @@ public interface IsisComponentScanInterceptor {
*/
void intercept(ScannedTypeMetaData type);
- Can<IsisBeanMetaData> getAndDrainIntrospectableTypes();
+ Can<CausewayBeanMetaData> getAndDrainIntrospectableTypes();
// -- FACTORIES
static IsisComponentScanInterceptor createInstance(
- final @NonNull IsisBeanTypeClassifier isisBeanTypeClassifier) {
+ final @NonNull CausewayBeanTypeClassifier isisBeanTypeClassifier) {
return new IsisComponentScanInterceptorImpl(isisBeanTypeClassifier);
}
diff --git a/core/config/src/main/java/org/apache/causeway/core/config/beans/IsisComponentScanInterceptorImpl.java b/core/config/src/main/java/org/apache/causeway/core/config/beans/IsisComponentScanInterceptorImpl.java
index d33224f422..f0d7d88586 100644
--- a/core/config/src/main/java/org/apache/causeway/core/config/beans/IsisComponentScanInterceptorImpl.java
+++ b/core/config/src/main/java/org/apache/causeway/core/config/beans/IsisComponentScanInterceptorImpl.java
@@ -39,15 +39,15 @@ import lombok.extern.log4j.Log4j2;
final class IsisComponentScanInterceptorImpl
implements IsisComponentScanInterceptor {
- private final @NonNull IsisBeanTypeClassifier isisBeanTypeClassifier;
+ private final @NonNull CausewayBeanTypeClassifier isisBeanTypeClassifier;
/**
* Inbox for introspection, as used by the SpecificationLoader
*/
- private Map<Class<?>, IsisBeanMetaData> introspectableTypes = _Maps.newConcurrentHashMap();
+ private Map<Class<?>, CausewayBeanMetaData> introspectableTypes = _Maps.newConcurrentHashMap();
@Override
- public Can<IsisBeanMetaData> getAndDrainIntrospectableTypes() {
+ public Can<CausewayBeanMetaData> getAndDrainIntrospectableTypes() {
if(introspectableTypes==null) {
throw _Exceptions.illegalState("introspectable types had already been drained (one shot)");
diff --git a/core/config/src/main/java/org/apache/causeway/core/config/presets/IsisPresets.java b/core/config/src/main/java/org/apache/causeway/core/config/presets/CausewayPresets.java
similarity index 99%
rename from core/config/src/main/java/org/apache/causeway/core/config/presets/IsisPresets.java
rename to core/config/src/main/java/org/apache/causeway/core/config/presets/CausewayPresets.java
index e45417afe1..2859bc5f1f 100644
--- a/core/config/src/main/java/org/apache/causeway/core/config/presets/IsisPresets.java
+++ b/core/config/src/main/java/org/apache/causeway/core/config/presets/CausewayPresets.java
@@ -26,7 +26,7 @@ import org.apache.causeway.commons.internal.base._Strings;
* @since 2.0
*
*/
-public final class IsisPresets {
+public final class CausewayPresets {
public static final String NoTranslations = "classpath:/org/apache/causeway/core/config/presets/NoTranslations.properties";
public static final String IntrospectLazily = "classpath:/org/apache/causeway/core/config/presets/IntrospectLazily.properties";
diff --git a/core/interaction/src/main/java/org/apache/causeway/core/interaction/integration/InteractionAwareTransactionalBoundaryHandler.java b/core/interaction/src/main/java/org/apache/causeway/core/interaction/integration/InteractionAwareTransactionalBoundaryHandler.java
index 4f81c0b565..7389dbbcfd 100644
--- a/core/interaction/src/main/java/org/apache/causeway/core/interaction/integration/InteractionAwareTransactionalBoundaryHandler.java
+++ b/core/interaction/src/main/java/org/apache/causeway/core/interaction/integration/InteractionAwareTransactionalBoundaryHandler.java
@@ -30,7 +30,7 @@ import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.functional.ThrowingRunnable;
import org.apache.causeway.commons.internal.collections._Lists;
import org.apache.causeway.commons.internal.debug._Probe;
-import org.apache.causeway.core.interaction.session.IsisInteraction;
+import org.apache.causeway.core.interaction.session.CausewayInteraction;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service;
import org.springframework.transaction.PlatformTransactionManager;
@@ -62,7 +62,7 @@ public class InteractionAwareTransactionalBoundaryHandler {
// -- OPEN
- public void onOpen(final @NonNull IsisInteraction interaction) {
+ public void onOpen(final @NonNull CausewayInteraction interaction) {
if (log.isDebugEnabled()) {
log.debug("opening on {}", _Probe.currentThreadId());
@@ -81,7 +81,7 @@ public class InteractionAwareTransactionalBoundaryHandler {
// -- CLOSE
- public void onClose(final @NonNull IsisInteraction interaction) {
+ public void onClose(final @NonNull CausewayInteraction interaction) {
if (log.isDebugEnabled()) {
log.debug("closing on {}", _Probe.currentThreadId());
@@ -96,7 +96,7 @@ public class InteractionAwareTransactionalBoundaryHandler {
}
- public void requestRollback(final @NonNull IsisInteraction interaction) {
+ public void requestRollback(final @NonNull CausewayInteraction interaction) {
Optional.ofNullable(interaction.getAttribute(OnCloseHandle.class))
.ifPresent(OnCloseHandle::requestRollback);
}
diff --git a/core/interaction/src/main/java/org/apache/causeway/core/interaction/session/IsisInteraction.java b/core/interaction/src/main/java/org/apache/causeway/core/interaction/session/CausewayInteraction.java
similarity index 98%
rename from core/interaction/src/main/java/org/apache/causeway/core/interaction/session/IsisInteraction.java
rename to core/interaction/src/main/java/org/apache/causeway/core/interaction/session/CausewayInteraction.java
index a7ec90252a..de743abcc3 100644
--- a/core/interaction/src/main/java/org/apache/causeway/core/interaction/session/IsisInteraction.java
+++ b/core/interaction/src/main/java/org/apache/causeway/core/interaction/session/CausewayInteraction.java
@@ -45,10 +45,10 @@ import lombok.val;
import lombok.extern.log4j.Log4j2;
@Log4j2
-public class IsisInteraction
+public class CausewayInteraction
implements InteractionInternal {
- public IsisInteraction(final @NonNull UUID interactionId) {
+ public CausewayInteraction(final @NonNull UUID interactionId) {
this.startedAtSystemNanos = System.nanoTime(); // used to measure time periods, so not using ClockService here
this.command = new Command(interactionId);
log.debug("new IsisInteraction id={}", interactionId);
diff --git a/core/interaction/src/test/java/org/apache/causeway/core/interaction/InteractionDefaultTest_next.java b/core/interaction/src/test/java/org/apache/causeway/core/interaction/InteractionDefaultTest_next.java
index 77a14bee59..bee1d359aa 100644
--- a/core/interaction/src/test/java/org/apache/causeway/core/interaction/InteractionDefaultTest_next.java
+++ b/core/interaction/src/test/java/org/apache/causeway/core/interaction/InteractionDefaultTest_next.java
@@ -20,7 +20,7 @@ package org.apache.causeway.core.interaction;
import java.util.UUID;
-import org.apache.causeway.core.interaction.session.IsisInteraction;
+import org.apache.causeway.core.interaction.session.CausewayInteraction;
import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.is;
@@ -32,7 +32,7 @@ class InteractionDefaultTest_next {
@Test
public void test() {
- val interaction = new IsisInteraction(UUID.randomUUID());
+ val interaction = new CausewayInteraction(UUID.randomUUID());
assertThat(interaction.getThenIncrementExecutionSequence(), is(0));
assertThat(interaction.getThenIncrementExecutionSequence(), is(1));
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/_testing/MetaModelContext_forTesting.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/_testing/MetaModelContext_forTesting.java
index b4cbf1d0d3..54393bf97d 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/_testing/MetaModelContext_forTesting.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/_testing/MetaModelContext_forTesting.java
@@ -64,8 +64,8 @@ import org.apache.causeway.applib.value.semantics.ValueSemanticsProvider;
import org.apache.causeway.applib.value.semantics.ValueSemanticsResolver;
import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.config.beans.IsisBeanFactoryPostProcessorForSpring;
-import org.apache.causeway.core.config.beans.IsisBeanTypeClassifier;
-import org.apache.causeway.core.config.beans.IsisBeanTypeRegistry;
+import org.apache.causeway.core.config.beans.CausewayBeanTypeClassifier;
+import org.apache.causeway.core.config.beans.CausewayBeanTypeRegistry;
import org.apache.causeway.core.config.beans.IsisBeanTypeRegistryDefault;
import org.apache.causeway.core.config.environment.CausewaySystemEnvironment;
import org.apache.causeway.core.config.progmodel.ProgrammingModelConstants;
@@ -175,9 +175,9 @@ implements MetaModelContext {
private TransactionState transactionState;
- private IsisBeanTypeClassifier isisBeanTypeClassifier;
+ private CausewayBeanTypeClassifier isisBeanTypeClassifier;
- private IsisBeanTypeRegistry isisBeanTypeRegistry;
+ private CausewayBeanTypeRegistry isisBeanTypeRegistry;
@Builder.Default
private PlaceholderRenderService placeholderRenderService = PlaceholderRenderService.fallback();
@@ -321,14 +321,14 @@ implements MetaModelContext {
private final IsisBeanFactoryPostProcessorForSpring isisBeanFactoryPostProcessorForSpring =
new IsisBeanFactoryPostProcessorForSpring();
- public IsisBeanTypeClassifier getIsisBeanTypeClassifier() {
+ public CausewayBeanTypeClassifier getIsisBeanTypeClassifier() {
if(isisBeanTypeClassifier==null) {
isisBeanTypeClassifier = isisBeanFactoryPostProcessorForSpring.getIsisBeanTypeClassifier();
}
return isisBeanTypeClassifier;
}
- public IsisBeanTypeRegistry getIsisBeanTypeRegistry() {
+ public CausewayBeanTypeRegistry getIsisBeanTypeRegistry() {
if(isisBeanTypeRegistry==null) {
isisBeanTypeRegistry = new IsisBeanTypeRegistryDefault(Can.empty());
}
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/classsubstitutor/ClassSubstitutorForDomainObjects.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/classsubstitutor/ClassSubstitutorForDomainObjects.java
index e1fe145e07..763b23ab33 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/classsubstitutor/ClassSubstitutorForDomainObjects.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/classsubstitutor/ClassSubstitutorForDomainObjects.java
@@ -24,8 +24,8 @@ import javax.inject.Named;
import org.springframework.stereotype.Component;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
-import org.apache.causeway.core.config.beans.IsisBeanMetaData;
-import org.apache.causeway.core.config.beans.IsisBeanTypeRegistry;
+import org.apache.causeway.core.config.beans.CausewayBeanMetaData;
+import org.apache.causeway.core.config.beans.CausewayBeanTypeRegistry;
import org.apache.causeway.core.metamodel.CausewayModuleCoreMetamodel;
import lombok.NonNull;
@@ -36,10 +36,10 @@ import lombok.val;
@javax.annotation.Priority(PriorityPrecedence.MIDPOINT - 20) // before ClassSubstitutorForCollections
public class ClassSubstitutorForDomainObjects implements ClassSubstitutor {
- private IsisBeanTypeRegistry isisBeanTypeRegistry;
+ private CausewayBeanTypeRegistry isisBeanTypeRegistry;
@Inject
- public ClassSubstitutorForDomainObjects(final IsisBeanTypeRegistry isisBeanTypeRegistry) {
+ public ClassSubstitutorForDomainObjects(final CausewayBeanTypeRegistry isisBeanTypeRegistry) {
this.isisBeanTypeRegistry = isisBeanTypeRegistry;
}
@@ -47,7 +47,7 @@ public class ClassSubstitutorForDomainObjects implements ClassSubstitutor {
public Substitution getSubstitution(@NonNull final Class<?> cls) {
val beanSort = isisBeanTypeRegistry.lookupIntrospectableType(cls)
- .map(IsisBeanMetaData::getBeanSort)
+ .map(CausewayBeanMetaData::getBeanSort)
.orElse(null);
if(beanSort!=null) {
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/registry/ServiceRegistryDefault.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/registry/ServiceRegistryDefault.java
index 3f3dee49a7..34657c0b13 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/registry/ServiceRegistryDefault.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/registry/ServiceRegistryDefault.java
@@ -38,7 +38,7 @@ import org.springframework.stereotype.Service;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.applib.id.LogicalType;
import org.apache.causeway.applib.services.registry.ServiceRegistry;
-import org.apache.causeway.core.config.beans.IsisBeanTypeRegistry;
+import org.apache.causeway.core.config.beans.CausewayBeanTypeRegistry;
import org.apache.causeway.core.config.environment.CausewaySystemEnvironment;
import org.apache.causeway.core.metamodel.CausewayModuleCoreMetamodel;
@@ -52,7 +52,7 @@ public final class ServiceRegistryDefault implements ServiceRegistry {
// enforces provisioning order (this is a depends-on relationship)
@Inject private CausewaySystemEnvironment isisSystemEnvironment;
- @Inject private IsisBeanTypeRegistry isisBeanTypeRegistry;
+ @Inject private CausewayBeanTypeRegistry isisBeanTypeRegistry;
@Override
public Optional<_ManagedBeanAdapter> lookupRegisteredBeanById(final LogicalType id) {
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/specloader/SpecificationLoaderDefault.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/specloader/SpecificationLoaderDefault.java
index 0f6dac91a4..a1dec27d66 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/specloader/SpecificationLoaderDefault.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/specloader/SpecificationLoaderDefault.java
@@ -56,9 +56,9 @@ import org.apache.causeway.applib.services.metamodel.BeanSort;
import org.apache.causeway.applib.services.registry.ServiceRegistry;
import org.apache.causeway.applib.value.semantics.ValueSemanticsResolver;
import org.apache.causeway.core.config.CausewayConfiguration;
-import org.apache.causeway.core.config.beans.IsisBeanMetaData;
-import org.apache.causeway.core.config.beans.IsisBeanTypeClassifier;
-import org.apache.causeway.core.config.beans.IsisBeanTypeRegistry;
+import org.apache.causeway.core.config.beans.CausewayBeanMetaData;
+import org.apache.causeway.core.config.beans.CausewayBeanTypeClassifier;
+import org.apache.causeway.core.config.beans.CausewayBeanTypeRegistry;
import org.apache.causeway.core.config.environment.CausewaySystemEnvironment;
import org.apache.causeway.core.config.metamodel.specloader.IntrospectionMode;
import org.apache.causeway.core.config.progmodel.ProgrammingModelConstants;
@@ -113,8 +113,8 @@ public class SpecificationLoaderDefault implements SpecificationLoader {
private final CausewayConfiguration isisConfiguration;
private final CausewaySystemEnvironment isisSystemEnvironment;
private final ServiceRegistry serviceRegistry;
- private final IsisBeanTypeClassifier isisBeanTypeClassifier;
- private final IsisBeanTypeRegistry isisBeanTypeRegistry;
+ private final CausewayBeanTypeClassifier isisBeanTypeClassifier;
+ private final CausewayBeanTypeRegistry isisBeanTypeRegistry;
private final ClassSubstitutorRegistry classSubstitutorRegistry;
private final Provider<ValueSemanticsResolver> valueSemanticsResolver;
private final ProgrammingModel programmingModel;
@@ -143,8 +143,8 @@ public class SpecificationLoaderDefault implements SpecificationLoader {
final CausewayConfiguration isisConfiguration,
final CausewaySystemEnvironment isisSystemEnvironment,
final ServiceRegistry serviceRegistry,
- final IsisBeanTypeClassifier isisBeanTypeClassifier,
- final IsisBeanTypeRegistry isisBeanTypeRegistry,
+ final CausewayBeanTypeClassifier isisBeanTypeClassifier,
+ final CausewayBeanTypeRegistry isisBeanTypeRegistry,
final Provider<ValueSemanticsResolver> valueTypeRegistry,
final ClassSubstitutorRegistry classSubstitutorRegistry) {
this(
@@ -163,8 +163,8 @@ public class SpecificationLoaderDefault implements SpecificationLoader {
final CausewayConfiguration isisConfiguration,
final CausewaySystemEnvironment isisSystemEnvironment,
final ServiceRegistry serviceRegistry,
- final IsisBeanTypeClassifier isisBeanTypeClassifier,
- final IsisBeanTypeRegistry isisBeanTypeRegistry,
+ final CausewayBeanTypeClassifier isisBeanTypeClassifier,
+ final CausewayBeanTypeRegistry isisBeanTypeRegistry,
final Provider<ValueSemanticsResolver> valueSemanticsRegistry,
final ClassSubstitutorRegistry classSubstitutorRegistry) {
this.programmingModel = programmingModel;
@@ -184,8 +184,8 @@ public class SpecificationLoaderDefault implements SpecificationLoader {
final CausewaySystemEnvironment isisSystemEnvironment,
final ServiceRegistry serviceRegistry,
final ProgrammingModel programmingModel,
- final IsisBeanTypeClassifier isisBeanTypeClassifier,
- final IsisBeanTypeRegistry isisBeanTypeRegistry,
+ final CausewayBeanTypeClassifier isisBeanTypeClassifier,
+ final CausewayBeanTypeRegistry isisBeanTypeRegistry,
final ClassSubstitutorRegistry classSubstitutorRegistry) {
val instance = new SpecificationLoaderDefault(
@@ -214,7 +214,7 @@ public class SpecificationLoaderDefault implements SpecificationLoader {
/**
* Initializes and wires up, and primes the cache based on any service
- * classes (provided by the {@link IsisBeanTypeRegistry}).
+ * classes (provided by the {@link CausewayBeanTypeRegistry}).
*/
@Override
public void createMetaModel() {
@@ -541,19 +541,19 @@ public class SpecificationLoaderDefault implements SpecificationLoader {
* however as a fallback we might need to classify types that escaped eager introspection
* here.
*/
- private IsisBeanMetaData classify(final @Nullable Class<?> type) {
+ private CausewayBeanMetaData classify(final @Nullable Class<?> type) {
return isisBeanTypeRegistry
.lookupIntrospectableType(type)
.orElseGet(()->
valueSemanticsResolver.get().hasValueSemantics(type)
- ? IsisBeanMetaData.isisManaged(BeanSort.VALUE, LogicalType.infer(type))
+ ? CausewayBeanMetaData.isisManaged(BeanSort.VALUE, LogicalType.infer(type))
: isisBeanTypeClassifier.classify(type)
);
}
@Nullable
private ObjectSpecification primeSpecification(
- final @NonNull IsisBeanMetaData typeMeta) {
+ final @NonNull CausewayBeanMetaData typeMeta) {
return _loadSpecification(
typeMeta.getCorrespondingClass(), type->typeMeta, IntrospectionState.NOT_INTROSPECTED);
@@ -562,7 +562,7 @@ public class SpecificationLoaderDefault implements SpecificationLoader {
@Nullable
private ObjectSpecification _loadSpecification(
final @Nullable Class<?> type,
- final @NonNull Function<Class<?>, IsisBeanMetaData> beanClassifier,
+ final @NonNull Function<Class<?>, CausewayBeanMetaData> beanClassifier,
final @NonNull IntrospectionState upTo) {
if(type==null) {
@@ -621,7 +621,7 @@ public class SpecificationLoaderDefault implements SpecificationLoader {
/**
* Creates the appropriate type of {@link ObjectSpecification}.
*/
- private ObjectSpecification createSpecification(final IsisBeanMetaData typeMeta) {
+ private ObjectSpecification createSpecification(final CausewayBeanMetaData typeMeta) {
guardAgainstMetamodelLockedAfterFullIntrospection(typeMeta.getCorrespondingClass());
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
index 4ce4e97c90..a99ee44ca3 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
@@ -27,6 +27,11 @@ import java.util.function.Consumer;
import java.util.function.Predicate;
import java.util.stream.Stream;
+import org.apache.causeway.applib.Identifier;
+import org.apache.causeway.applib.annotation.Domain;
+import org.apache.causeway.applib.annotation.Introspection.IntrospectionPolicy;
+import org.apache.causeway.applib.id.LogicalType;
+import org.apache.causeway.applib.services.metamodel.BeanSort;
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.collections.ImmutableEnumSet;
import org.apache.causeway.commons.internal.assertions._Assert;
@@ -36,20 +41,11 @@ import org.apache.causeway.commons.internal.base._Oneshot;
import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.commons.internal.collections._Lists;
import org.apache.causeway.commons.internal.collections._Multimaps;
+import org.apache.causeway.commons.internal.collections._Multimaps.ListMultimap;
import org.apache.causeway.commons.internal.collections._Sets;
import org.apache.causeway.commons.internal.collections._Streams;
-import org.apache.causeway.commons.internal.collections._Multimaps.ListMultimap;
import org.apache.causeway.commons.internal.exceptions._Exceptions;
-import org.springframework.util.ClassUtils;
-
-import static org.apache.causeway.commons.internal.base._NullSafe.stream;
-
-import org.apache.causeway.applib.Identifier;
-import org.apache.causeway.applib.annotation.Domain;
-import org.apache.causeway.applib.annotation.Introspection.IntrospectionPolicy;
-import org.apache.causeway.applib.id.LogicalType;
-import org.apache.causeway.applib.services.metamodel.BeanSort;
-import org.apache.causeway.core.config.beans.IsisBeanTypeRegistry;
+import org.apache.causeway.core.config.beans.CausewayBeanTypeRegistry;
import org.apache.causeway.core.metamodel.consent.Consent;
import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.causeway.core.metamodel.consent.InteractionResult;
@@ -89,6 +85,9 @@ import org.apache.causeway.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.causeway.core.metamodel.spec.feature.ObjectMember;
import org.apache.causeway.core.metamodel.specloader.facetprocessor.FacetProcessor;
import org.apache.causeway.core.metamodel.specloader.postprocessor.PostProcessor;
+import org.springframework.util.ClassUtils;
+
+import static org.apache.causeway.commons.internal.base._NullSafe.stream;
import lombok.EqualsAndHashCode;
import lombok.Getter;
@@ -893,8 +892,8 @@ implements ObjectSpecification {
}
@Getter(lazy = true)
- private final IsisBeanTypeRegistry isisBeanTypeRegistry =
+ private final CausewayBeanTypeRegistry isisBeanTypeRegistry =
getServiceRegistry()
- .lookupServiceElseFail(IsisBeanTypeRegistry.class);
+ .lookupServiceElseFail(CausewayBeanTypeRegistry.class);
}
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java
index 1978a6a72e..a500870c36 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java
@@ -36,7 +36,7 @@ import org.springframework.lang.Nullable;
import org.apache.causeway.applib.Identifier;
import org.apache.causeway.applib.annotation.Introspection.IntrospectionPolicy;
-import org.apache.causeway.core.config.beans.IsisBeanMetaData;
+import org.apache.causeway.core.config.beans.CausewayBeanMetaData;
import org.apache.causeway.core.metamodel.commons.StringExtensions;
import org.apache.causeway.core.metamodel.commons.ToString;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
@@ -87,7 +87,7 @@ implements FacetHolder {
private final IntrospectionPolicy introspectionPolicy;
public ObjectSpecificationDefault(
- final IsisBeanMetaData typeMeta,
+ final CausewayBeanMetaData typeMeta,
final MetaModelContext mmc,
final FacetProcessor facetProcessor,
final PostProcessor postProcessor,
diff --git a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/homepage/HomePageResolverServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/homepage/HomePageResolverServiceDefault.java
index ed8d630635..221da475e4 100644
--- a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/homepage/HomePageResolverServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/homepage/HomePageResolverServiceDefault.java
@@ -31,7 +31,7 @@ import org.apache.causeway.applib.annotation.HomePage;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.applib.services.factory.FactoryService;
import org.apache.causeway.applib.services.homepage.HomePageResolverService;
-import org.apache.causeway.core.config.beans.IsisBeanTypeRegistry;
+import org.apache.causeway.core.config.beans.CausewayBeanTypeRegistry;
import org.apache.causeway.core.metamodel.commons.ClassExtensions;
import org.apache.causeway.core.runtimeservices.CausewayModuleCoreRuntimeServices;
@@ -43,14 +43,14 @@ import lombok.val;
public class HomePageResolverServiceDefault implements HomePageResolverService {
private final FactoryService factoryService;
- private final IsisBeanTypeRegistry isisBeanTypeRegistry;
+ private final CausewayBeanTypeRegistry isisBeanTypeRegistry;
private Optional<Class<?>> viewModelTypeForHomepage;
@Inject
public HomePageResolverServiceDefault(
final FactoryService factoryService,
- final IsisBeanTypeRegistry isisBeanTypeRegistry) {
+ final CausewayBeanTypeRegistry isisBeanTypeRegistry) {
this.factoryService = factoryService;
this.isisBeanTypeRegistry = isisBeanTypeRegistry;
diff --git a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/session/InteractionServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/session/InteractionServiceDefault.java
index 92b30a5026..d599e92bca 100644
--- a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/session/InteractionServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/session/InteractionServiceDefault.java
@@ -43,7 +43,7 @@ import org.apache.causeway.core.interaction.integration.InteractionAwareTransact
import org.apache.causeway.core.interaction.scope.InteractionScopeBeanFactoryPostProcessor;
import org.apache.causeway.core.interaction.scope.InteractionScopeLifecycleHandler;
import org.apache.causeway.core.interaction.scope.TransactionBoundaryAware;
-import org.apache.causeway.core.interaction.session.IsisInteraction;
+import org.apache.causeway.core.interaction.session.CausewayInteraction;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.beans.factory.config.ConfigurableBeanFactory;
import org.springframework.context.annotation.Lazy;
@@ -223,11 +223,11 @@ implements
return interactionLayer;
}
- private IsisInteraction getOrCreateIsisInteraction() {
+ private CausewayInteraction getOrCreateIsisInteraction() {
final Stack<InteractionLayer> interactionLayers = interactionLayerStack.get();
return interactionLayers.isEmpty()
- ? new IsisInteraction(interactionIdGenerator.interactionId())
+ ? new CausewayInteraction(interactionIdGenerator.interactionId())
: _Casts.uncheckedCast(interactionLayers.firstElement().getInteraction());
}
@@ -357,7 +357,7 @@ implements
cause.getMessage());
return;
}
- val interaction = _Casts.<IsisInteraction>uncheckedCast(stack.get(0).getInteraction());
+ val interaction = _Casts.<CausewayInteraction>uncheckedCast(stack.get(0).getInteraction());
txBoundaryHandler.requestRollback(interaction);
}
@@ -365,7 +365,7 @@ implements
return interactionLayerStack.get().size()==1;
}
- private void postInteractionOpened(final IsisInteraction interaction) {
+ private void postInteractionOpened(final CausewayInteraction interaction) {
interactionId.set(interaction.getInteractionId());
transactionBoundaryAwareBeans.forEach(bean->bean.beforeEnteringTransactionalBoundary(interaction));
txBoundaryHandler.onOpen(interaction);
@@ -374,7 +374,7 @@ implements
interactionScopeLifecycleHandler.onTopLevelInteractionOpened();
}
- private void preInteractionClosed(final IsisInteraction interaction) {
+ private void preInteractionClosed(final CausewayInteraction interaction) {
completeAndPublishCurrentCommand();
transactionServiceProvider.get().flushTransaction();
val isSynchronizationActive = TransactionSynchronizationManager.isSynchronizationActive();
@@ -410,10 +410,10 @@ implements
}
}
- private IsisInteraction getInternalInteractionElseFail() {
+ private CausewayInteraction getInternalInteractionElseFail() {
val interaction = currentInteractionElseFail();
- if(interaction instanceof IsisInteraction) {
- return (IsisInteraction) interaction;
+ if(interaction instanceof CausewayInteraction) {
+ return (CausewayInteraction) interaction;
}
throw _Exceptions.unrecoverable("the framework does not recognize "
+ "this implementation of an Interaction: %s", interaction.getClass().getName());
diff --git a/core/webapp/src/main/java/org/apache/causeway/core/webapp/webappctx/IsisWebAppContextInitializer.java b/core/webapp/src/main/java/org/apache/causeway/core/webapp/webappctx/IsisWebAppContextInitializer.java
index 6e87fca825..85d6ff9fc4 100644
--- a/core/webapp/src/main/java/org/apache/causeway/core/webapp/webappctx/IsisWebAppContextInitializer.java
+++ b/core/webapp/src/main/java/org/apache/causeway/core/webapp/webappctx/IsisWebAppContextInitializer.java
@@ -26,16 +26,15 @@ import javax.servlet.ServletContextEvent;
import javax.servlet.ServletContextListener;
import javax.servlet.ServletException;
+import org.apache.causeway.applib.services.registry.ServiceRegistry;
import org.apache.causeway.commons.internal.base._Oneshot;
import org.apache.causeway.commons.internal.context._Context;
-import org.springframework.boot.web.servlet.ServletContextInitializer;
-import org.springframework.stereotype.Component;
-
-import org.apache.causeway.applib.services.registry.ServiceRegistry;
import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.config.viewer.web.WebAppContextPath;
import org.apache.causeway.core.webapp.modules.WebModule;
import org.apache.causeway.core.webapp.modules.WebModuleContext;
+import org.springframework.boot.web.servlet.ServletContextInitializer;
+import org.springframework.stereotype.Component;
import lombok.NonNull;
import lombok.Value;
@@ -68,7 +67,7 @@ public class IsisWebAppContextInitializer implements ServletContextInitializer {
// -- INTERFACE IMPLEMENTATION
@Override
- public void onStartup(ServletContext servletContext) throws ServletException {
+ public void onStartup(final ServletContext servletContext) throws ServletException {
// onStartup(...) must be a one shot, otherwise ignore with warning
if(!oneshot.trigger()) {
@@ -83,7 +82,7 @@ public class IsisWebAppContextInitializer implements ServletContextInitializer {
}
// set the ServletContext initializing thread as preliminary default until overridden by
- // IsisWicketApplication#init() or others, that better know what ClassLoader to use as application default.
+ // CausewayWicketApplication#init() or others, that better know what ClassLoader to use as application default.
_Context.setDefaultClassLoader(Thread.currentThread().getContextClassLoader(), false);
val contextPath = servletContext.getContextPath();
@@ -104,7 +103,7 @@ public class IsisWebAppContextInitializer implements ServletContextInitializer {
}
- public void contextDestroyed(WebModuleContext webModuleContext, ServletContextEvent event) {
+ public void contextDestroyed(final WebModuleContext webModuleContext, final ServletContextEvent event) {
if(webModuleContext!=null) {
log.info("about to destroy the context");
webModuleContext.shutdown(event);
@@ -120,7 +119,7 @@ public class IsisWebAppContextInitializer implements ServletContextInitializer {
@NonNull WebModuleContext webModuleContext;
@Override
- public void contextDestroyed(ServletContextEvent sce) {
+ public void contextDestroyed(final ServletContextEvent sce) {
IsisWebAppContextInitializer.this.contextDestroyed(webModuleContext, sce);
}
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/DemoModuleCommon.java b/examples/demo/domain/src/main/java/demoapp/dom/DemoModuleCommon.java
index 266d674482..e1027d6f01 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/DemoModuleCommon.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/DemoModuleCommon.java
@@ -26,7 +26,7 @@ import org.springframework.context.annotation.PropertySources;
import org.apache.causeway.applib.CausewayModuleApplibChangeAndExecutionLoggers;
import org.apache.causeway.applib.CausewayModuleApplibMixins;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.core.runtimeservices.CausewayModuleCoreRuntimeServices;
import org.apache.causeway.testing.fixtures.applib.CausewayModuleTestingFixturesApplib;
@@ -38,8 +38,8 @@ import org.apache.causeway.testing.fixtures.applib.CausewayModuleTestingFixtures
CausewayModuleTestingFixturesApplib.class,
})
@PropertySources({
- @PropertySource(IsisPresets.NoTranslations),
- @PropertySource(IsisPresets.SilenceWicket),
+ @PropertySource(CausewayPresets.NoTranslations),
+ @PropertySource(CausewayPresets.SilenceWicket),
})
@ComponentScan(
basePackageClasses= {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/DemoModuleJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/DemoModuleJdo.java
index ffd5c701ab..d0fba3d7de 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/DemoModuleJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/DemoModuleJdo.java
@@ -24,7 +24,7 @@ import org.springframework.context.annotation.Profile;
import org.springframework.context.annotation.PropertySource;
import org.springframework.context.annotation.PropertySources;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.extensions.commandlog.jdo.CausewayModuleExtCommandLogPersistenceJdo;
import org.apache.causeway.persistence.jdo.datanucleus.CausewayModulePersistenceJdoDatanucleus;
@@ -36,7 +36,7 @@ import org.apache.causeway.persistence.jdo.datanucleus.CausewayModulePersistence
CausewayModuleExtCommandLogPersistenceJdo.class,
})
@PropertySources({
- @PropertySource(IsisPresets.DatanucleusAutocreateNoValidate),
+ @PropertySource(CausewayPresets.DatanucleusAutocreateNoValidate),
})
public class DemoModuleJdo {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/jpa/ActionCommandPublishingJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/jpa/ActionCommandPublishingJpa.java
index f428dd9160..db216b0ddc 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/jpa/ActionCommandPublishingJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/jpa/ActionCommandPublishingJpa.java
@@ -37,7 +37,7 @@ import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Publishing;
import org.apache.causeway.applib.annotation.SemanticsOf;
-import org.apache.causeway.persistence.jpa.applib.integration.IsisEntityListener;
+import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -54,7 +54,7 @@ import demoapp.dom.domain.actions.Action.commandPublishing.ActionCommandPublishi
schema = "demo",
name = "ActionCommandPublishingJpa"
)
-@EntityListeners(IsisEntityListener.class)
+@EntityListeners(CausewayEntityListener.class)
@Named("demo.ActionCommandPublishingEntity")
@DomainObject(
editing = Editing.DISABLED)
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/jpa/ActionExecutionPublishingJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/jpa/ActionExecutionPublishingJpa.java
index faee2b1228..268b4b9030 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/jpa/ActionExecutionPublishingJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/jpa/ActionExecutionPublishingJpa.java
@@ -37,7 +37,7 @@ import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Publishing;
import org.apache.causeway.applib.annotation.SemanticsOf;
-import org.apache.causeway.persistence.jpa.applib.integration.IsisEntityListener;
+import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -54,7 +54,7 @@ import demoapp.dom.domain.actions.Action.executionPublishing.ActionExecutionPubl
schema = "demo",
name = "ActionExecutionPublishingJpa"
)
-@EntityListeners(IsisEntityListener.class)
+@EntityListeners(CausewayEntityListener.class)
@Named("demo.ActionExecutionPublishingEntity")
@DomainObject(
editing = Editing.DISABLED)
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/annotated/disabled/jpa/DomainObjectEntityChangePublishingDisabledJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/annotated/disabled/jpa/DomainObjectEntityChangePublishingDisabledJpa.java
index 1d852ecbda..53949de4d9 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/annotated/disabled/jpa/DomainObjectEntityChangePublishingDisabledJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/annotated/disabled/jpa/DomainObjectEntityChangePublishingDisabledJpa.java
@@ -33,7 +33,7 @@ import org.apache.causeway.applib.annotation.DomainObjectLayout;
import org.apache.causeway.applib.annotation.Nature;
import org.apache.causeway.applib.annotation.Publishing;
import org.apache.causeway.applib.annotation.Title;
-import org.apache.causeway.persistence.jpa.applib.integration.IsisEntityListener;
+import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -48,7 +48,7 @@ import demoapp.dom.domain.objects.DomainObject.entityChangePublishing.annotated.
schema = "demo",
name = "DomainObjectEntityChangePublishingDisabledJpa"
)
-@EntityListeners(IsisEntityListener.class)
+@EntityListeners(CausewayEntityListener.class)
@Named("demo.DomainObjectEntityChangePublishingDisabledEntity")
@DomainObject(
nature=Nature.ENTITY
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/annotated/enabled/jpa/DomainObjectEntityChangePublishingEnabledJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/annotated/enabled/jpa/DomainObjectEntityChangePublishingEnabledJpa.java
index c8e9fc2284..a82cba6d04 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/annotated/enabled/jpa/DomainObjectEntityChangePublishingEnabledJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/annotated/enabled/jpa/DomainObjectEntityChangePublishingEnabledJpa.java
@@ -33,7 +33,7 @@ import org.apache.causeway.applib.annotation.DomainObjectLayout;
import org.apache.causeway.applib.annotation.Nature;
import org.apache.causeway.applib.annotation.Publishing;
import org.apache.causeway.applib.annotation.Title;
-import org.apache.causeway.persistence.jpa.applib.integration.IsisEntityListener;
+import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -48,7 +48,7 @@ import demoapp.dom.domain.objects.DomainObject.entityChangePublishing.annotated.
schema = "demo",
name = "DomainObjectEntityChangePublishingEnabledJpa"
)
-@EntityListeners(IsisEntityListener.class)
+@EntityListeners(CausewayEntityListener.class)
@Named("demo.DomainObjectEntityChangePublishingEnabledEntity")
@DomainObject(
nature=Nature.ENTITY
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/metaAnnot/enabled/jpa/DomainObjectEntityChangePublishingEnabledMetaAnnotatedJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/metaAnnot/enabled/jpa/DomainObjectEntityChangePublishingEnabledMetaAnnotatedJpa.java
index 35aa0e7271..83877b6e55 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/metaAnnot/enabled/jpa/DomainObjectEntityChangePublishingEnabledMetaAnnotatedJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/metaAnnot/enabled/jpa/DomainObjectEntityChangePublishingEnabledMetaAnnotatedJpa.java
@@ -32,7 +32,7 @@ import org.apache.causeway.applib.annotation.DomainObject;
import org.apache.causeway.applib.annotation.DomainObjectLayout;
import org.apache.causeway.applib.annotation.Nature;
import org.apache.causeway.applib.annotation.Title;
-import org.apache.causeway.persistence.jpa.applib.integration.IsisEntityListener;
+import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -48,7 +48,7 @@ import demoapp.dom.domain.objects.DomainObject.entityChangePublishing.metaAnnot.
schema = "demo",
name = "DomainObjectEntityChangePublishingEnabledMetaAnnotatedJpa"
)
-@EntityListeners(IsisEntityListener.class)
+@EntityListeners(CausewayEntityListener.class)
@DomainObjectEntityChangePublishingEnabledMetaAnnotation // <.>
@Named("demo.DomainObjectEntityChangePublishingEnabledMetaAnnotatedEntity")
@DomainObject(
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/metaAnnotOverridden/enabled/jpa/DomainObjectEntityChangePublishingEnabledMetaAnnotOverriddenJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/metaAnnotOverridden/enabled/jpa/DomainObjectEntityChangePublishingEnabledMetaAnnotOverriddenJpa.java
index 35b5e2a56a..9ce323f904 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/metaAnnotOverridden/enabled/jpa/DomainObjectEntityChangePublishingEnabledMetaAnnotOverriddenJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/metaAnnotOverridden/enabled/jpa/DomainObjectEntityChangePublishingEnabledMetaAnnotOverriddenJpa.java
@@ -33,7 +33,7 @@ import org.apache.causeway.applib.annotation.DomainObjectLayout;
import org.apache.causeway.applib.annotation.Nature;
import org.apache.causeway.applib.annotation.Publishing;
import org.apache.causeway.applib.annotation.Title;
-import org.apache.causeway.persistence.jpa.applib.integration.IsisEntityListener;
+import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -49,7 +49,7 @@ import demoapp.dom.domain.objects.DomainObject.entityChangePublishing.metaAnnotO
schema = "demo",
name = "DomainObjectEntityChangePublishingEnabledMetaAnnotOverriddenJpa"
)
-@EntityListeners(IsisEntityListener.class)
+@EntityListeners(CausewayEntityListener.class)
@DomainObjectEntityChangePublishingDisabledMetaAnnotation // <.>
@Named("demo.DomainObjectEntityChangePublishingEnabledMetaAnnotOverriddenEntity")
@DomainObject(
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/viewmodels/jaxbrefentity/jpa/JaxbRefJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/viewmodels/jaxbrefentity/jpa/JaxbRefJpa.java
index 795596ff77..604c1b5f31 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/viewmodels/jaxbrefentity/jpa/JaxbRefJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/viewmodels/jaxbrefentity/jpa/JaxbRefJpa.java
@@ -30,7 +30,7 @@ import org.springframework.context.annotation.Profile;
import org.apache.causeway.applib.annotation.Bounding;
import org.apache.causeway.applib.annotation.DomainObject;
-import org.apache.causeway.persistence.jpa.applib.integration.IsisEntityListener;
+import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -45,7 +45,7 @@ import demoapp.dom.domain.objects.DomainObject.nature.viewmodels.jaxbrefentity.J
schema = "demo",
name = "JaxbRefJpa"
)
-@EntityListeners(IsisEntityListener.class)
+@EntityListeners(CausewayEntityListener.class)
@Named("demo.JaxbRefEntity")
@DomainObject(
bounding = Bounding.BOUNDED)
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jpa/NumberConstantJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jpa/NumberConstantJpa.java
index e2609884af..f09776a437 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jpa/NumberConstantJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jpa/NumberConstantJpa.java
@@ -31,7 +31,7 @@ import org.apache.causeway.applib.annotation.DomainObject;
import org.apache.causeway.applib.annotation.Editing;
import org.apache.causeway.applib.annotation.ObjectSupport;
import org.apache.causeway.applib.annotation.Property;
-import org.apache.causeway.persistence.jpa.applib.integration.IsisEntityListener;
+import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -47,7 +47,7 @@ import demoapp.dom.domain.objects.other.embedded.persistence.NumberConstantEntit
schema = "demo",
name = "NumberConstantJpa"
)
-@EntityListeners(IsisEntityListener.class)
+@EntityListeners(CausewayEntityListener.class)
@Named("demo.NumberConstantEntity")
@DomainObject
@NoArgsConstructor
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/commandPublishing/jpa/PropertyCommandPublishingJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/commandPublishing/jpa/PropertyCommandPublishingJpa.java
index da0b40ba75..da8ab3d901 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/commandPublishing/jpa/PropertyCommandPublishingJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/commandPublishing/jpa/PropertyCommandPublishingJpa.java
@@ -33,7 +33,7 @@ import org.apache.causeway.applib.annotation.ObjectSupport;
import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Publishing;
-import org.apache.causeway.persistence.jpa.applib.integration.IsisEntityListener;
+import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -50,7 +50,7 @@ import demoapp.dom.domain.properties.Property.commandPublishing.PropertyCommandP
schema = "demo",
name = "PropertyCommandPublishingJpa"
)
-@EntityListeners(IsisEntityListener.class)
+@EntityListeners(CausewayEntityListener.class)
@Named("demo.PropertyCommandPublishingEntity")
@DomainObject(
editing = Editing.ENABLED)
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/executionPublishing/jpa/PropertyExecutionPublishingJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/executionPublishing/jpa/PropertyExecutionPublishingJpa.java
index a33e0bb4c7..c57d0c21a2 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/executionPublishing/jpa/PropertyExecutionPublishingJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/executionPublishing/jpa/PropertyExecutionPublishingJpa.java
@@ -34,7 +34,7 @@ import org.apache.causeway.applib.annotation.ObjectSupport;
import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Publishing;
-import org.apache.causeway.persistence.jpa.applib.integration.IsisEntityListener;
+import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -51,7 +51,7 @@ import demoapp.dom.domain.properties.Property.executionPublishing.PropertyExecut
schema = "demo",
name = "PropertyExecutionPublishingJpa"
)
-@EntityListeners(IsisEntityListener.class)
+@EntityListeners(CausewayEntityListener.class)
@Named("demo.PropertyExecutionPublishingEntity")
@DomainObject(
editing = Editing.ENABLED)
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/jpa/PropertyProjectingChildJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/jpa/PropertyProjectingChildJpa.java
index db4b586020..856a848a2a 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/jpa/PropertyProjectingChildJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/jpa/PropertyProjectingChildJpa.java
@@ -33,7 +33,7 @@ import org.apache.causeway.applib.annotation.Editing;
import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Title;
import org.apache.causeway.applib.jaxb.PersistentEntityAdapter;
-import org.apache.causeway.persistence.jpa.applib.integration.IsisEntityListener;
+import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -48,7 +48,7 @@ import demoapp.dom.domain.properties.Property.projecting.persistence.PropertyPro
schema = "demo",
name = "PropertyProjectingChildJpa"
)
-@EntityListeners(IsisEntityListener.class)
+@EntityListeners(CausewayEntityListener.class)
@Named("demo.PropertyProjectingChildJpa")
@DomainObject(
editing = Editing.DISABLED)
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/services/core/wrapperFactory/jpa/WrapperFactoryJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/services/core/wrapperFactory/jpa/WrapperFactoryJpa.java
index 3888555521..eb94bdeefc 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/services/core/wrapperFactory/jpa/WrapperFactoryJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/services/core/wrapperFactory/jpa/WrapperFactoryJpa.java
@@ -41,7 +41,7 @@ import org.apache.causeway.applib.annotation.SemanticsOf;
import org.apache.causeway.applib.services.factory.FactoryService;
import org.apache.causeway.applib.services.wrapper.WrapperFactory;
import org.apache.causeway.applib.services.wrapper.control.AsyncControl;
-import org.apache.causeway.persistence.jpa.applib.integration.IsisEntityListener;
+import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -58,7 +58,7 @@ import demoapp.dom.services.core.wrapperFactory.WrapperFactoryEntity_updatePrope
schema = "demo",
name = "WrapperFactoryJpa"
)
-@EntityListeners(IsisEntityListener.class)
+@EntityListeners(CausewayEntityListener.class)
@Named("demo.WrapperFactoryEntity")
@DomainObject(
nature=Nature.ENTITY
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/services/extensions/secman/apptenancy/jpa/TenantedJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/services/extensions/secman/apptenancy/jpa/TenantedJpa.java
index 7ccc56242e..ef56baad77 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/services/extensions/secman/apptenancy/jpa/TenantedJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/services/extensions/secman/apptenancy/jpa/TenantedJpa.java
@@ -36,7 +36,7 @@ import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.SemanticsOf;
import org.apache.causeway.applib.annotation.Title;
-import org.apache.causeway.persistence.jpa.applib.integration.IsisEntityListener;
+import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -51,7 +51,7 @@ import demoapp.dom.services.extensions.secman.apptenancy.persistence.TenantedEnt
schema = "demo",
name = "TenantedJpa"
)
-@EntityListeners(IsisEntityListener.class)
+@EntityListeners(CausewayEntityListener.class)
@Named("demo.TenantedEntity")
@DomainObject
@NoArgsConstructor
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/blobs/jpa/IsisBlobJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/blobs/jpa/IsisBlobJpa.java
index 74c922fe6c..e8ad86678d 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/blobs/jpa/IsisBlobJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/blobs/jpa/IsisBlobJpa.java
@@ -38,7 +38,7 @@ import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Title;
import org.apache.causeway.applib.value.Blob;
-import org.apache.causeway.persistence.jpa.applib.integration.IsisEntityListener;
+import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
import org.apache.causeway.persistence.jpa.applib.types.BlobJpaEmbeddable;
import lombok.NoArgsConstructor;
@@ -52,7 +52,7 @@ import demoapp.dom.types.isis.blobs.persistence.IsisBlobEntity;
schema = "demo",
name = "IsisBlobJpa"
)
-@EntityListeners(IsisEntityListener.class)
+@EntityListeners(CausewayEntityListener.class)
@Named("demo.IsisBlobEntity")
@DomainObject
@NoArgsConstructor
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/clobs/jpa/IsisClobJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/clobs/jpa/IsisClobJpa.java
index 020a551485..403e0abd8e 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/clobs/jpa/IsisClobJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/clobs/jpa/IsisClobJpa.java
@@ -38,7 +38,7 @@ import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Title;
import org.apache.causeway.applib.value.Clob;
-import org.apache.causeway.persistence.jpa.applib.integration.IsisEntityListener;
+import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
import org.apache.causeway.persistence.jpa.applib.types.ClobJpaEmbeddable;
import lombok.NoArgsConstructor;
@@ -52,7 +52,7 @@ import demoapp.dom.types.isis.clobs.persistence.IsisClobEntity;
schema = "demo",
name = "IsisClobJpa"
)
-@EntityListeners(IsisEntityListener.class)
+@EntityListeners(CausewayEntityListener.class)
@Named("demo.IsisClobEntity")
@DomainObject
@NoArgsConstructor
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/localresourcepaths/jpa/IsisLocalResourcePathJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/localresourcepaths/jpa/IsisLocalResourcePathJpa.java
index 8e52a1b476..2743119917 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/localresourcepaths/jpa/IsisLocalResourcePathJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/localresourcepaths/jpa/IsisLocalResourcePathJpa.java
@@ -35,7 +35,7 @@ import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Title;
import org.apache.causeway.applib.value.LocalResourcePath;
-import org.apache.causeway.persistence.jpa.applib.integration.IsisEntityListener;
+import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -50,7 +50,7 @@ import demoapp.dom.types.isis.localresourcepaths.persistence.IsisLocalResourcePa
schema = "demo",
name = "IsisLocalResourcePathJpa"
)
-@EntityListeners(IsisEntityListener.class)
+@EntityListeners(CausewayEntityListener.class)
@Named("demo.IsisLocalResourcePathEntity")
@DomainObject
@NoArgsConstructor
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/jpa/IsisMarkupJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/jpa/IsisMarkupJpa.java
index ef94c517a0..0a7a44f122 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/jpa/IsisMarkupJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/jpa/IsisMarkupJpa.java
@@ -38,7 +38,7 @@ import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Title;
import org.apache.causeway.applib.annotation.Where;
-import org.apache.causeway.persistence.jpa.applib.integration.IsisEntityListener;
+import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -54,7 +54,7 @@ import demoapp.dom.types.isis.markups.persistence.IsisMarkupEntity;
schema = "demo",
name = "IsisMarkupJpa"
)
-@EntityListeners(IsisEntityListener.class)
+@EntityListeners(CausewayEntityListener.class)
@Named("demo.IsisMarkupEntity")
@DomainObject
@NoArgsConstructor // <.>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/passwords/jpa/IsisPasswordJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/passwords/jpa/IsisPasswordJpa.java
index 55fcbda37f..77d65088ba 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/passwords/jpa/IsisPasswordJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/passwords/jpa/IsisPasswordJpa.java
@@ -35,7 +35,7 @@ import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Title;
import org.apache.causeway.applib.value.Password;
-import org.apache.causeway.persistence.jpa.applib.integration.IsisEntityListener;
+import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -50,7 +50,7 @@ import demoapp.dom.types.isis.passwords.persistence.IsisPasswordEntity;
schema = "demo",
name = "IsisPasswordJpa"
)
-@EntityListeners(IsisEntityListener.class)
+@EntityListeners(CausewayEntityListener.class)
@Named("demo.IsisPasswordEntity")
@DomainObject
@NoArgsConstructor
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/cal/jpa/IsisCalendarEventJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/cal/jpa/IsisCalendarEventJpa.java
index baed2590ee..09fe54b9e2 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/cal/jpa/IsisCalendarEventJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/cal/jpa/IsisCalendarEventJpa.java
@@ -35,7 +35,7 @@ import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Title;
import org.apache.causeway.extensions.fullcalendar.applib.value.CalendarEvent;
-import org.apache.causeway.persistence.jpa.applib.integration.IsisEntityListener;
+import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -50,7 +50,7 @@ import demoapp.dom.types.isisext.cal.persistence.IsisCalendarEventEntity;
schema = "demo",
name = "IsisCalendarEventJpa"
)
-@EntityListeners(IsisEntityListener.class)
+@EntityListeners(CausewayEntityListener.class)
@Named("demo.IsisCalendarEventEntity")
@DomainObject
@NoArgsConstructor
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/jpa/IsisAsciiDocJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/jpa/IsisAsciiDocJpa.java
index 56b67418c8..ee6f414b1f 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/jpa/IsisAsciiDocJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/jpa/IsisAsciiDocJpa.java
@@ -38,7 +38,7 @@ import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Title;
import org.apache.causeway.applib.annotation.Where;
-import org.apache.causeway.persistence.jpa.applib.integration.IsisEntityListener;
+import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -54,7 +54,7 @@ import demoapp.dom.types.isisval.asciidocs.persistence.IsisAsciiDocEntity;
schema = "demo",
name = "IsisAsciiDocJpa"
)
-@EntityListeners(IsisEntityListener.class)
+@EntityListeners(CausewayEntityListener.class)
@Named("demo.IsisAsciiDocEntity")
@DomainObject
@NoArgsConstructor // <.>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/jpa/IsisMarkdownJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/jpa/IsisMarkdownJpa.java
index baad678ee4..d3d929b978 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/jpa/IsisMarkdownJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/jpa/IsisMarkdownJpa.java
@@ -38,7 +38,7 @@ import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Title;
import org.apache.causeway.applib.annotation.Where;
-import org.apache.causeway.persistence.jpa.applib.integration.IsisEntityListener;
+import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -54,7 +54,7 @@ import demoapp.dom.types.isisval.markdowns.persistence.IsisMarkdownEntity;
schema = "demo",
name = "IsisMarkdownJpa"
)
-@EntityListeners(IsisEntityListener.class)
+@EntityListeners(CausewayEntityListener.class)
@Named("demo.IsisMarkdownEntity")
@DomainObject
@NoArgsConstructor // <.>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/vegas/jpa/IsisVegaJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/vegas/jpa/IsisVegaJpa.java
index 6b109f8f23..e7d2e3f1ab 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/vegas/jpa/IsisVegaJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/vegas/jpa/IsisVegaJpa.java
@@ -38,7 +38,7 @@ import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Title;
import org.apache.causeway.applib.annotation.Where;
-import org.apache.causeway.persistence.jpa.applib.integration.IsisEntityListener;
+import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -54,7 +54,7 @@ import demoapp.dom.types.isisval.vegas.persistence.IsisVegaEntity;
schema = "demo",
name = "IsisVegaJpa"
)
-@EntityListeners(IsisEntityListener.class)
+@EntityListeners(CausewayEntityListener.class)
@Named("demo.IsisVegaEntity")
@DomainObject
@NoArgsConstructor // <.>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/jpa/JavaAwtBufferedImageJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/jpa/JavaAwtBufferedImageJpa.java
index 8e3717f65e..572d6b8332 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/jpa/JavaAwtBufferedImageJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/jpa/JavaAwtBufferedImageJpa.java
@@ -36,7 +36,7 @@ import org.apache.causeway.applib.annotation.ObjectSupport;
import org.apache.causeway.applib.annotation.Optionality;
import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
-import org.apache.causeway.persistence.jpa.applib.integration.IsisEntityListener;
+import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
import org.apache.causeway.persistence.jpa.integration.typeconverters.java.awt.JavaAwtBufferedImageByteArrayConverter;
import lombok.Getter;
@@ -52,7 +52,7 @@ import demoapp.dom.types.javaawt.images.persistence.JavaAwtBufferedImageEntity;
schema = "demo",
name = "JavaAwtBufferedImageJpa"
)
-@EntityListeners(IsisEntityListener.class)
+@EntityListeners(CausewayEntityListener.class)
@Named("demo.JavaAwtBufferedImageEntity")
@DomainObject
@NoArgsConstructor
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/jpa/WrapperBooleanJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/jpa/WrapperBooleanJpa.java
index d85cef8020..66f0324a01 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/jpa/WrapperBooleanJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/jpa/WrapperBooleanJpa.java
@@ -34,7 +34,7 @@ import org.apache.causeway.applib.annotation.Optionality;
import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Title;
-import org.apache.causeway.persistence.jpa.applib.integration.IsisEntityListener;
+import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -50,7 +50,7 @@ import demoapp.dom.types.javalang.booleans.persistence.WrapperBooleanEntity;
schema = "demo",
name = "WrapperBooleanJpa"
)
-@EntityListeners(IsisEntityListener.class)
+@EntityListeners(CausewayEntityListener.class)
@Named("demo.WrapperBooleanEntity")
@DomainObject
@NoArgsConstructor // <.>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/jpa/WrapperByteJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/jpa/WrapperByteJpa.java
index a564ee0e73..2f6824619c 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/jpa/WrapperByteJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/jpa/WrapperByteJpa.java
@@ -34,7 +34,7 @@ import org.apache.causeway.applib.annotation.Optionality;
import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Title;
-import org.apache.causeway.persistence.jpa.applib.integration.IsisEntityListener;
+import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -50,7 +50,7 @@ import demoapp.dom.types.javalang.bytes.persistence.WrapperByteEntity;
schema = "demo",
name = "WrapperByteJpa"
)
-@EntityListeners(IsisEntityListener.class)
+@EntityListeners(CausewayEntityListener.class)
@Named("demo.WrapperByteEntity")
@DomainObject
@NoArgsConstructor // <.>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/jpa/WrapperCharacterJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/jpa/WrapperCharacterJpa.java
index fde9a4a3b3..2acfeff66a 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/jpa/WrapperCharacterJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/jpa/WrapperCharacterJpa.java
@@ -34,7 +34,7 @@ import org.apache.causeway.applib.annotation.Optionality;
import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Title;
-import org.apache.causeway.persistence.jpa.applib.integration.IsisEntityListener;
+import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -50,7 +50,7 @@ import demoapp.dom.types.javalang.characters.persistence.WrapperCharacterEntity;
schema = "demo",
name = "WrapperCharacterJpa"
)
-@EntityListeners(IsisEntityListener.class)
+@EntityListeners(CausewayEntityListener.class)
@Named("demo.WrapperCharacterEntity")
@DomainObject
@NoArgsConstructor // <.>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/doubles/jpa/WrapperDoubleJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/doubles/jpa/WrapperDoubleJpa.java
index 559c6645fc..d202626530 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/doubles/jpa/WrapperDoubleJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/doubles/jpa/WrapperDoubleJpa.java
@@ -34,7 +34,7 @@ import org.apache.causeway.applib.annotation.Optionality;
import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Title;
-import org.apache.causeway.persistence.jpa.applib.integration.IsisEntityListener;
+import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -50,7 +50,7 @@ import demoapp.dom.types.javalang.doubles.persistence.WrapperDoubleEntity;
schema = "demo",
name = "WrapperDoubleJpa"
)
-@EntityListeners(IsisEntityListener.class)
+@EntityListeners(CausewayEntityListener.class)
@Named("demo.WrapperDoubleEntity")
@DomainObject
@NoArgsConstructor // <.>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/enums/jpa/JavaLangEnumJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/enums/jpa/JavaLangEnumJpa.java
index 81817e4b72..165022edc2 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/enums/jpa/JavaLangEnumJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/enums/jpa/JavaLangEnumJpa.java
@@ -34,7 +34,7 @@ import org.apache.causeway.applib.annotation.Optionality;
import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Title;
-import org.apache.causeway.persistence.jpa.applib.integration.IsisEntityListener;
+import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -50,7 +50,7 @@ import demoapp.dom.types.javalang.enums.persistence.JavaLangEnumEntity;
schema = "demo",
name = "JavaLangEnumJpa"
)
-@EntityListeners(IsisEntityListener.class)
+@EntityListeners(CausewayEntityListener.class)
@Named("demo.JavaLangEnumEntity")
@DomainObject
@NoArgsConstructor // <.>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/floats/jpa/WrapperFloatJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/floats/jpa/WrapperFloatJpa.java
index 4f86b15a4c..530a326229 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/floats/jpa/WrapperFloatJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/floats/jpa/WrapperFloatJpa.java
@@ -34,7 +34,7 @@ import org.apache.causeway.applib.annotation.Optionality;
import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Title;
-import org.apache.causeway.persistence.jpa.applib.integration.IsisEntityListener;
+import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -50,7 +50,7 @@ import demoapp.dom.types.javalang.floats.persistence.WrapperFloatEntity;
schema = "demo",
name = "WrapperFloatJpa"
)
-@EntityListeners(IsisEntityListener.class)
+@EntityListeners(CausewayEntityListener.class)
@Named("demo.WrapperFloatEntity")
@DomainObject
@NoArgsConstructor // <.>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/integers/jpa/WrapperIntegerJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/integers/jpa/WrapperIntegerJpa.java
index 417e5277ed..f35568e0b4 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/integers/jpa/WrapperIntegerJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/integers/jpa/WrapperIntegerJpa.java
@@ -34,7 +34,7 @@ import org.apache.causeway.applib.annotation.Optionality;
import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Title;
-import org.apache.causeway.persistence.jpa.applib.integration.IsisEntityListener;
+import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -50,7 +50,7 @@ import demoapp.dom.types.javalang.integers.persistence.WrapperIntegerEntity;
schema = "demo",
name = "WrapperIntegerJpa"
)
-@EntityListeners(IsisEntityListener.class)
+@EntityListeners(CausewayEntityListener.class)
@Named("demo.WrapperIntegerEntity")
@DomainObject
@NoArgsConstructor // <.>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/longs/jpa/WrapperLongJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/longs/jpa/WrapperLongJpa.java
index 00c09c4efb..2891095520 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/longs/jpa/WrapperLongJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/longs/jpa/WrapperLongJpa.java
@@ -34,7 +34,7 @@ import org.apache.causeway.applib.annotation.Optionality;
import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Title;
-import org.apache.causeway.persistence.jpa.applib.integration.IsisEntityListener;
+import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -50,7 +50,7 @@ import demoapp.dom.types.javalang.longs.persistence.WrapperLongEntity;
schema = "demo",
name = "WrapperLongJpa"
)
-@EntityListeners(IsisEntityListener.class)
+@EntityListeners(CausewayEntityListener.class)
@Named("demo.WrapperLongEntity")
@DomainObject
@NoArgsConstructor // <.>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/jpa/WrapperShortJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/jpa/WrapperShortJpa.java
index 9177e2eb12..0b62a45d7f 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/jpa/WrapperShortJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/jpa/WrapperShortJpa.java
@@ -34,7 +34,7 @@ import org.apache.causeway.applib.annotation.Optionality;
import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Title;
-import org.apache.causeway.persistence.jpa.applib.integration.IsisEntityListener;
+import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -50,7 +50,7 @@ import demoapp.dom.types.javalang.shorts.persistence.WrapperShortEntity;
schema = "demo",
name = "WrapperShortJpa"
)
-@EntityListeners(IsisEntityListener.class)
+@EntityListeners(CausewayEntityListener.class)
@Named("demo.WrapperShortEntity")
@DomainObject
@NoArgsConstructor // <.>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/strings/jpa/JavaLangStringJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/strings/jpa/JavaLangStringJpa.java
index 266265ca79..7866e5829a 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/strings/jpa/JavaLangStringJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/strings/jpa/JavaLangStringJpa.java
@@ -34,7 +34,7 @@ import org.apache.causeway.applib.annotation.Optionality;
import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Title;
-import org.apache.causeway.persistence.jpa.applib.integration.IsisEntityListener;
+import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -50,7 +50,7 @@ import demoapp.dom.types.javalang.strings.persistence.JavaLangStringEntity;
schema = "demo",
name = "JavaLangStringJpa"
)
-@EntityListeners(IsisEntityListener.class)
+@EntityListeners(CausewayEntityListener.class)
@Named("demo.JavaLangStringEntity")
@DomainObject
@NoArgsConstructor // <.>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/jpa/JavaMathBigDecimalJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/jpa/JavaMathBigDecimalJpa.java
index ecc43ba23b..18f599d7a7 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/jpa/JavaMathBigDecimalJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/jpa/JavaMathBigDecimalJpa.java
@@ -35,7 +35,7 @@ import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Title;
import org.apache.causeway.applib.annotation.ValueSemantics;
-import org.apache.causeway.persistence.jpa.applib.integration.IsisEntityListener;
+import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -50,7 +50,7 @@ import demoapp.dom.types.javamath.bigdecimals.persistence.JavaMathBigDecimalEnti
schema = "demo",
name = "JavaMathBigDecimalJpa"
)
-@EntityListeners(IsisEntityListener.class)
+@EntityListeners(CausewayEntityListener.class)
@Named("demo.JavaMathBigDecimalEntity")
@DomainObject
@NoArgsConstructor
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigintegers/jpa/JavaMathBigIntegerJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigintegers/jpa/JavaMathBigIntegerJpa.java
index 03a8c9aabe..81757a916f 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigintegers/jpa/JavaMathBigIntegerJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigintegers/jpa/JavaMathBigIntegerJpa.java
@@ -34,7 +34,7 @@ import org.apache.causeway.applib.annotation.Optionality;
import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Title;
-import org.apache.causeway.persistence.jpa.applib.integration.IsisEntityListener;
+import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -49,7 +49,7 @@ import demoapp.dom.types.javamath.bigintegers.persistence.JavaMathBigIntegerEnti
schema = "demo",
name = "JavaMathBigIntegerJpa"
)
-@EntityListeners(IsisEntityListener.class)
+@EntityListeners(CausewayEntityListener.class)
@Named("demo.JavaMathBigIntegerEntity")
@DomainObject
@NoArgsConstructor
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javanet/urls/jpa/JavaNetUrlJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javanet/urls/jpa/JavaNetUrlJpa.java
index 850f4feb09..89ca2fe30d 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javanet/urls/jpa/JavaNetUrlJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javanet/urls/jpa/JavaNetUrlJpa.java
@@ -34,7 +34,7 @@ import org.apache.causeway.applib.annotation.Optionality;
import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Title;
-import org.apache.causeway.persistence.jpa.applib.integration.IsisEntityListener;
+import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -49,7 +49,7 @@ import demoapp.dom.types.javanet.urls.persistence.JavaNetUrlEntity;
schema = "demo",
name = "JavaNetUrlJpa"
)
-@EntityListeners(IsisEntityListener.class)
+@EntityListeners(CausewayEntityListener.class)
@Named("demo.JavaNetUrlEntity")
@DomainObject
@NoArgsConstructor
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqldate/jpa/JavaSqlDateJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqldate/jpa/JavaSqlDateJpa.java
index 66d5c8979a..e76423cc28 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqldate/jpa/JavaSqlDateJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqldate/jpa/JavaSqlDateJpa.java
@@ -34,7 +34,7 @@ import org.apache.causeway.applib.annotation.Optionality;
import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Title;
-import org.apache.causeway.persistence.jpa.applib.integration.IsisEntityListener;
+import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -49,7 +49,7 @@ import demoapp.dom.types.javasql.javasqldate.persistence.JavaSqlDateEntity;
schema = "demo",
name = "JavaSqlDateJpa"
)
-@EntityListeners(IsisEntityListener.class)
+@EntityListeners(CausewayEntityListener.class)
@Named("demo.JavaSqlDateEntity")
@DomainObject
@NoArgsConstructor
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqltimestamp/jpa/JavaSqlTimestampJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqltimestamp/jpa/JavaSqlTimestampJpa.java
index b91a45cab3..28a36fd27a 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqltimestamp/jpa/JavaSqlTimestampJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqltimestamp/jpa/JavaSqlTimestampJpa.java
@@ -34,7 +34,7 @@ import org.apache.causeway.applib.annotation.Optionality;
import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Title;
-import org.apache.causeway.persistence.jpa.applib.integration.IsisEntityListener;
+import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -49,7 +49,7 @@ import demoapp.dom.types.javasql.javasqltimestamp.persistence.JavaSqlTimestampEn
schema = "demo",
name = "JavaSqlTimestampJpa"
)
-@EntityListeners(IsisEntityListener.class)
+@EntityListeners(CausewayEntityListener.class)
@Named("demo.JavaSqlTimestampEntity")
@DomainObject
@NoArgsConstructor
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldate/jpa/JavaTimeLocalDateJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldate/jpa/JavaTimeLocalDateJpa.java
index 6ac3f36cd7..e5885e9447 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldate/jpa/JavaTimeLocalDateJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldate/jpa/JavaTimeLocalDateJpa.java
@@ -34,7 +34,7 @@ import org.apache.causeway.applib.annotation.Optionality;
import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Title;
-import org.apache.causeway.persistence.jpa.applib.integration.IsisEntityListener;
+import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -49,7 +49,7 @@ import demoapp.dom.types.javatime.javatimelocaldate.persistence.JavaTimeLocalDat
schema = "demo",
name = "JavaTimeLocalDateJpa"
)
-@EntityListeners(IsisEntityListener.class)
+@EntityListeners(CausewayEntityListener.class)
@Named("demo.JavaTimeLocalDateEntity")
@DomainObject
@NoArgsConstructor
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldatetime/jpa/JavaTimeLocalDateTimeJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldatetime/jpa/JavaTimeLocalDateTimeJpa.java
index 8a9dc4cf77..a9e494081e 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldatetime/jpa/JavaTimeLocalDateTimeJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldatetime/jpa/JavaTimeLocalDateTimeJpa.java
@@ -34,7 +34,7 @@ import org.apache.causeway.applib.annotation.Optionality;
import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Title;
-import org.apache.causeway.persistence.jpa.applib.integration.IsisEntityListener;
+import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -49,7 +49,7 @@ import demoapp.dom.types.javatime.javatimelocaldatetime.persistence.JavaTimeLoca
schema = "demo",
name = "JavaTimeLocalDateTimeJpa"
)
-@EntityListeners(IsisEntityListener.class)
+@EntityListeners(CausewayEntityListener.class)
@Named("demo.JavaTimeLocalDateTimeEntity")
@DomainObject
@NoArgsConstructor
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaltime/jpa/JavaTimeLocalTimeJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaltime/jpa/JavaTimeLocalTimeJpa.java
index b554256c53..8dd6ea072b 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaltime/jpa/JavaTimeLocalTimeJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaltime/jpa/JavaTimeLocalTimeJpa.java
@@ -34,7 +34,7 @@ import org.apache.causeway.applib.annotation.Optionality;
import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Title;
-import org.apache.causeway.persistence.jpa.applib.integration.IsisEntityListener;
+import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -49,7 +49,7 @@ import demoapp.dom.types.javatime.javatimelocaltime.persistence.JavaTimeLocalTim
schema = "demo",
name = "JavaTimeLocalTimeJpa"
)
-@EntityListeners(IsisEntityListener.class)
+@EntityListeners(CausewayEntityListener.class)
@Named("demo.JavaTimeLocalTimeEntity")
@DomainObject
@NoArgsConstructor
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsetdatetime/jpa/JavaTimeOffsetDateTimeJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsetdatetime/jpa/JavaTimeOffsetDateTimeJpa.java
index 42bbdd6abc..68d05b2069 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsetdatetime/jpa/JavaTimeOffsetDateTimeJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsetdatetime/jpa/JavaTimeOffsetDateTimeJpa.java
@@ -34,7 +34,7 @@ import org.apache.causeway.applib.annotation.Optionality;
import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Title;
-import org.apache.causeway.persistence.jpa.applib.integration.IsisEntityListener;
+import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -49,7 +49,7 @@ import demoapp.dom.types.javatime.javatimeoffsetdatetime.persistence.JavaTimeOff
schema = "demo",
name = "JavaTimeOffsetDateTimeJpa"
)
-@EntityListeners(IsisEntityListener.class)
+@EntityListeners(CausewayEntityListener.class)
@Named("demo.JavaTimeOffsetDateTimeEntity")
@DomainObject
@NoArgsConstructor
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsettime/jpa/JavaTimeOffsetTimeJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsettime/jpa/JavaTimeOffsetTimeJpa.java
index ee9d0d2267..602be32e94 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsettime/jpa/JavaTimeOffsetTimeJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsettime/jpa/JavaTimeOffsetTimeJpa.java
@@ -34,7 +34,7 @@ import org.apache.causeway.applib.annotation.Optionality;
import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Title;
-import org.apache.causeway.persistence.jpa.applib.integration.IsisEntityListener;
+import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -49,7 +49,7 @@ import demoapp.dom.types.javatime.javatimeoffsettime.persistence.JavaTimeOffsetT
schema = "demo",
name = "JavaTimeOffsetTimeJpa"
)
-@EntityListeners(IsisEntityListener.class)
+@EntityListeners(CausewayEntityListener.class)
@Named("demo.JavaTimeOffsetTimeEntity")
@DomainObject
@NoArgsConstructor
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimezoneddatetime/jpa/JavaTimeZonedDateTimeJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimezoneddatetime/jpa/JavaTimeZonedDateTimeJpa.java
index a90f6d7bb9..85cfa75d22 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimezoneddatetime/jpa/JavaTimeZonedDateTimeJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimezoneddatetime/jpa/JavaTimeZonedDateTimeJpa.java
@@ -36,7 +36,7 @@ import org.apache.causeway.applib.annotation.Optionality;
import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Title;
-import org.apache.causeway.persistence.jpa.applib.integration.IsisEntityListener;
+import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -51,7 +51,7 @@ import demoapp.dom.types.javatime.javatimezoneddatetime.persistence.JavaTimeZone
schema = "demo",
name = "JavaTimeZonedDateTimeJpa"
)
-@EntityListeners(IsisEntityListener.class)
+@EntityListeners(CausewayEntityListener.class)
@Named("demo.JavaTimeZonedDateTimeEntity")
@DomainObject
@NoArgsConstructor
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/javautildate/jpa/JavaUtilDateJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/javautildate/jpa/JavaUtilDateJpa.java
index 6b654a05f0..985cee6518 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/javautildate/jpa/JavaUtilDateJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/javautildate/jpa/JavaUtilDateJpa.java
@@ -34,7 +34,7 @@ import org.apache.causeway.applib.annotation.Optionality;
import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Title;
-import org.apache.causeway.persistence.jpa.applib.integration.IsisEntityListener;
+import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -49,7 +49,7 @@ import demoapp.dom.types.javautil.javautildate.persistence.JavaUtilDateEntity;
schema = "demo",
name = "JavaUtilDateJpa"
)
-@EntityListeners(IsisEntityListener.class)
+@EntityListeners(CausewayEntityListener.class)
@Named("demo.JavaUtilDateEntity")
@DomainObject
@NoArgsConstructor
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/jpa/JavaUtilUuidJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/jpa/JavaUtilUuidJpa.java
index 51015e38ec..335b292116 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/jpa/JavaUtilUuidJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/jpa/JavaUtilUuidJpa.java
@@ -34,7 +34,7 @@ import org.apache.causeway.applib.annotation.Optionality;
import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Title;
-import org.apache.causeway.persistence.jpa.applib.integration.IsisEntityListener;
+import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -50,7 +50,7 @@ import demoapp.dom.types.javautil.uuids.persistence.JavaUtilUuidEntity;
schema = "demo",
name = "JavaUtilUuidJpa"
)
-@EntityListeners(IsisEntityListener.class)
+@EntityListeners(CausewayEntityListener.class)
@Named("demo.JavaUtilUuidEntity")
@DomainObject
@NoArgsConstructor // <.>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/booleans/jpa/PrimitiveBooleanJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/booleans/jpa/PrimitiveBooleanJpa.java
index 8466fc1248..59cc31e918 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/booleans/jpa/PrimitiveBooleanJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/booleans/jpa/PrimitiveBooleanJpa.java
@@ -32,7 +32,7 @@ import org.apache.causeway.applib.annotation.Editing;
import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Title;
-import org.apache.causeway.persistence.jpa.applib.integration.IsisEntityListener;
+import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -48,7 +48,7 @@ import demoapp.dom.types.primitive.booleans.persistence.PrimitiveBooleanEntity;
schema = "demo",
name = "PrimitiveBooleanJpa"
)
-@EntityListeners(IsisEntityListener.class)
+@EntityListeners(CausewayEntityListener.class)
@Named("demo.PrimitiveBooleanEntity")
@DomainObject
@NoArgsConstructor // <.>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/bytes/jpa/PrimitiveByteJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/bytes/jpa/PrimitiveByteJpa.java
index c152ddb42e..038f8b2c40 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/bytes/jpa/PrimitiveByteJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/bytes/jpa/PrimitiveByteJpa.java
@@ -32,7 +32,7 @@ import org.apache.causeway.applib.annotation.Editing;
import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Title;
-import org.apache.causeway.persistence.jpa.applib.integration.IsisEntityListener;
+import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -48,7 +48,7 @@ import demoapp.dom.types.primitive.bytes.persistence.PrimitiveByteEntity;
schema = "demo",
name = "PrimitiveByteJpa"
)
-@EntityListeners(IsisEntityListener.class)
+@EntityListeners(CausewayEntityListener.class)
@Named("demo.PrimitiveByteEntity")
@DomainObject
@NoArgsConstructor // <.>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/jpa/PrimitiveCharJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/jpa/PrimitiveCharJpa.java
index a24ab69c67..5503833112 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/jpa/PrimitiveCharJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/jpa/PrimitiveCharJpa.java
@@ -32,7 +32,7 @@ import org.apache.causeway.applib.annotation.Editing;
import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Title;
-import org.apache.causeway.persistence.jpa.applib.integration.IsisEntityListener;
+import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -48,7 +48,7 @@ import demoapp.dom.types.primitive.chars.persistence.PrimitiveCharEntity;
schema = "demo",
name = "PrimitiveCharJpa"
)
-@EntityListeners(IsisEntityListener.class)
+@EntityListeners(CausewayEntityListener.class)
@Named("demo.PrimitiveCharEntity")
@DomainObject
@NoArgsConstructor // <.>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/doubles/jpa/PrimitiveDoubleJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/doubles/jpa/PrimitiveDoubleJpa.java
index 27bf9bd8a9..e97060996d 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/doubles/jpa/PrimitiveDoubleJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/doubles/jpa/PrimitiveDoubleJpa.java
@@ -32,7 +32,7 @@ import org.apache.causeway.applib.annotation.Editing;
import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Title;
-import org.apache.causeway.persistence.jpa.applib.integration.IsisEntityListener;
+import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -48,7 +48,7 @@ import demoapp.dom.types.primitive.doubles.persistence.PrimitiveDoubleEntity;
schema = "demo",
name = "PrimitiveDoubleJpa"
)
-@EntityListeners(IsisEntityListener.class)
+@EntityListeners(CausewayEntityListener.class)
@Named("demo.PrimitiveDoubleEntity")
@DomainObject
@NoArgsConstructor // <.>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/floats/jpa/PrimitiveFloatJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/floats/jpa/PrimitiveFloatJpa.java
index c32fde63f7..3d3c787203 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/floats/jpa/PrimitiveFloatJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/floats/jpa/PrimitiveFloatJpa.java
@@ -32,7 +32,7 @@ import org.apache.causeway.applib.annotation.Editing;
import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Title;
-import org.apache.causeway.persistence.jpa.applib.integration.IsisEntityListener;
+import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -48,7 +48,7 @@ import demoapp.dom.types.primitive.floats.persistence.PrimitiveFloatEntity;
schema = "demo",
name = "PrimitiveFloatJpa"
)
-@EntityListeners(IsisEntityListener.class)
+@EntityListeners(CausewayEntityListener.class)
@Named("demo.PrimitiveFloatEntity")
@DomainObject
@NoArgsConstructor // <.>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/ints/jpa/PrimitiveIntJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/ints/jpa/PrimitiveIntJpa.java
index 7b92b4b016..e4d35a7592 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/ints/jpa/PrimitiveIntJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/ints/jpa/PrimitiveIntJpa.java
@@ -32,7 +32,7 @@ import org.apache.causeway.applib.annotation.Editing;
import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Title;
-import org.apache.causeway.persistence.jpa.applib.integration.IsisEntityListener;
+import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -48,7 +48,7 @@ import demoapp.dom.types.primitive.ints.persistence.PrimitiveIntEntity;
schema = "demo",
name = "PrimitiveIntJpa"
)
-@EntityListeners(IsisEntityListener.class)
+@EntityListeners(CausewayEntityListener.class)
@Named("demo.PrimitiveIntEntity")
@DomainObject
@NoArgsConstructor // <.>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/longs/jpa/PrimitiveLongJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/longs/jpa/PrimitiveLongJpa.java
index 576d5eab28..ba299c98cc 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/longs/jpa/PrimitiveLongJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/longs/jpa/PrimitiveLongJpa.java
@@ -32,7 +32,7 @@ import org.apache.causeway.applib.annotation.Editing;
import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Title;
-import org.apache.causeway.persistence.jpa.applib.integration.IsisEntityListener;
+import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -48,7 +48,7 @@ import demoapp.dom.types.primitive.longs.persistence.PrimitiveLongEntity;
schema = "demo",
name = "PrimitiveLongJpa"
)
-@EntityListeners(IsisEntityListener.class)
+@EntityListeners(CausewayEntityListener.class)
@Named("demo.PrimitiveLongEntity")
@DomainObject
@NoArgsConstructor // <.>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/shorts/jpa/PrimitiveShortJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/shorts/jpa/PrimitiveShortJpa.java
index 625a81dacd..70f6d8fb53 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/shorts/jpa/PrimitiveShortJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/shorts/jpa/PrimitiveShortJpa.java
@@ -32,7 +32,7 @@ import org.apache.causeway.applib.annotation.Editing;
import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Title;
-import org.apache.causeway.persistence.jpa.applib.integration.IsisEntityListener;
+import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -48,7 +48,7 @@ import demoapp.dom.types.primitive.shorts.persistence.PrimitiveShortEntity;
schema = "demo",
name = "PrimitiveShortJpa"
)
-@EntityListeners(IsisEntityListener.class)
+@EntityListeners(CausewayEntityListener.class)
@Named("demo.PrimitiveShortEntity")
@DomainObject
@NoArgsConstructor // <.>
diff --git a/examples/demo/domain/src/main/resources/shiro.ini b/examples/demo/domain/src/main/resources/shiro.ini
index c9b617ea3d..a459c736a9 100644
--- a/examples/demo/domain/src/main/resources/shiro.ini
+++ b/examples/demo/domain/src/main/resources/shiro.ini
@@ -19,11 +19,11 @@
[main]
-authenticationStrategy=org.apache.isis.extensions.secman.delegated.shiro.realm.AuthenticationStrategyForSecMan
-isisModuleSecurityRealm=org.apache.isis.extensions.secman.delegated.shiro.realm.IsisModuleExtSecmanShiroRealm
+authenticationStrategy=org.apache.causeway.extensions.secman.delegated.shiro.realm.AuthenticationStrategyForSecMan
+causewayModuleSecurityRealm=org.apache.causeway.extensions.secman.delegated.shiro.realm.CausewayModuleExtSecmanShiroRealm
securityManager.authenticator.authenticationStrategy = $authenticationStrategy
-securityManager.realms = $isisModuleSecurityRealm
+securityManager.realms = $causewayModuleSecurityRealm
[users]
[roles]
diff --git a/examples/demo/javafx/src/main/java/demoapp/javafx/DemoAppJavaFx.java b/examples/demo/javafx/src/main/java/demoapp/javafx/DemoAppJavaFx.java
index e49d0f6277..61c0960038 100644
--- a/examples/demo/javafx/src/main/java/demoapp/javafx/DemoAppJavaFx.java
+++ b/examples/demo/javafx/src/main/java/demoapp/javafx/DemoAppJavaFx.java
@@ -19,7 +19,7 @@
package demoapp.javafx;
import org.apache.causeway.commons.internal.debug._Probe;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.core.runtimeservices.session.InteractionServiceDefault;
import org.apache.causeway.incubator.viewer.javafx.model.events.JavaFxViewerConfig;
import org.apache.causeway.incubator.viewer.javafx.model.util._fx;
@@ -58,10 +58,10 @@ public class DemoAppJavaFx {
public static void main(final String[] args) {
- IsisPresets.logging(InteractionServiceDefault.class, "debug");
- IsisPresets.logging(_Probe.class, "debug"); // enable debug entry logging
+ CausewayPresets.logging(InteractionServiceDefault.class, "debug");
+ CausewayPresets.logging(_Probe.class, "debug"); // enable debug entry logging
- IsisPresets.prototyping(); // use prototyping mode as default, unless explicitly overridden (INCUBATING)
+ CausewayPresets.prototyping(); // use prototyping mode as default, unless explicitly overridden (INCUBATING)
System.setProperty("spring.profiles.active", "demo-jpa");
JavafxViewer.launch(DemoAppJavaFx.class, args);
diff --git a/examples/demo/javafx/src/test/java/demoapp/javafx/integtest/DemoFxTestConfig_usingJdo.java b/examples/demo/javafx/src/test/java/demoapp/javafx/integtest/DemoFxTestConfig_usingJdo.java
index 47d32c7ac2..eff10a8d8d 100644
--- a/examples/demo/javafx/src/test/java/demoapp/javafx/integtest/DemoFxTestConfig_usingJdo.java
+++ b/examples/demo/javafx/src/test/java/demoapp/javafx/integtest/DemoFxTestConfig_usingJdo.java
@@ -20,7 +20,7 @@ package demoapp.javafx.integtest;
import javax.sql.DataSource;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.incubator.viewer.javafx.model.events.JavaFxViewerConfig;
import org.datanucleus.store.rdbms.datasource.dbcp2.BasicDataSource;
import org.springframework.boot.jdbc.DataSourceBuilder;
@@ -36,8 +36,8 @@ import javafx.application.HostServices;
@Configuration
@PropertySources({
- @PropertySource(IsisPresets.DatanucleusAutocreateNoValidate),
- @PropertySource(IsisPresets.H2InMemory_withUniqueSchema)
+ @PropertySource(CausewayPresets.DatanucleusAutocreateNoValidate),
+ @PropertySource(CausewayPresets.H2InMemory_withUniqueSchema)
})
public class DemoFxTestConfig_usingJdo {
diff --git a/examples/demo/web/src/main/java/demoapp/web/linebreaker/LineBreaker.java b/examples/demo/web/src/main/java/demoapp/web/linebreaker/LineBreaker.java
index e5f5910732..c8b0fafa8a 100644
--- a/examples/demo/web/src/main/java/demoapp/web/linebreaker/LineBreaker.java
+++ b/examples/demo/web/src/main/java/demoapp/web/linebreaker/LineBreaker.java
@@ -27,7 +27,7 @@ import org.apache.causeway.applib.annotation.NatureOfService;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.applib.annotation.SemanticsOf;
import org.apache.causeway.applib.services.iactnlayer.InteractionLayerTracker;
-import org.apache.causeway.core.interaction.session.IsisInteraction;
+import org.apache.causeway.core.interaction.session.CausewayInteraction;
import lombok.RequiredArgsConstructor;
import lombok.extern.log4j.Log4j2;
@@ -54,7 +54,7 @@ public class LineBreaker {
// allow for current interaction to complete gracefully
iInteractionLayerTracker.currentInteraction()
- .map(IsisInteraction.class::cast)
+ .map(CausewayInteraction.class::cast)
.ifPresent(interaction->{
interaction.setOnClose(()->System.exit(0));
});
diff --git a/examples/demo/wicket/jdo/src/main/java/demoapp/webapp/wicket/jdo/DemoAppWicketJdo.java b/examples/demo/wicket/jdo/src/main/java/demoapp/webapp/wicket/jdo/DemoAppWicketJdo.java
index 5dcd4bb8fe..b3413b0f2c 100644
--- a/examples/demo/wicket/jdo/src/main/java/demoapp/webapp/wicket/jdo/DemoAppWicketJdo.java
+++ b/examples/demo/wicket/jdo/src/main/java/demoapp/webapp/wicket/jdo/DemoAppWicketJdo.java
@@ -24,7 +24,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
import org.springframework.context.annotation.Import;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.core.config.util.SpringProfileUtil;
import org.apache.causeway.extensions.commandlog.applib.CausewayModuleExtCommandLogApplib;
import org.apache.causeway.extensions.pdfjs.wkt.ui.CausewayModuleExtPdfjsWicketUi;
@@ -89,7 +89,7 @@ public class DemoAppWicketJdo extends SpringBootServletInitializer {
// activates when sys-env THERE_CAN_BE_ONLY_ONE=true
_OsUtil.thereCanBeOnlyOne();
- IsisPresets.prototyping();
+ CausewayPresets.prototyping();
//IsisPresets.logging(WebRequestCycleForIsis.class, "debug");
SpringProfileUtil.removeActiveProfile("demo-jpa"); // just in case
diff --git a/examples/demo/wicket/jpa-and-graphql/src/main/java/demoapp/webapp/wicket/jpa/DemoAppWicketJpa.java b/examples/demo/wicket/jpa-and-graphql/src/main/java/demoapp/webapp/wicket/jpa/DemoAppWicketJpa.java
index 3dd00c23cc..b67c9dbdac 100644
--- a/examples/demo/wicket/jpa-and-graphql/src/main/java/demoapp/webapp/wicket/jpa/DemoAppWicketJpa.java
+++ b/examples/demo/wicket/jpa-and-graphql/src/main/java/demoapp/webapp/wicket/jpa/DemoAppWicketJpa.java
@@ -24,7 +24,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
import org.springframework.context.annotation.Import;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.core.config.util.SpringProfileUtil;
import org.apache.causeway.extensions.commandlog.applib.CausewayModuleExtCommandLogApplib;
import org.apache.causeway.extensions.pdfjs.wkt.ui.CausewayModuleExtPdfjsWicketUi;
@@ -93,7 +93,7 @@ public class DemoAppWicketJpa extends SpringBootServletInitializer {
// activates when sys-env THERE_CAN_BE_ONLY_ONE=true
_OsUtil.thereCanBeOnlyOne();
- IsisPresets.prototyping();
+ CausewayPresets.prototyping();
//IsisPresets.logging(WebRequestCycleForIsis.class, "debug");
//IsisPresets.logging(ComponentFactoryRegistryDefault.class, "debug");
//IsisPresets.logging(EntityModel.class, "debug");
diff --git a/examples/demo/wicket/jpa/src/main/java/demoapp/webapp/wicket/jpa/DemoAppWicketJpa.java b/examples/demo/wicket/jpa/src/main/java/demoapp/webapp/wicket/jpa/DemoAppWicketJpa.java
index 1df5681619..c5e7f054f7 100644
--- a/examples/demo/wicket/jpa/src/main/java/demoapp/webapp/wicket/jpa/DemoAppWicketJpa.java
+++ b/examples/demo/wicket/jpa/src/main/java/demoapp/webapp/wicket/jpa/DemoAppWicketJpa.java
@@ -24,7 +24,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
import org.springframework.context.annotation.Import;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.core.config.util.SpringProfileUtil;
import org.apache.causeway.extensions.commandlog.applib.CausewayModuleExtCommandLogApplib;
import org.apache.causeway.extensions.pdfjs.wkt.ui.CausewayModuleExtPdfjsWicketUi;
@@ -90,7 +90,7 @@ public class DemoAppWicketJpa extends SpringBootServletInitializer {
// activates when sys-env THERE_CAN_BE_ONLY_ONE=true
_OsUtil.thereCanBeOnlyOne();
- IsisPresets.prototyping();
+ CausewayPresets.prototyping();
//IsisPresets.logging(WebRequestCycleForIsis.class, "debug");
//IsisPresets.logging(ComponentFactoryRegistryDefault.class, "debug");
//IsisPresets.logging(EntityModel.class, "debug");
diff --git a/extensions/core/commandlog/applib/src/test/java/org/apache/causeway/extensions/commandlog/applib/integtest/CommandLog_IntegTestAbstract.java b/extensions/core/commandlog/applib/src/test/java/org/apache/causeway/extensions/commandlog/applib/integtest/CommandLog_IntegTestAbstract.java
index 427df3b9b1..24fd0c3dd8 100644
--- a/extensions/core/commandlog/applib/src/test/java/org/apache/causeway/extensions/commandlog/applib/integtest/CommandLog_IntegTestAbstract.java
+++ b/extensions/core/commandlog/applib/src/test/java/org/apache/causeway/extensions/commandlog/applib/integtest/CommandLog_IntegTestAbstract.java
@@ -35,8 +35,8 @@ import org.apache.causeway.applib.services.iactnlayer.InteractionService;
import org.apache.causeway.applib.services.sudo.SudoService;
import org.apache.causeway.applib.services.user.UserMemento;
import org.apache.causeway.applib.services.wrapper.WrapperFactory;
-import org.apache.causeway.core.config.beans.IsisBeanTypeRegistry;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.beans.CausewayBeanTypeRegistry;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.extensions.commandlog.applib.dom.CommandLogEntry;
import org.apache.causeway.extensions.commandlog.applib.dom.CommandLogEntryRepository;
import org.apache.causeway.extensions.commandlog.applib.dom.ReplayState;
@@ -62,7 +62,7 @@ public abstract class CommandLog_IntegTestAbstract extends IsisIntegrationTestAb
@BeforeAll
static void beforeAll() {
- IsisPresets.forcePrototyping();
+ CausewayPresets.forcePrototyping();
}
Counter counter1;
@@ -481,6 +481,6 @@ public abstract class CommandLog_IntegTestAbstract extends IsisIntegrationTestAb
@Inject CounterRepository counterRepository;
@Inject WrapperFactory wrapperFactory;
@Inject BookmarkService bookmarkService;
- @Inject IsisBeanTypeRegistry isisBeanTypeRegistry;
+ @Inject CausewayBeanTypeRegistry isisBeanTypeRegistry;
}
diff --git a/extensions/core/commandlog/persistence-jdo/src/test/java/org/apache/causeway/extensions/commandlog/jdo/integtests/CommandLog_IntegTest.java b/extensions/core/commandlog/persistence-jdo/src/test/java/org/apache/causeway/extensions/commandlog/jdo/integtests/CommandLog_IntegTest.java
index 00b6c33946..848cfa8abc 100644
--- a/extensions/core/commandlog/persistence-jdo/src/test/java/org/apache/causeway/extensions/commandlog/jdo/integtests/CommandLog_IntegTest.java
+++ b/extensions/core/commandlog/persistence-jdo/src/test/java/org/apache/causeway/extensions/commandlog/jdo/integtests/CommandLog_IntegTest.java
@@ -27,7 +27,7 @@ import org.springframework.context.annotation.PropertySource;
import org.springframework.context.annotation.PropertySources;
import org.springframework.test.context.ActiveProfiles;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.extensions.commandlog.applib.integtest.CommandLog_IntegTestAbstract;
import org.apache.causeway.extensions.commandlog.applib.integtest.model.CommandLogTestDomainModel;
import org.apache.causeway.extensions.commandlog.jdo.CausewayModuleExtCommandLogPersistenceJdo;
@@ -52,7 +52,7 @@ public class CommandLog_IntegTest extends CommandLog_IntegTestAbstract {
CausewayModuleExtCommandLogPersistenceJdo.class,
})
@PropertySources({
- @PropertySource(IsisPresets.UseLog4j2Test)
+ @PropertySource(CausewayPresets.UseLog4j2Test)
})
@ComponentScan(basePackageClasses = {AppManifest.class, CommandLogTestDomainModel.class, CounterRepository.class})
public static class AppManifest {
diff --git a/extensions/core/commandlog/persistence-jpa/src/main/java/org/apache/causeway/extensions/commandlog/jpa/dom/CommandLogEntry.java b/extensions/core/commandlog/persistence-jpa/src/main/java/org/apache/causeway/extensions/commandlog/jpa/dom/CommandLogEntry.java
index c94b468b65..5488131f1a 100644
--- a/extensions/core/commandlog/persistence-jpa/src/main/java/org/apache/causeway/extensions/commandlog/jpa/dom/CommandLogEntry.java
+++ b/extensions/core/commandlog/persistence-jpa/src/main/java/org/apache/causeway/extensions/commandlog/jpa/dom/CommandLogEntry.java
@@ -46,7 +46,7 @@ import org.apache.causeway.applib.annotation.Editing;
import org.apache.causeway.applib.annotation.Publishing;
import org.apache.causeway.applib.jaxb.PersistentEntityAdapter;
import org.apache.causeway.applib.services.bookmark.Bookmark;
-import org.apache.causeway.persistence.jpa.applib.integration.IsisEntityListener;
+import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
import org.apache.causeway.persistence.jpa.integration.typeconverters.applib.IsisBookmarkConverter;
import org.apache.causeway.persistence.jpa.integration.typeconverters.schema.v2.IsisCommandDtoConverter;
import org.apache.causeway.schema.cmd.v2.CommandDto;
@@ -211,7 +211,7 @@ import lombok.Setter;
entityChangePublishing = Publishing.DISABLED
)
@XmlJavaTypeAdapter(PersistentEntityAdapter.class)
-@EntityListeners(IsisEntityListener.class)
+@EntityListeners(CausewayEntityListener.class)
@NoArgsConstructor
public class CommandLogEntry extends org.apache.causeway.extensions.commandlog.applib.dom.CommandLogEntry {
diff --git a/extensions/core/commandlog/persistence-jpa/src/test/java/org/apache/causeway/extensions/commandlog/jpa/integtests/CommandLog_IntegTest.java b/extensions/core/commandlog/persistence-jpa/src/test/java/org/apache/causeway/extensions/commandlog/jpa/integtests/CommandLog_IntegTest.java
index 3648216818..ec05abfa9d 100644
--- a/extensions/core/commandlog/persistence-jpa/src/test/java/org/apache/causeway/extensions/commandlog/jpa/integtests/CommandLog_IntegTest.java
+++ b/extensions/core/commandlog/persistence-jpa/src/test/java/org/apache/causeway/extensions/commandlog/jpa/integtests/CommandLog_IntegTest.java
@@ -28,7 +28,7 @@ import org.springframework.context.annotation.PropertySource;
import org.springframework.context.annotation.PropertySources;
import org.springframework.test.context.ActiveProfiles;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.extensions.commandlog.applib.integtest.CommandLog_IntegTestAbstract;
import org.apache.causeway.extensions.commandlog.applib.integtest.model.CommandLogTestDomainModel;
import org.apache.causeway.extensions.commandlog.jpa.CausewayModuleExtCommandLogPersistenceJpa;
@@ -52,7 +52,7 @@ public class CommandLog_IntegTest extends CommandLog_IntegTestAbstract {
CausewayModuleExtCommandLogPersistenceJpa.class,
})
@PropertySources({
- @PropertySource(IsisPresets.UseLog4j2Test)
+ @PropertySource(CausewayPresets.UseLog4j2Test)
})
@EntityScan(basePackageClasses = {Counter.class})
@ComponentScan(basePackageClasses = {AppManifest.class, CommandLogTestDomainModel.class})
diff --git a/extensions/core/excel/integtests/src/test/java/org/apache/causeway/extensions/excel/integtests/ExcelModuleIntegTestAbstract.java b/extensions/core/excel/integtests/src/test/java/org/apache/causeway/extensions/excel/integtests/ExcelModuleIntegTestAbstract.java
index 4b0af261b1..95d7ad7c35 100644
--- a/extensions/core/excel/integtests/src/test/java/org/apache/causeway/extensions/excel/integtests/ExcelModuleIntegTestAbstract.java
+++ b/extensions/core/excel/integtests/src/test/java/org/apache/causeway/extensions/excel/integtests/ExcelModuleIntegTestAbstract.java
@@ -27,7 +27,7 @@ import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.TestPropertySource;
import org.springframework.transaction.annotation.Transactional;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.extensions.excel.fixtures.CausewayModuleExtExcelFixtures;
import org.apache.causeway.core.runtimeservices.CausewayModuleCoreRuntimeServices;
@@ -40,15 +40,15 @@ import org.apache.causeway.testing.fixtures.applib.CausewayModuleTestingFixtures
@SpringBootTest(
classes = ExcelModuleIntegTestAbstract.AppManifest.class
)
-@TestPropertySource(IsisPresets.UseLog4j2Test)
+@TestPropertySource(CausewayPresets.UseLog4j2Test)
@ContextConfiguration
@Transactional
public abstract class ExcelModuleIntegTestAbstract extends IsisIntegrationTestAbstractWithFixtures {
@Configuration
@PropertySources({
- @PropertySource(IsisPresets.NoTranslations),
- @PropertySource(IsisPresets.DatanucleusAutocreateNoValidate),
+ @PropertySource(CausewayPresets.NoTranslations),
+ @PropertySource(CausewayPresets.DatanucleusAutocreateNoValidate),
})
@Import({
CausewayModuleCoreRuntimeServices.class,
diff --git a/extensions/core/executionlog/applib/src/test/java/org/apache/causeway/extensions/executionlog/applib/integtest/ExecutionLog_IntegTestAbstract.java b/extensions/core/executionlog/applib/src/test/java/org/apache/causeway/extensions/executionlog/applib/integtest/ExecutionLog_IntegTestAbstract.java
index 6ed7184690..a7ee6bc825 100644
--- a/extensions/core/executionlog/applib/src/test/java/org/apache/causeway/extensions/executionlog/applib/integtest/ExecutionLog_IntegTestAbstract.java
+++ b/extensions/core/executionlog/applib/src/test/java/org/apache/causeway/extensions/executionlog/applib/integtest/ExecutionLog_IntegTestAbstract.java
@@ -42,7 +42,7 @@ import org.apache.causeway.applib.services.iactnlayer.InteractionService;
import org.apache.causeway.applib.services.sudo.SudoService;
import org.apache.causeway.applib.services.user.UserMemento;
import org.apache.causeway.applib.services.wrapper.WrapperFactory;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.extensions.executionlog.applib.dom.ExecutionLogEntry;
import org.apache.causeway.extensions.executionlog.applib.dom.ExecutionLogEntryRepository;
import org.apache.causeway.extensions.executionlog.applib.integtest.model.Counter;
@@ -60,7 +60,7 @@ public abstract class ExecutionLog_IntegTestAbstract extends IsisIntegrationTest
@BeforeAll
static void beforeAll() {
- IsisPresets.forcePrototyping();
+ CausewayPresets.forcePrototyping();
}
Counter counter1;
diff --git a/extensions/core/executionlog/persistence-jdo/src/test/java/org/apache/causeway/extensions/executionlog/jdo/integtests/ExecutionLog_IntegTest.java b/extensions/core/executionlog/persistence-jdo/src/test/java/org/apache/causeway/extensions/executionlog/jdo/integtests/ExecutionLog_IntegTest.java
index 299e6208a1..03c9089513 100644
--- a/extensions/core/executionlog/persistence-jdo/src/test/java/org/apache/causeway/extensions/executionlog/jdo/integtests/ExecutionLog_IntegTest.java
+++ b/extensions/core/executionlog/persistence-jdo/src/test/java/org/apache/causeway/extensions/executionlog/jdo/integtests/ExecutionLog_IntegTest.java
@@ -27,7 +27,7 @@ import org.springframework.context.annotation.PropertySource;
import org.springframework.context.annotation.PropertySources;
import org.springframework.test.context.ActiveProfiles;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.extensions.executionlog.applib.integtest.ExecutionLog_IntegTestAbstract;
import org.apache.causeway.extensions.executionlog.applib.integtest.model.ExecutionLogTestDomainModel;
import org.apache.causeway.extensions.executionlog.jdo.CausewayModuleExtExecutionLogPersistenceJdo;
@@ -50,7 +50,7 @@ public class ExecutionLog_IntegTest extends ExecutionLog_IntegTestAbstract {
CausewayModuleExtExecutionLogPersistenceJdo.class,
})
@PropertySources({
- @PropertySource(IsisPresets.UseLog4j2Test)
+ @PropertySource(CausewayPresets.UseLog4j2Test)
})
@ComponentScan(basePackageClasses = {AppManifest.class, ExecutionLogTestDomainModel.class})
public static class AppManifest {
diff --git a/extensions/core/executionlog/persistence-jpa/src/main/java/org/apache/causeway/extensions/executionlog/jpa/dom/ExecutionLogEntry.java b/extensions/core/executionlog/persistence-jpa/src/main/java/org/apache/causeway/extensions/executionlog/jpa/dom/ExecutionLogEntry.java
index 9ad09731e6..6c66c3d1bd 100644
--- a/extensions/core/executionlog/persistence-jpa/src/main/java/org/apache/causeway/extensions/executionlog/jpa/dom/ExecutionLogEntry.java
+++ b/extensions/core/executionlog/persistence-jpa/src/main/java/org/apache/causeway/extensions/executionlog/jpa/dom/ExecutionLogEntry.java
@@ -45,7 +45,7 @@ import org.apache.causeway.applib.jaxb.PersistentEntityAdapter;
import org.apache.causeway.applib.services.bookmark.Bookmark;
import org.apache.causeway.extensions.executionlog.applib.dom.ExecutionLogEntryType;
import org.apache.causeway.extensions.executionlog.applib.dom.ExecutionLogEntry.Nq;
-import org.apache.causeway.persistence.jpa.applib.integration.IsisEntityListener;
+import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
import org.apache.causeway.persistence.jpa.integration.typeconverters.applib.IsisBookmarkConverter;
import org.apache.causeway.persistence.jpa.integration.typeconverters.schema.v2.IsisInteractionDtoConverter;
import org.apache.causeway.schema.ixn.v2.InteractionDto;
@@ -152,7 +152,7 @@ import lombok.Setter;
entityChangePublishing = Publishing.DISABLED
)
@XmlJavaTypeAdapter(PersistentEntityAdapter.class)
-@EntityListeners(IsisEntityListener.class)
+@EntityListeners(CausewayEntityListener.class)
public class ExecutionLogEntry extends org.apache.causeway.extensions.executionlog.applib.dom.ExecutionLogEntry {
diff --git a/extensions/core/executionlog/persistence-jpa/src/test/java/org/apache/causeway/extensions/executionlog/jpa/integtests/ExecutionLog_IntegTest.java b/extensions/core/executionlog/persistence-jpa/src/test/java/org/apache/causeway/extensions/executionlog/jpa/integtests/ExecutionLog_IntegTest.java
index ff17bee437..dc02a2f210 100644
--- a/extensions/core/executionlog/persistence-jpa/src/test/java/org/apache/causeway/extensions/executionlog/jpa/integtests/ExecutionLog_IntegTest.java
+++ b/extensions/core/executionlog/persistence-jpa/src/test/java/org/apache/causeway/extensions/executionlog/jpa/integtests/ExecutionLog_IntegTest.java
@@ -28,7 +28,7 @@ import org.springframework.context.annotation.PropertySource;
import org.springframework.context.annotation.PropertySources;
import org.springframework.test.context.ActiveProfiles;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.extensions.executionlog.applib.integtest.ExecutionLog_IntegTestAbstract;
import org.apache.causeway.extensions.executionlog.applib.integtest.model.ExecutionLogTestDomainModel;
import org.apache.causeway.extensions.executionlog.jpa.CausewayModuleExtExecutionLogPersistenceJpa;
@@ -51,7 +51,7 @@ public class ExecutionLog_IntegTest extends ExecutionLog_IntegTestAbstract {
CausewayModuleExtExecutionLogPersistenceJpa.class,
})
@PropertySources({
- @PropertySource(IsisPresets.UseLog4j2Test)
+ @PropertySource(CausewayPresets.UseLog4j2Test)
})
@EntityScan(basePackageClasses = {Counter.class})
@ComponentScan(basePackageClasses = {AppManifest.class, ExecutionLogTestDomainModel.class})
diff --git a/extensions/core/executionoutbox/applib/src/test/java/org/apache/causeway/extensions/executionoutbox/applib/integtest/ExecutionOutbox_IntegTestAbstract.java b/extensions/core/executionoutbox/applib/src/test/java/org/apache/causeway/extensions/executionoutbox/applib/integtest/ExecutionOutbox_IntegTestAbstract.java
index 2cd41767b5..6636e45978 100644
--- a/extensions/core/executionoutbox/applib/src/test/java/org/apache/causeway/extensions/executionoutbox/applib/integtest/ExecutionOutbox_IntegTestAbstract.java
+++ b/extensions/core/executionoutbox/applib/src/test/java/org/apache/causeway/extensions/executionoutbox/applib/integtest/ExecutionOutbox_IntegTestAbstract.java
@@ -40,7 +40,7 @@ import org.apache.causeway.applib.services.iactnlayer.InteractionService;
import org.apache.causeway.applib.services.sudo.SudoService;
import org.apache.causeway.applib.services.user.UserMemento;
import org.apache.causeway.applib.services.wrapper.WrapperFactory;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.extensions.executionoutbox.applib.dom.ExecutionOutboxEntry;
import org.apache.causeway.extensions.executionoutbox.applib.dom.ExecutionOutboxEntryRepository;
import org.apache.causeway.extensions.executionoutbox.applib.integtest.model.Counter;
@@ -59,7 +59,7 @@ public abstract class ExecutionOutbox_IntegTestAbstract extends IsisIntegrationT
@BeforeAll
static void beforeAll() {
- IsisPresets.forcePrototyping();
+ CausewayPresets.forcePrototyping();
}
Counter counter1;
diff --git a/extensions/core/executionoutbox/persistence-jdo/src/test/java/org/apache/causeway/extensions/executionoutbox/jdo/integtests/ExecutionOutbox_IntegTest.java b/extensions/core/executionoutbox/persistence-jdo/src/test/java/org/apache/causeway/extensions/executionoutbox/jdo/integtests/ExecutionOutbox_IntegTest.java
index a3d1f356ab..c97589e47b 100644
--- a/extensions/core/executionoutbox/persistence-jdo/src/test/java/org/apache/causeway/extensions/executionoutbox/jdo/integtests/ExecutionOutbox_IntegTest.java
+++ b/extensions/core/executionoutbox/persistence-jdo/src/test/java/org/apache/causeway/extensions/executionoutbox/jdo/integtests/ExecutionOutbox_IntegTest.java
@@ -27,7 +27,7 @@ import org.springframework.context.annotation.PropertySource;
import org.springframework.context.annotation.PropertySources;
import org.springframework.test.context.ActiveProfiles;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.extensions.executionoutbox.applib.integtest.ExecutionOutbox_IntegTestAbstract;
import org.apache.causeway.extensions.executionoutbox.applib.integtest.model.ExecutionOutboxTestDomainModel;
import org.apache.causeway.extensions.executionoutbox.jdo.CausewayModuleExtExecutionOutboxPersistenceJdo;
@@ -50,7 +50,7 @@ public class ExecutionOutbox_IntegTest extends ExecutionOutbox_IntegTestAbstract
CausewayModuleExtExecutionOutboxPersistenceJdo.class,
})
@PropertySources({
- @PropertySource(IsisPresets.UseLog4j2Test)
+ @PropertySource(CausewayPresets.UseLog4j2Test)
})
@ComponentScan(basePackageClasses = {AppManifest.class, ExecutionOutboxTestDomainModel.class})
public static class AppManifest {
diff --git a/extensions/core/executionoutbox/persistence-jpa/src/main/java/org/apache/causeway/extensions/executionoutbox/jpa/dom/ExecutionOutboxEntry.java b/extensions/core/executionoutbox/persistence-jpa/src/main/java/org/apache/causeway/extensions/executionoutbox/jpa/dom/ExecutionOutboxEntry.java
index 8c79eca37a..adcc1cbfd4 100644
--- a/extensions/core/executionoutbox/persistence-jpa/src/main/java/org/apache/causeway/extensions/executionoutbox/jpa/dom/ExecutionOutboxEntry.java
+++ b/extensions/core/executionoutbox/persistence-jpa/src/main/java/org/apache/causeway/extensions/executionoutbox/jpa/dom/ExecutionOutboxEntry.java
@@ -44,7 +44,7 @@ import org.apache.causeway.applib.annotation.Publishing;
import org.apache.causeway.applib.jaxb.PersistentEntityAdapter;
import org.apache.causeway.applib.services.bookmark.Bookmark;
import org.apache.causeway.extensions.executionoutbox.applib.dom.ExecutionOutboxEntryType;
-import org.apache.causeway.persistence.jpa.applib.integration.IsisEntityListener;
+import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
import org.apache.causeway.persistence.jpa.integration.typeconverters.applib.IsisBookmarkConverter;
import org.apache.causeway.persistence.jpa.integration.typeconverters.schema.v2.IsisInteractionDtoConverter;
import org.apache.causeway.schema.ixn.v2.InteractionDto;
@@ -83,7 +83,7 @@ import lombok.Setter;
entityChangePublishing = Publishing.DISABLED
)
@XmlJavaTypeAdapter(PersistentEntityAdapter.class)
-@EntityListeners(IsisEntityListener.class)
+@EntityListeners(CausewayEntityListener.class)
public class ExecutionOutboxEntry extends org.apache.causeway.extensions.executionoutbox.applib.dom.ExecutionOutboxEntry {
diff --git a/extensions/core/executionoutbox/persistence-jpa/src/test/java/org/apache/causeway/extensions/executionoutbox/jpa/integtests/ExecutionOutbox_IntegTest.java b/extensions/core/executionoutbox/persistence-jpa/src/test/java/org/apache/causeway/extensions/executionoutbox/jpa/integtests/ExecutionOutbox_IntegTest.java
index 54dbde3d23..61ae341d79 100644
--- a/extensions/core/executionoutbox/persistence-jpa/src/test/java/org/apache/causeway/extensions/executionoutbox/jpa/integtests/ExecutionOutbox_IntegTest.java
+++ b/extensions/core/executionoutbox/persistence-jpa/src/test/java/org/apache/causeway/extensions/executionoutbox/jpa/integtests/ExecutionOutbox_IntegTest.java
@@ -28,7 +28,7 @@ import org.springframework.context.annotation.PropertySource;
import org.springframework.context.annotation.PropertySources;
import org.springframework.test.context.ActiveProfiles;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.extensions.executionoutbox.applib.integtest.ExecutionOutbox_IntegTestAbstract;
import org.apache.causeway.extensions.executionoutbox.applib.integtest.model.ExecutionOutboxTestDomainModel;
import org.apache.causeway.extensions.executionoutbox.jpa.CausewayModuleExtExecutionOutboxPersistenceJpa;
@@ -51,7 +51,7 @@ public class ExecutionOutbox_IntegTest extends ExecutionOutbox_IntegTestAbstract
CausewayModuleExtExecutionOutboxPersistenceJpa.class,
})
@PropertySources({
- @PropertySource(IsisPresets.UseLog4j2Test)
+ @PropertySource(CausewayPresets.UseLog4j2Test)
})
@EntityScan(basePackageClasses = {Counter.class})
@ComponentScan(basePackageClasses = {AppManifest.class, ExecutionOutboxTestDomainModel.class})
diff --git a/extensions/core/executionoutbox/restclient/src/test/java/org/apache/causeway/extensions/executionoutbox/restclient/integtests/OutboxRestClient_IntegTest.java b/extensions/core/executionoutbox/restclient/src/test/java/org/apache/causeway/extensions/executionoutbox/restclient/integtests/OutboxRestClient_IntegTest.java
index 78cea4396d..f60c28c80e 100644
--- a/extensions/core/executionoutbox/restclient/src/test/java/org/apache/causeway/extensions/executionoutbox/restclient/integtests/OutboxRestClient_IntegTest.java
+++ b/extensions/core/executionoutbox/restclient/src/test/java/org/apache/causeway/extensions/executionoutbox/restclient/integtests/OutboxRestClient_IntegTest.java
@@ -44,7 +44,7 @@ import org.apache.causeway.applib.services.iactnlayer.InteractionService;
import org.apache.causeway.applib.services.repository.RepositoryService;
import org.apache.causeway.applib.services.wrapper.WrapperFactory;
import org.apache.causeway.applib.services.xactn.TransactionService;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.core.runtimeservices.CausewayModuleCoreRuntimeServices;
import org.apache.causeway.core.webapp.CausewayModuleCoreWebapp;
import org.apache.causeway.extensions.executionoutbox.applib.dom.ExecutionOutboxEntry;
@@ -84,7 +84,7 @@ public class OutboxRestClient_IntegTest {
Counter_bumpUsingMixinWithExecutionPublishingDisabled.class
})
@PropertySources({
- @PropertySource(IsisPresets.UseLog4j2Test)
+ @PropertySource(CausewayPresets.UseLog4j2Test)
})
@EntityScan(basePackageClasses = {Counter.class})
@ComponentScan(basePackageClasses = {AppManifest.class, Counter.class})
@@ -96,7 +96,7 @@ public class OutboxRestClient_IntegTest {
@BeforeAll
static void beforeAll() {
- IsisPresets.forcePrototyping();
+ CausewayPresets.forcePrototyping();
}
org.apache.causeway.extensions.executionoutbox.applib.integtest.model.Counter counter1;
diff --git a/extensions/security/audittrail/applib/src/test/java/org/apache/causeway/extensions/audittrail/applib/integtests/AuditTrail_IntegTestAbstract.java b/extensions/security/audittrail/applib/src/test/java/org/apache/causeway/extensions/audittrail/applib/integtests/AuditTrail_IntegTestAbstract.java
index 7882c1ab0b..c30b317de9 100644
--- a/extensions/security/audittrail/applib/src/test/java/org/apache/causeway/extensions/audittrail/applib/integtests/AuditTrail_IntegTestAbstract.java
+++ b/extensions/security/audittrail/applib/src/test/java/org/apache/causeway/extensions/audittrail/applib/integtests/AuditTrail_IntegTestAbstract.java
@@ -26,7 +26,7 @@ import org.apache.causeway.applib.mixins.system.DomainChangeRecord;
import org.apache.causeway.applib.services.bookmark.BookmarkService;
import org.apache.causeway.applib.services.iactnlayer.InteractionService;
import org.apache.causeway.applib.services.wrapper.WrapperFactory;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.extensions.audittrail.applib.dom.AuditTrailEntry;
import org.apache.causeway.extensions.audittrail.applib.dom.AuditTrailEntryRepository;
import org.apache.causeway.extensions.audittrail.applib.integtests.model.Counter;
@@ -45,7 +45,7 @@ public abstract class AuditTrail_IntegTestAbstract extends IsisIntegrationTestAb
@BeforeAll
static void beforeAll() {
- IsisPresets.forcePrototyping();
+ CausewayPresets.forcePrototyping();
}
@BeforeEach
diff --git a/extensions/security/audittrail/persistence-jdo/src/test/java/org/apache/causeway/extensions/audittrail/jdo/integtests/AuditTrail_IntegTest.java b/extensions/security/audittrail/persistence-jdo/src/test/java/org/apache/causeway/extensions/audittrail/jdo/integtests/AuditTrail_IntegTest.java
index 467a9026a3..c0497a49c2 100644
--- a/extensions/security/audittrail/persistence-jdo/src/test/java/org/apache/causeway/extensions/audittrail/jdo/integtests/AuditTrail_IntegTest.java
+++ b/extensions/security/audittrail/persistence-jdo/src/test/java/org/apache/causeway/extensions/audittrail/jdo/integtests/AuditTrail_IntegTest.java
@@ -18,7 +18,7 @@
*/
package org.apache.causeway.extensions.audittrail.jdo.integtests;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.core.runtimeservices.CausewayModuleCoreRuntimeServices;
import org.apache.causeway.extensions.audittrail.applib.integtests.AuditTrail_IntegTestAbstract;
import org.apache.causeway.extensions.audittrail.applib.integtests.model.AuditTrailTestDomainModel;
@@ -50,7 +50,7 @@ public class AuditTrail_IntegTest extends AuditTrail_IntegTestAbstract {
CausewayModuleExtAuditTrailPersistenceJdo.class,
})
@PropertySources({
- @PropertySource(IsisPresets.UseLog4j2Test),
+ @PropertySource(CausewayPresets.UseLog4j2Test),
})
@ComponentScan(basePackageClasses = {AppManifest.class, AuditTrailTestDomainModel.class, CounterRepository.class})
public static class AppManifest {
diff --git a/extensions/security/audittrail/persistence-jpa/src/main/java/org/apache/causeway/extensions/audittrail/jpa/dom/AuditTrailEntry.java b/extensions/security/audittrail/persistence-jpa/src/main/java/org/apache/causeway/extensions/audittrail/jpa/dom/AuditTrailEntry.java
index 39e1f75dc5..f0847649c6 100644
--- a/extensions/security/audittrail/persistence-jpa/src/main/java/org/apache/causeway/extensions/audittrail/jpa/dom/AuditTrailEntry.java
+++ b/extensions/security/audittrail/persistence-jpa/src/main/java/org/apache/causeway/extensions/audittrail/jpa/dom/AuditTrailEntry.java
@@ -43,7 +43,7 @@ import org.apache.causeway.applib.annotation.Publishing;
import org.apache.causeway.applib.jaxb.PersistentEntityAdapter;
import org.apache.causeway.applib.services.bookmark.Bookmark;
import org.apache.causeway.extensions.audittrail.applib.dom.AuditTrailEntry.Nq;
-import org.apache.causeway.persistence.jpa.applib.integration.IsisEntityListener;
+import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
import org.apache.causeway.persistence.jpa.integration.typeconverters.applib.IsisBookmarkConverter;
import org.apache.causeway.persistence.jpa.integration.typeconverters.java.util.JavaUtilUuidConverter;
@@ -143,7 +143,7 @@ import lombok.Setter;
+ " AND e.propertyId = :propertyId "
+ " ORDER BY e.timestamp DESC ") // programmatic limit 0,30
})
-@EntityListeners(IsisEntityListener.class)
+@EntityListeners(CausewayEntityListener.class)
@XmlJavaTypeAdapter(PersistentEntityAdapter.class)
@Named(AuditTrailEntry.LOGICAL_TYPE_NAME)
@DomainObject(
diff --git a/extensions/security/audittrail/persistence-jpa/src/test/java/org/apache/causeway/extensions/audittrail/jpa/integtests/AuditTrail_IntegTest.java b/extensions/security/audittrail/persistence-jpa/src/test/java/org/apache/causeway/extensions/audittrail/jpa/integtests/AuditTrail_IntegTest.java
index 470d29e286..069444b834 100644
--- a/extensions/security/audittrail/persistence-jpa/src/test/java/org/apache/causeway/extensions/audittrail/jpa/integtests/AuditTrail_IntegTest.java
+++ b/extensions/security/audittrail/persistence-jpa/src/test/java/org/apache/causeway/extensions/audittrail/jpa/integtests/AuditTrail_IntegTest.java
@@ -20,8 +20,8 @@ package org.apache.causeway.extensions.audittrail.jpa.integtests;
import javax.inject.Inject;
-import org.apache.causeway.core.config.beans.IsisBeanTypeRegistry;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.beans.CausewayBeanTypeRegistry;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.core.runtimeservices.CausewayModuleCoreRuntimeServices;
import org.apache.causeway.extensions.audittrail.applib.integtests.AuditTrail_IntegTestAbstract;
import org.apache.causeway.extensions.audittrail.applib.integtests.model.AuditTrailTestDomainModel;
@@ -60,7 +60,7 @@ public class AuditTrail_IntegTest extends AuditTrail_IntegTestAbstract {
Counter.class,
})
@PropertySources({
- @PropertySource(IsisPresets.UseLog4j2Test),
+ @PropertySource(CausewayPresets.UseLog4j2Test),
})
@ComponentScan(basePackageClasses = {AppManifest.class, AuditTrailTestDomainModel.class, CounterRepository.class})
@EntityScan(basePackageClasses = {Counter.class})
@@ -72,5 +72,5 @@ public class AuditTrail_IntegTest extends AuditTrail_IntegTestAbstract {
return Counter.builder().name(name).build();
}
- @Inject IsisBeanTypeRegistry isisBeanTypeRegistry;
+ @Inject CausewayBeanTypeRegistry isisBeanTypeRegistry;
}
diff --git a/extensions/security/audittrail/persistence-jpa/src/test/java/org/apache/causeway/extensions/audittrail/jpa/integtests/model/Counter.java b/extensions/security/audittrail/persistence-jpa/src/test/java/org/apache/causeway/extensions/audittrail/jpa/integtests/model/Counter.java
index e9dabfc5b1..410bf10a33 100644
--- a/extensions/security/audittrail/persistence-jpa/src/test/java/org/apache/causeway/extensions/audittrail/jpa/integtests/model/Counter.java
+++ b/extensions/security/audittrail/persistence-jpa/src/test/java/org/apache/causeway/extensions/audittrail/jpa/integtests/model/Counter.java
@@ -31,7 +31,7 @@ import javax.persistence.Table;
import org.apache.causeway.applib.annotation.DomainObject;
import org.apache.causeway.applib.annotation.Nature;
import org.apache.causeway.applib.annotation.Publishing;
-import org.apache.causeway.persistence.jpa.applib.integration.IsisEntityListener;
+import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
import lombok.AccessLevel;
import lombok.AllArgsConstructor;
@@ -46,7 +46,7 @@ import lombok.Setter;
name = "Counter"
)
@Named("audittrail.test.Counter")
-@EntityListeners(IsisEntityListener.class)
+@EntityListeners(CausewayEntityListener.class)
@DomainObject(nature = Nature.ENTITY, entityChangePublishing = Publishing.ENABLED)
@NoArgsConstructor
@Builder
diff --git a/extensions/security/secman/persistence-jdo/src/test/java/org/apache/causeway/extensions/secman/jdo/permission/dom/ApplicationPermissionRepository_IntegTest.java b/extensions/security/secman/persistence-jdo/src/test/java/org/apache/causeway/extensions/secman/jdo/permission/dom/ApplicationPermissionRepository_IntegTest.java
index 2771b3433d..1a55518649 100644
--- a/extensions/security/secman/persistence-jdo/src/test/java/org/apache/causeway/extensions/secman/jdo/permission/dom/ApplicationPermissionRepository_IntegTest.java
+++ b/extensions/security/secman/persistence-jdo/src/test/java/org/apache/causeway/extensions/secman/jdo/permission/dom/ApplicationPermissionRepository_IntegTest.java
@@ -26,7 +26,7 @@ import org.springframework.context.annotation.PropertySource;
import org.springframework.context.annotation.PropertySources;
import org.springframework.test.context.ActiveProfiles;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.extensions.secman.applib.ApplicationPermissionRepositoryIntegTestAbstract;
import org.apache.causeway.extensions.secman.applib.mmm.MmmModule;
import org.apache.causeway.extensions.secman.jdo.CausewayModuleExtSecmanPersistenceJdo;
@@ -50,7 +50,7 @@ class ApplicationPermissionRepository_IntegTest extends ApplicationPermissionRep
MmmModule.class,
})
@PropertySources({
- @PropertySource(IsisPresets.UseLog4j2Test),
+ @PropertySource(CausewayPresets.UseLog4j2Test),
})
public static class AppManifest {
}
diff --git a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/causeway/extensions/secman/jpa/permission/dom/ApplicationPermission.java b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/causeway/extensions/secman/jpa/permission/dom/ApplicationPermission.java
index a06690939d..8b57ef935f 100644
--- a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/causeway/extensions/secman/jpa/permission/dom/ApplicationPermission.java
+++ b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/causeway/extensions/secman/jpa/permission/dom/ApplicationPermission.java
@@ -45,7 +45,7 @@ import org.apache.causeway.applib.annotation.DomainObject;
import org.apache.causeway.applib.annotation.DomainObjectLayout;
import org.apache.causeway.applib.jaxb.PersistentEntityAdapter;
import org.apache.causeway.applib.services.appfeat.ApplicationFeatureSort;
-import org.apache.causeway.persistence.jpa.applib.integration.IsisEntityListener;
+import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
import lombok.Getter;
import lombok.Setter;
@@ -99,7 +99,7 @@ import lombok.Setter;
+ " AND p.featureSort = :featureSort "),
})
@XmlJavaTypeAdapter(PersistentEntityAdapter.class)
-@EntityListeners(IsisEntityListener.class)
+@EntityListeners(CausewayEntityListener.class)
@Named(ApplicationPermission.LOGICAL_TYPE_NAME)
@DomainObject
@DomainObjectLayout(
diff --git a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/causeway/extensions/secman/jpa/role/dom/ApplicationRole.java b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/causeway/extensions/secman/jpa/role/dom/ApplicationRole.java
index c3b495ccdb..cf1953e36d 100644
--- a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/causeway/extensions/secman/jpa/role/dom/ApplicationRole.java
+++ b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/causeway/extensions/secman/jpa/role/dom/ApplicationRole.java
@@ -44,7 +44,7 @@ import org.apache.causeway.applib.annotation.Bounding;
import org.apache.causeway.applib.annotation.DomainObject;
import org.apache.causeway.applib.annotation.DomainObjectLayout;
import org.apache.causeway.applib.jaxb.PersistentEntityAdapter;
-import org.apache.causeway.persistence.jpa.applib.integration.IsisEntityListener;
+import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
import lombok.Getter;
import lombok.Setter;
@@ -69,7 +69,7 @@ import lombok.Setter;
+ " WHERE r.name LIKE :regex"),
})
@XmlJavaTypeAdapter(PersistentEntityAdapter.class)
-@EntityListeners(IsisEntityListener.class)
+@EntityListeners(CausewayEntityListener.class)
@Named(ApplicationRole.LOGICAL_TYPE_NAME)
@DomainObject(
bounding = Bounding.BOUNDED,
diff --git a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/causeway/extensions/secman/jpa/tenancy/dom/ApplicationTenancy.java b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/causeway/extensions/secman/jpa/tenancy/dom/ApplicationTenancy.java
index 4b44ccb54d..5e7fab6ca4 100644
--- a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/causeway/extensions/secman/jpa/tenancy/dom/ApplicationTenancy.java
+++ b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/causeway/extensions/secman/jpa/tenancy/dom/ApplicationTenancy.java
@@ -42,7 +42,7 @@ import org.apache.causeway.applib.annotation.BookmarkPolicy;
import org.apache.causeway.applib.annotation.DomainObject;
import org.apache.causeway.applib.annotation.DomainObjectLayout;
import org.apache.causeway.applib.jaxb.PersistentEntityAdapter;
-import org.apache.causeway.persistence.jpa.applib.integration.IsisEntityListener;
+import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
import lombok.Getter;
import lombok.Setter;
@@ -74,7 +74,7 @@ import lombok.Setter;
+ " OR t.path LIKE :regex"),
})
@XmlJavaTypeAdapter(PersistentEntityAdapter.class)
-@EntityListeners(IsisEntityListener.class)
+@EntityListeners(CausewayEntityListener.class)
@Named(ApplicationTenancy.LOGICAL_TYPE_NAME)
@DomainObject(
autoCompleteRepository = ApplicationTenancyRepository.class,
diff --git a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/causeway/extensions/secman/jpa/user/dom/ApplicationUser.java b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/causeway/extensions/secman/jpa/user/dom/ApplicationUser.java
index 0b294b7dba..7f6e62669d 100644
--- a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/causeway/extensions/secman/jpa/user/dom/ApplicationUser.java
+++ b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/causeway/extensions/secman/jpa/user/dom/ApplicationUser.java
@@ -48,7 +48,7 @@ import org.apache.causeway.applib.annotation.BookmarkPolicy;
import org.apache.causeway.applib.annotation.DomainObject;
import org.apache.causeway.applib.annotation.DomainObjectLayout;
import org.apache.causeway.applib.jaxb.PersistentEntityAdapter;
-import org.apache.causeway.persistence.jpa.applib.integration.IsisEntityListener;
+import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
import lombok.Getter;
import lombok.Setter;
@@ -87,7 +87,7 @@ import lombok.Setter;
+ " OR u.emailAddress LIKE :regex")
})
@XmlJavaTypeAdapter(PersistentEntityAdapter.class)
-@EntityListeners(IsisEntityListener.class)
+@EntityListeners(CausewayEntityListener.class)
@Named(ApplicationUser.LOGICAL_TYPE_NAME)
@DomainObject(
autoCompleteRepository = ApplicationUserRepository.class,
diff --git a/extensions/security/secman/persistence-jpa/src/test/java/org/apache/causeway/extensions/secman/jpa/permission/dom/ApplicationPermissionRepository_IntegTest.java b/extensions/security/secman/persistence-jpa/src/test/java/org/apache/causeway/extensions/secman/jpa/permission/dom/ApplicationPermissionRepository_IntegTest.java
index 9b47ac338c..ab41957ad0 100644
--- a/extensions/security/secman/persistence-jpa/src/test/java/org/apache/causeway/extensions/secman/jpa/permission/dom/ApplicationPermissionRepository_IntegTest.java
+++ b/extensions/security/secman/persistence-jpa/src/test/java/org/apache/causeway/extensions/secman/jpa/permission/dom/ApplicationPermissionRepository_IntegTest.java
@@ -26,7 +26,7 @@ import org.springframework.context.annotation.PropertySource;
import org.springframework.context.annotation.PropertySources;
import org.springframework.test.context.ActiveProfiles;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.extensions.secman.applib.ApplicationPermissionRepositoryIntegTestAbstract;
import org.apache.causeway.extensions.secman.applib.mmm.MmmModule;
import org.apache.causeway.extensions.secman.jpa.CausewayModuleExtSecmanPersistenceJpa;
@@ -50,7 +50,7 @@ class ApplicationPermissionRepository_IntegTest extends ApplicationPermissionRep
MmmModule.class,
})
@PropertySources({
- @PropertySource(IsisPresets.UseLog4j2Test),
+ @PropertySource(CausewayPresets.UseLog4j2Test),
})
public static class AppManifest {
}
diff --git a/extensions/security/sessionlog/persistence-jdo/src/test/java/org/apache/causeway/extensions/sessionlog/jdo/integtests/SessionLog_IntegTest.java b/extensions/security/sessionlog/persistence-jdo/src/test/java/org/apache/causeway/extensions/sessionlog/jdo/integtests/SessionLog_IntegTest.java
index b15b2bcd67..a2d20104fb 100644
--- a/extensions/security/sessionlog/persistence-jdo/src/test/java/org/apache/causeway/extensions/sessionlog/jdo/integtests/SessionLog_IntegTest.java
+++ b/extensions/security/sessionlog/persistence-jdo/src/test/java/org/apache/causeway/extensions/sessionlog/jdo/integtests/SessionLog_IntegTest.java
@@ -26,7 +26,7 @@ import org.springframework.context.annotation.PropertySource;
import org.springframework.context.annotation.PropertySources;
import org.springframework.test.context.ActiveProfiles;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.extensions.sessionlog.applib.integtests.SessionLogIntegTestAbstract;
import org.apache.causeway.extensions.sessionlog.jdo.CausewayModuleExtSessionLogPersistenceJdo;
@@ -48,7 +48,7 @@ public class SessionLog_IntegTest extends SessionLogIntegTestAbstract {
CausewayModuleExtSessionLogPersistenceJdo.class,
})
@PropertySources({
- @PropertySource(IsisPresets.UseLog4j2Test),
+ @PropertySource(CausewayPresets.UseLog4j2Test),
})
public static class AppManifest {
}
diff --git a/extensions/security/sessionlog/persistence-jpa/src/main/java/org/apache/causeway/extensions/sessionlog/jpa/dom/SessionLogEntry.java b/extensions/security/sessionlog/persistence-jpa/src/main/java/org/apache/causeway/extensions/sessionlog/jpa/dom/SessionLogEntry.java
index 1514d8e4ae..6419258171 100644
--- a/extensions/security/sessionlog/persistence-jpa/src/main/java/org/apache/causeway/extensions/sessionlog/jpa/dom/SessionLogEntry.java
+++ b/extensions/security/sessionlog/persistence-jpa/src/main/java/org/apache/causeway/extensions/sessionlog/jpa/dom/SessionLogEntry.java
@@ -37,7 +37,7 @@ import org.apache.causeway.applib.annotation.DomainObject;
import org.apache.causeway.applib.annotation.Editing;
import org.apache.causeway.applib.services.session.SessionSubscriber;
import org.apache.causeway.extensions.sessionlog.applib.dom.SessionLogEntry.Nq;
-import org.apache.causeway.persistence.jpa.applib.integration.IsisEntityListener;
+import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
import lombok.Getter;
import lombok.Setter;
@@ -137,7 +137,7 @@ import lombok.Setter;
+ " WHERE e.username = :username "
+ " ORDER BY e.loginTimestamp DESC ") // range 0,10 programmatically
})
-@EntityListeners(IsisEntityListener.class)
+@EntityListeners(CausewayEntityListener.class)
@Named(SessionLogEntry.LOGICAL_TYPE_NAME)
@DomainObject(
editing = Editing.DISABLED
diff --git a/extensions/security/sessionlog/persistence-jpa/src/test/java/org/apache/causeway/extensions/sessionlog/jpa/integtests/SessionLog_IntegTest.java b/extensions/security/sessionlog/persistence-jpa/src/test/java/org/apache/causeway/extensions/sessionlog/jpa/integtests/SessionLog_IntegTest.java
index ca4521bcf2..0c9536eff2 100644
--- a/extensions/security/sessionlog/persistence-jpa/src/test/java/org/apache/causeway/extensions/sessionlog/jpa/integtests/SessionLog_IntegTest.java
+++ b/extensions/security/sessionlog/persistence-jpa/src/test/java/org/apache/causeway/extensions/sessionlog/jpa/integtests/SessionLog_IntegTest.java
@@ -26,7 +26,7 @@ import org.springframework.context.annotation.PropertySource;
import org.springframework.context.annotation.PropertySources;
import org.springframework.test.context.ActiveProfiles;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.extensions.sessionlog.applib.integtests.SessionLogIntegTestAbstract;
import org.apache.causeway.extensions.sessionlog.jpa.CausewayModuleExtSessionLogPersistenceJpa;
@@ -48,7 +48,7 @@ public class SessionLog_IntegTest extends SessionLogIntegTestAbstract {
CausewayModuleExtSessionLogPersistenceJpa.class,
})
@PropertySources({
- @PropertySource(IsisPresets.UseLog4j2Test),
+ @PropertySource(CausewayPresets.UseLog4j2Test),
})
public static class AppManifest {
}
diff --git a/extensions/security/shiro-realm-ldap/adoc/modules/shiro-realm-ldap/examples/shiro.ini b/extensions/security/shiro-realm-ldap/adoc/modules/shiro-realm-ldap/examples/shiro.ini
index 12bf7aeb27..57ab539dfe 100644
--- a/extensions/security/shiro-realm-ldap/adoc/modules/shiro-realm-ldap/examples/shiro.ini
+++ b/extensions/security/shiro-realm-ldap/adoc/modules/shiro-realm-ldap/examples/shiro.ini
@@ -16,14 +16,14 @@
# under the License.
[main]
-contextFactory = org.apache.isis.extensions.shirorealmldap.realm.impl.IsisLdapContextFactory
+contextFactory = org.apache.causeway.extensions.shirorealmldap.realm.impl.CausewayLdapContextFactory
contextFactory.url = ldap://localhost:10389
contextFactory.authenticationMechanism = CRAM-MD5
contextFactory.systemAuthenticationMechanism = simple
contextFactory.systemUsername = uid=admin,ou=system
contextFactory.systemPassword = secret
-ldapRealm = org.apache.isis.extensions.shirorealmldap.realm.impl.IsisLdapRealm
+ldapRealm = org.apache.causeway.extensions.shirorealmldap.realm.impl.CausewayLdapRealm
ldapRealm.contextFactory = $contextFactory
ldapRealm.searchBase = ou=groups,o=mojo
diff --git a/extensions/security/shiro-realm-ldap/impl/src/main/java/org/apache/causeway/extensions/shirorealmldap/realm/impl/IsisLdapContextFactory.java b/extensions/security/shiro-realm-ldap/impl/src/main/java/org/apache/causeway/extensions/shirorealmldap/realm/impl/CausewayLdapContextFactory.java
similarity index 93%
rename from extensions/security/shiro-realm-ldap/impl/src/main/java/org/apache/causeway/extensions/shirorealmldap/realm/impl/IsisLdapContextFactory.java
rename to extensions/security/shiro-realm-ldap/impl/src/main/java/org/apache/causeway/extensions/shirorealmldap/realm/impl/CausewayLdapContextFactory.java
index 65ed87d585..9fcb9f1d10 100644
--- a/extensions/security/shiro-realm-ldap/impl/src/main/java/org/apache/causeway/extensions/shirorealmldap/realm/impl/IsisLdapContextFactory.java
+++ b/extensions/security/shiro-realm-ldap/impl/src/main/java/org/apache/causeway/extensions/shirorealmldap/realm/impl/CausewayLdapContextFactory.java
@@ -32,11 +32,11 @@ import org.apache.shiro.realm.ldap.JndiLdapContextFactory;
* compared to regular authentication.
*
* <p>
- * See {@link IsisLdapRealm} for typical configuration within <tt>shiro.ini</tt>.
+ * See {@link CausewayLdapRealm} for typical configuration within <tt>shiro.ini</tt>.
*
* @since 1.x {@index}
*/
-public class IsisLdapContextFactory extends JndiLdapContextFactory {
+public class CausewayLdapContextFactory extends JndiLdapContextFactory {
private String systemAuthenticationMechanism;
diff --git a/extensions/security/shiro-realm-ldap/impl/src/main/java/org/apache/causeway/extensions/shirorealmldap/realm/impl/IsisLdapRealm.java b/extensions/security/shiro-realm-ldap/impl/src/main/java/org/apache/causeway/extensions/shirorealmldap/realm/impl/CausewayLdapRealm.java
similarity index 99%
rename from extensions/security/shiro-realm-ldap/impl/src/main/java/org/apache/causeway/extensions/shirorealmldap/realm/impl/IsisLdapRealm.java
rename to extensions/security/shiro-realm-ldap/impl/src/main/java/org/apache/causeway/extensions/shirorealmldap/realm/impl/CausewayLdapRealm.java
index 658a105f96..2cf5847f71 100644
--- a/extensions/security/shiro-realm-ldap/impl/src/main/java/org/apache/causeway/extensions/shirorealmldap/realm/impl/IsisLdapRealm.java
+++ b/extensions/security/shiro-realm-ldap/impl/src/main/java/org/apache/causeway/extensions/shirorealmldap/realm/impl/CausewayLdapRealm.java
@@ -123,7 +123,7 @@ import org.apache.causeway.security.shiro.permrolemapper.PermissionToRoleMapperF
*
* @since 1.x {@index}
*/
-public class IsisLdapRealm extends DefaultLdapRealm {
+public class CausewayLdapRealm extends DefaultLdapRealm {
private static final String UNIQUEMEMBER_SUBSTITUTION_TOKEN = "{0}";
private static final SearchControls SUBTREE_SCOPE = new SearchControls();
@@ -179,7 +179,7 @@ public class IsisLdapRealm extends DefaultLdapRealm {
*/
private String cnAttribute = "cn";
- public IsisLdapRealm() {
+ public CausewayLdapRealm() {
setGroupObjectClass("groupOfUniqueNames");
setUniqueMemberAttribute("uniqueMember");
setUniqueMemberAttributeValueTemplate("uid={0}");
diff --git a/incubator/extensions/core/commandreplay/secondary/src/test/java/org/apache/causeway/extensions/commandreplay/secondary/fetch/CommandFetcher_Test.java b/incubator/extensions/core/commandreplay/secondary/src/test/java/org/apache/causeway/extensions/commandreplay/secondary/fetch/CommandFetcher_Test.java
index be6ce2ac07..399aad64ae 100644
--- a/incubator/extensions/core/commandreplay/secondary/src/test/java/org/apache/causeway/extensions/commandreplay/secondary/fetch/CommandFetcher_Test.java
+++ b/incubator/extensions/core/commandreplay/secondary/src/test/java/org/apache/causeway/extensions/commandreplay/secondary/fetch/CommandFetcher_Test.java
@@ -26,7 +26,7 @@ import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.annotation.Configuration;
import org.springframework.test.context.TestPropertySource;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.core.metamodel._testing.MetaModelContext_forTesting;
import org.apache.causeway.extensions.commandreplay.secondary.config.SecondaryConfig;
import org.apache.causeway.extensions.commandreplay.secondary.fetch.CommandFetcher;
@@ -46,7 +46,7 @@ import lombok.val;
// "logging.level.ObjectSpecificationAbstract=TRACE"
})
@TestPropertySource({
- IsisPresets.UseLog4j2Test,
+ CausewayPresets.UseLog4j2Test,
})
//intended only for manual verification.
@DisabledIfSystemProperty(named = "isRunningWithSurefire", matches = "true")
diff --git a/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/source/ScratchPad.java b/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/source/ScratchPad.java
index b5d3971522..dd01752832 100644
--- a/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/source/ScratchPad.java
+++ b/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/source/ScratchPad.java
@@ -20,7 +20,7 @@ package org.apache.causeway.viewer.graphql.viewer.test.source;
import graphql.Scalars;
import graphql.schema.*;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
diff --git a/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/source/TestDomainModuleIntegTestAbstract.java b/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/source/TestDomainModuleIntegTestAbstract.java
index 2f5c11b89b..b81c6c471e 100644
--- a/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/source/TestDomainModuleIntegTestAbstract.java
+++ b/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/source/TestDomainModuleIntegTestAbstract.java
@@ -18,7 +18,7 @@
*/
package org.apache.causeway.viewer.graphql.viewer.test.source;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.core.runtimeservices.CausewayModuleCoreRuntimeServices;
import org.apache.causeway.persistence.jpa.eclipselink.CausewayModulePersistenceJpaEclipselink;
import org.apache.causeway.security.bypass.CausewayModuleSecurityBypass;
@@ -62,10 +62,10 @@ public class TestDomainModuleIntegTestAbstract {
TestDomainModule.class
})
@PropertySources({
- @PropertySource(IsisPresets.H2InMemory_withUniqueSchema),
- @PropertySource(IsisPresets.UseLog4j2Test),
- @PropertySource(IsisPresets.SilenceMetaModel),
- @PropertySource(IsisPresets.SilenceProgrammingModel),
+ @PropertySource(CausewayPresets.H2InMemory_withUniqueSchema),
+ @PropertySource(CausewayPresets.UseLog4j2Test),
+ @PropertySource(CausewayPresets.SilenceMetaModel),
+ @PropertySource(CausewayPresets.SilenceProgrammingModel),
})
public static class TestApp {
diff --git a/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/CausewayModulePersistenceJdoDatanucleus.java b/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/CausewayModulePersistenceJdoDatanucleus.java
index 4654151fa0..aa5a1bccd2 100644
--- a/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/CausewayModulePersistenceJdoDatanucleus.java
+++ b/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/CausewayModulePersistenceJdoDatanucleus.java
@@ -39,7 +39,7 @@ import org.springframework.dao.support.PersistenceExceptionTranslator;
import org.springframework.transaction.interceptor.TransactionInterceptor;
import org.apache.causeway.core.config.CausewayConfiguration;
-import org.apache.causeway.core.config.beans.IsisBeanTypeRegistry;
+import org.apache.causeway.core.config.beans.CausewayBeanTypeRegistry;
import org.apache.causeway.core.config.beans.aoppatch.TransactionInterceptorFactory;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.core.metamodel.services.objectlifecycle.ObjectLifecyclePublisher;
@@ -131,7 +131,7 @@ public class CausewayModulePersistenceJdoDatanucleus {
final DataSource dataSource,
final MetaModelContext metaModelContext,
final ObjectLifecyclePublisher objectLifecyclePublisher,
- final IsisBeanTypeRegistry beanTypeRegistry,
+ final CausewayBeanTypeRegistry beanTypeRegistry,
final DatanucleusSettings dnSettings) {
_Assert.assertNotNull(dataSource, "a datasource is required");
@@ -164,7 +164,7 @@ public class CausewayModulePersistenceJdoDatanucleus {
public TransactionAwarePersistenceManagerFactoryProxy getTransactionAwarePersistenceManagerFactoryProxy(
final MetaModelContext metaModelContext,
final @Qualifier("local-pmf-proxy") LocalPersistenceManagerFactoryBean localPmfBean,
- final IsisBeanTypeRegistry beanTypeRegistry,
+ final CausewayBeanTypeRegistry beanTypeRegistry,
final List<JdoEntityDiscoveryListener> jdoEntityDiscoveryListeners,
final DatanucleusSettings dnSettings) {
@@ -234,7 +234,7 @@ public class CausewayModulePersistenceJdoDatanucleus {
private static void notifyJdoEntityDiscoveryListeners(
final PersistenceManagerFactory pmf,
- final IsisBeanTypeRegistry beanTypeRegistry,
+ final CausewayBeanTypeRegistry beanTypeRegistry,
final List<JdoEntityDiscoveryListener> jdoEntityDiscoveryListeners,
final DatanucleusSettings dnSettings) {
@@ -289,7 +289,7 @@ public class CausewayModulePersistenceJdoDatanucleus {
}
private static PersistenceUnitMetaData createDefaultPersistenceUnit (
- final IsisBeanTypeRegistry beanTypeRegistry) {
+ final CausewayBeanTypeRegistry beanTypeRegistry) {
val pumd = new PersistenceUnitMetaData(
"dynamic-unit", "RESOURCE_LOCAL", null);
pumd.setExcludeUnlistedClasses(false);
diff --git a/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/beans/JdoBeanTypeClassifier.java b/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/beans/JdoBeanTypeClassifier.java
index e22074f2f7..18b74a45a6 100644
--- a/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/beans/JdoBeanTypeClassifier.java
+++ b/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/beans/JdoBeanTypeClassifier.java
@@ -27,8 +27,8 @@ import org.apache.causeway.commons.internal.reflection._Annotations;
import org.apache.causeway.applib.id.LogicalType;
import org.apache.causeway.applib.services.metamodel.BeanSort;
-import org.apache.causeway.core.config.beans.IsisBeanMetaData;
-import org.apache.causeway.core.config.beans.IsisBeanTypeClassifier;
+import org.apache.causeway.core.config.beans.CausewayBeanMetaData;
+import org.apache.causeway.core.config.beans.CausewayBeanTypeClassifier;
import lombok.val;
@@ -36,10 +36,10 @@ import lombok.val;
* ServiceLoader plugin, classifies PersistenceCapable types into BeanSort.ENTITY.
* @since 2.0
*/
-public class JdoBeanTypeClassifier implements IsisBeanTypeClassifier {
+public class JdoBeanTypeClassifier implements CausewayBeanTypeClassifier {
@Override
- public IsisBeanMetaData classify(final Class<?> type) {
+ public CausewayBeanMetaData classify(final Class<?> type) {
val persistenceCapableAnnot = _Annotations
.synthesize(type, javax.jdo.annotations.PersistenceCapable.class);
@@ -74,7 +74,7 @@ public class JdoBeanTypeClassifier implements IsisBeanTypeClassifier {
}
}
- return IsisBeanMetaData.isisManaged(BeanSort.ENTITY, logicalType);
+ return CausewayBeanMetaData.isisManaged(BeanSort.ENTITY, logicalType);
}
return null; // we don't see fit to classify given type
diff --git a/persistence/jdo/metamodel/src/main/resources/META-INF/services/org.apache.causeway.core.config.beans.IsisBeanTypeClassifier b/persistence/jdo/metamodel/src/main/resources/META-INF/services/org.apache.causeway.core.config.beans.CausewayBeanTypeClassifier
similarity index 100%
rename from persistence/jdo/metamodel/src/main/resources/META-INF/services/org.apache.causeway.core.config.beans.IsisBeanTypeClassifier
rename to persistence/jdo/metamodel/src/main/resources/META-INF/services/org.apache.causeway.core.config.beans.CausewayBeanTypeClassifier
diff --git a/persistence/jpa/applib/src/main/java/org/apache/causeway/persistence/jpa/applib/integration/IsisEntityListener.java b/persistence/jpa/applib/src/main/java/org/apache/causeway/persistence/jpa/applib/integration/CausewayEntityListener.java
similarity index 99%
rename from persistence/jpa/applib/src/main/java/org/apache/causeway/persistence/jpa/applib/integration/IsisEntityListener.java
rename to persistence/jpa/applib/src/main/java/org/apache/causeway/persistence/jpa/applib/integration/CausewayEntityListener.java
index 9870c99574..270a71776a 100644
--- a/persistence/jpa/applib/src/main/java/org/apache/causeway/persistence/jpa/applib/integration/IsisEntityListener.java
+++ b/persistence/jpa/applib/src/main/java/org/apache/causeway/persistence/jpa/applib/integration/CausewayEntityListener.java
@@ -60,7 +60,7 @@ import lombok.extern.log4j.Log4j2;
* @since 2.0 {@index}
*/
@Log4j2
-public class IsisEntityListener {
+public class CausewayEntityListener {
// not managed by Spring (directly)
//@Inject private ServiceInjector serviceInjector;
diff --git a/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/domainmodel/SpecloaderPerformanceTest.java b/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/domainmodel/SpecloaderPerformanceTest.java
index 995b4566b9..a30af7a370 100644
--- a/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/domainmodel/SpecloaderPerformanceTest.java
+++ b/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/domainmodel/SpecloaderPerformanceTest.java
@@ -37,7 +37,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.fail;
import org.apache.causeway.core.config.CausewayConfiguration;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.core.metamodel.specloader.SpecificationLoader;
import org.apache.causeway.testdomain.conf.Configuration_headless;
import org.apache.causeway.testdomain.model.good.Configuration_usingValidDomain;
@@ -55,8 +55,8 @@ import lombok.extern.log4j.Log4j2;
"isis.core.meta-model.validator.explicit-logical-type-names=FALSE", // does not override any of the imports
})
@TestPropertySource({
- IsisPresets.SilenceMetaModel,
- IsisPresets.SilenceProgrammingModel,
+ CausewayPresets.SilenceMetaModel,
+ CausewayPresets.SilenceProgrammingModel,
//IsisPresets.DebugProgrammingModel,
})
//XXX not a real test, just for performance tuning
diff --git a/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/entitychangetracking/jdo/JdoEntityChangePublishingTest.java b/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/entitychangetracking/jdo/JdoEntityChangePublishingTest.java
index 3de957e903..4af3b1c9bb 100644
--- a/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/entitychangetracking/jdo/JdoEntityChangePublishingTest.java
+++ b/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/entitychangetracking/jdo/JdoEntityChangePublishingTest.java
@@ -27,7 +27,7 @@ import org.springframework.test.context.TestPropertySource;
import static org.junit.jupiter.api.Assertions.assertEquals;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.testdomain.conf.Configuration_usingJdo;
import org.apache.causeway.testdomain.jdo.JdoInventoryManager;
import org.apache.causeway.testdomain.jdo.entities.JdoBook;
@@ -52,8 +52,8 @@ import lombok.val;
"logging.level.org.apache.causeway.persistence.jdo.datanucleus.persistence.IsisTransactionJdo=DEBUG"
})
@TestPropertySource({
- IsisPresets.SilenceWicket
- ,IsisPresets.UseLog4j2Test
+ CausewayPresets.SilenceWicket
+ ,CausewayPresets.UseLog4j2Test
})
class JdoEntityChangePublishingTest extends InteractionTestAbstract {
diff --git a/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/ldap/LdapEmbeddedServerTest.java b/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/ldap/LdapEmbeddedServerTest.java
index 84d6105ef0..1e467d6ae3 100644
--- a/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/ldap/LdapEmbeddedServerTest.java
+++ b/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/ldap/LdapEmbeddedServerTest.java
@@ -33,7 +33,7 @@ import org.springframework.test.context.TestPropertySource;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.fail;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.testdomain.ldap.LdapConstants;
import lombok.val;
@@ -41,7 +41,7 @@ import lombok.val;
@SpringBootTest(
classes = {LdapServerService.class}
)
-@TestPropertySource(IsisPresets.UseLog4j2Test)
+@TestPropertySource(CausewayPresets.UseLog4j2Test)
class LdapEmbeddedServerTest {
@Inject LdapServerService ldapServerService;
diff --git a/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/publishing/jdo/JdoCommandPublishingTest.java b/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/publishing/jdo/JdoCommandPublishingTest.java
index 112324a3ae..c9bcb4561e 100644
--- a/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/publishing/jdo/JdoCommandPublishingTest.java
+++ b/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/publishing/jdo/JdoCommandPublishingTest.java
@@ -23,7 +23,7 @@ import javax.inject.Inject;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.TestPropertySource;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.testdomain.conf.Configuration_usingJdo;
import org.apache.causeway.testdomain.jdo.HasPersistenceStandardJdo;
import org.apache.causeway.testdomain.publishing.PublishingTestFactoryAbstract;
@@ -45,7 +45,7 @@ import org.apache.causeway.testdomain.publishing.stubs.CommandPublishingTestAbst
"logging.level.org.apache.causeway.persistence.jdo.datanucleus.datanucleus.service.JdoPersistenceLifecycleService=DEBUG"
})
@TestPropertySource({
- IsisPresets.UseLog4j2Test
+ CausewayPresets.UseLog4j2Test
})
class JdoCommandPublishingTest
extends CommandPublishingTestAbstract
diff --git a/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/publishing/jdo/JdoEntityPublishingTest.java b/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/publishing/jdo/JdoEntityPublishingTest.java
index 9130ce8d75..e694fd9421 100644
--- a/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/publishing/jdo/JdoEntityPublishingTest.java
+++ b/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/publishing/jdo/JdoEntityPublishingTest.java
@@ -23,7 +23,7 @@ import javax.inject.Inject;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.TestPropertySource;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.testdomain.conf.Configuration_usingJdo;
import org.apache.causeway.testdomain.jdo.HasPersistenceStandardJdo;
import org.apache.causeway.testdomain.publishing.PublishingTestFactoryAbstract;
@@ -46,7 +46,7 @@ import org.apache.causeway.testdomain.publishing.stubs.EntityPublishingTestAbstr
"logging.level.org.apache.isis.testdomain.util.kv.KVStoreForTesting=DEBUG",
})
@TestPropertySource({
- IsisPresets.UseLog4j2Test
+ CausewayPresets.UseLog4j2Test
})
class JdoEntityPublishingTest
extends EntityPublishingTestAbstract
diff --git a/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/publishing/jdo/JdoExecutionPublishingTest.java b/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/publishing/jdo/JdoExecutionPublishingTest.java
index c9ed85637d..d6695b3ae5 100644
--- a/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/publishing/jdo/JdoExecutionPublishingTest.java
+++ b/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/publishing/jdo/JdoExecutionPublishingTest.java
@@ -23,7 +23,7 @@ import javax.inject.Inject;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.TestPropertySource;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.testdomain.conf.Configuration_usingJdo;
import org.apache.causeway.testdomain.jdo.HasPersistenceStandardJdo;
import org.apache.causeway.testdomain.publishing.PublishingTestFactoryAbstract;
@@ -45,7 +45,7 @@ import org.apache.causeway.testdomain.publishing.stubs.ExecutionPublishingTestAb
"logging.level.org.apache.causeway.persistence.jdo.datanucleus.datanucleus.service.JdoPersistenceLifecycleService=DEBUG"
})
@TestPropertySource({
- IsisPresets.UseLog4j2Test
+ CausewayPresets.UseLog4j2Test
})
class JdoExecutionPublishingTest
extends ExecutionPublishingTestAbstract
diff --git a/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/publishing/jdo/JdoLifecycleEventPublishingTest.java b/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/publishing/jdo/JdoLifecycleEventPublishingTest.java
index 0f13ed4099..2c4c3221a0 100644
--- a/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/publishing/jdo/JdoLifecycleEventPublishingTest.java
+++ b/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/publishing/jdo/JdoLifecycleEventPublishingTest.java
@@ -23,7 +23,7 @@ import javax.inject.Inject;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.TestPropertySource;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.testdomain.conf.Configuration_usingJdo;
import org.apache.causeway.testdomain.jdo.HasPersistenceStandardJdo;
import org.apache.causeway.testdomain.publishing.PublishingTestFactoryAbstract;
@@ -44,7 +44,7 @@ import org.apache.causeway.testdomain.publishing.stubs.LifecycleEventPublishingT
"logging.level.org.apache.isis.testdomain.util.kv.KVStoreForTesting=DEBUG",
})
@TestPropertySource({
- IsisPresets.UseLog4j2Test
+ CausewayPresets.UseLog4j2Test
})
class JdoLifecycleEventPublishingTest
extends LifecycleEventPublishingTestAbstract
diff --git a/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/publishing/jdo/JdoPropertyPublishingTest.java b/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/publishing/jdo/JdoPropertyPublishingTest.java
index e86ab6696e..bf5e3afe33 100644
--- a/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/publishing/jdo/JdoPropertyPublishingTest.java
+++ b/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/publishing/jdo/JdoPropertyPublishingTest.java
@@ -23,7 +23,7 @@ import javax.inject.Inject;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.TestPropertySource;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.testdomain.conf.Configuration_usingJdo;
import org.apache.causeway.testdomain.jdo.HasPersistenceStandardJdo;
import org.apache.causeway.testdomain.publishing.PublishingTestFactoryAbstract;
@@ -45,7 +45,7 @@ import org.apache.causeway.testdomain.publishing.stubs.PropertyPublishingTestAbs
"logging.level.org.apache.causeway.core.transaction.changetracking.EntityChangeTrackerDefault=DEBUG",
})
@TestPropertySource({
- IsisPresets.UseLog4j2Test
+ CausewayPresets.UseLog4j2Test
})
class JdoPropertyPublishingTest
extends PropertyPublishingTestAbstract
diff --git a/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/rest/CorsFilterTest.java b/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/rest/CorsFilterTest.java
index 35e7baf874..11642b1f52 100644
--- a/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/rest/CorsFilterTest.java
+++ b/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/rest/CorsFilterTest.java
@@ -37,7 +37,7 @@ import org.springframework.test.context.TestPropertySource;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.testdomain.conf.Configuration_headless;
import org.apache.causeway.testdomain.rospec.Configuration_usingRoSpec;
import org.apache.causeway.testdomain.rospec.RoSpecSampler;
@@ -60,7 +60,7 @@ import lombok.val;
"isis.extensions.cors.allowedOrigins=http://www.google.com",
},
webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-@TestPropertySource(IsisPresets.UseLog4j2Test)
+@TestPropertySource(CausewayPresets.UseLog4j2Test)
@Import({
Configuration_headless.class,
Configuration_usingRoSpec.class,
diff --git a/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/rest/DomainObjectResourceTest.java b/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/rest/DomainObjectResourceTest.java
index 8260a161c6..93523f0169 100644
--- a/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/rest/DomainObjectResourceTest.java
+++ b/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/rest/DomainObjectResourceTest.java
@@ -36,7 +36,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
import org.apache.causeway.applib.annotation.Where;
import org.apache.causeway.applib.layout.grid.bootstrap.BSGrid;
import org.apache.causeway.applib.services.factory.FactoryService;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.core.metamodel.facets.object.grid.GridFacet;
import org.apache.causeway.core.metamodel.objectmanager.ObjectManager;
import org.apache.causeway.testdomain.conf.Configuration_headless;
@@ -66,8 +66,8 @@ import lombok.val;
"logging.level.DependentArgUtils=DEBUG"
})
@TestPropertySource({
- IsisPresets.SilenceMetaModel,
- IsisPresets.SilenceProgrammingModel
+ CausewayPresets.SilenceMetaModel,
+ CausewayPresets.SilenceProgrammingModel
})
class DomainObjectResourceTest {
diff --git a/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/rest/MenuBarsResourceTest.java b/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/rest/MenuBarsResourceTest.java
index f379284c4b..5387f5fd1b 100644
--- a/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/rest/MenuBarsResourceTest.java
+++ b/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/rest/MenuBarsResourceTest.java
@@ -34,7 +34,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import org.apache.causeway.applib.annotation.Where;
import org.apache.causeway.applib.layout.component.ServiceActionLayoutData;
import org.apache.causeway.applib.services.menu.MenuBarsService;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.testdomain.conf.Configuration_headless;
import org.apache.causeway.testdomain.model.actnsemantics.Configuration_usingActionSemantics;
import org.apache.causeway.viewer.restfulobjects.applib.RepresentationType;
@@ -58,8 +58,8 @@ import lombok.val;
"logging.level.DependentArgUtils=DEBUG"
})
@TestPropertySource({
- IsisPresets.SilenceMetaModel,
- IsisPresets.SilenceProgrammingModel
+ CausewayPresets.SilenceMetaModel,
+ CausewayPresets.SilenceProgrammingModel
})
class MenuBarsResourceTest {
diff --git a/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/rest/RestServiceSimpifiedRepresentationTest.java b/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/rest/RestServiceSimpifiedRepresentationTest.java
index ecb37aeb1e..c53a4dc0dd 100644
--- a/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/rest/RestServiceSimpifiedRepresentationTest.java
+++ b/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/rest/RestServiceSimpifiedRepresentationTest.java
@@ -51,7 +51,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
import org.apache.causeway.applib.client.RepresentationTypeSimplifiedV2;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.testdomain.conf.Configuration_headless;
import org.apache.causeway.testdomain.rospec.BigComplex;
import org.apache.causeway.testdomain.rospec.Configuration_usingRoSpec;
@@ -84,7 +84,7 @@ import lombok.val;
//"logging.level.org.apache.causeway.extensions.restclient.ResponseDigest=DEBUG"
},
webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-@TestPropertySource(IsisPresets.UseLog4j2Test)
+@TestPropertySource(CausewayPresets.UseLog4j2Test)
@Import({
Configuration_headless.class,
Configuration_usingRoSpec.class,
diff --git a/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/shiro/ShiroLdapTest.java b/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/shiro/ShiroLdapTest.java
index fcf76ebd98..5db921629d 100644
--- a/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/shiro/ShiroLdapTest.java
+++ b/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/shiro/ShiroLdapTest.java
@@ -38,7 +38,7 @@ import static org.junit.Assert.assertTrue;
import static org.junit.jupiter.api.Assertions.assertThrows;
import org.apache.causeway.applib.services.inject.ServiceInjector;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.testdomain.conf.Configuration_usingJdoAndShiro;
import org.apache.causeway.testdomain.ldap.LdapConstants;
import org.apache.causeway.testdomain.ldap.LdapServerService;
@@ -53,7 +53,7 @@ import lombok.extern.log4j.Log4j2;
@Import({
LdapServerService.class,
})
-@TestPropertySource(IsisPresets.UseLog4j2Test)
+@TestPropertySource(CausewayPresets.UseLog4j2Test)
//XXX inconsistent state when run in a test batch
@Log4j2
class ShiroLdapTest extends AbstractShiroTest {
diff --git a/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/shiro/ShiroSecmanLdapTest.java b/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/shiro/ShiroSecmanLdapTest.java
index 5fe2ef91f4..fdb3a33654 100644
--- a/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/shiro/ShiroSecmanLdapTest.java
+++ b/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/shiro/ShiroSecmanLdapTest.java
@@ -39,7 +39,7 @@ import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
import org.apache.causeway.applib.services.inject.ServiceInjector;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.testdomain.conf.Configuration_usingJdoAndShiro;
import org.apache.causeway.testdomain.jdo.JdoTestDomainPersona;
import org.apache.causeway.testdomain.ldap.LdapConstants;
@@ -76,7 +76,7 @@ import lombok.val;
CausewayModuleExtSecmanEncryptionSpring.class,
})
@PropertySources({
- @PropertySource(IsisPresets.DatanucleusAutocreateNoValidate)
+ @PropertySource(CausewayPresets.DatanucleusAutocreateNoValidate)
})
class ShiroSecmanLdapTest extends AbstractShiroTest {
diff --git a/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/shiro/ShiroSecmanLdap_restfulStressTest.java b/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/shiro/ShiroSecmanLdap_restfulStressTest.java
index d6f178a177..61f070ebff 100644
--- a/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/shiro/ShiroSecmanLdap_restfulStressTest.java
+++ b/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/shiro/ShiroSecmanLdap_restfulStressTest.java
@@ -37,7 +37,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTimeout;
import org.apache.causeway.applib.services.inject.ServiceInjector;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.extensions.secman.delegated.shiro.realm.CausewayModuleExtSecmanShiroRealm;
import org.apache.causeway.extensions.secman.encryption.spring.CausewayModuleExtSecmanEncryptionSpring;
import org.apache.causeway.extensions.secman.integration.CausewayModuleExtSecmanIntegration;
@@ -78,7 +78,7 @@ import lombok.val;
CausewayModuleExtSecmanEncryptionSpring.class,
})
@PropertySources({
- @PropertySource(IsisPresets.DatanucleusAutocreateNoValidate)
+ @PropertySource(CausewayPresets.DatanucleusAutocreateNoValidate)
})
//XXX "does not work, when executed in sequence with other regressiontests
class ShiroSecmanLdap_restfulStressTest extends AbstractShiroTest {
diff --git a/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/shiro/ShiroSecmanTest.java b/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/shiro/ShiroSecmanTest.java
index 3411082db5..e9c8e9ba23 100644
--- a/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/shiro/ShiroSecmanTest.java
+++ b/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/shiro/ShiroSecmanTest.java
@@ -37,7 +37,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
import org.apache.causeway.applib.services.inject.ServiceInjector;
import org.apache.causeway.core.config.CausewayConfiguration;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.testdomain.conf.Configuration_usingJdoAndShiro;
import org.apache.causeway.extensions.secman.delegated.shiro.realm.CausewayModuleExtSecmanShiroRealm;
@@ -58,7 +58,7 @@ import lombok.val;
CausewayModuleExtSecmanPersistenceJdo.class,
CausewayModuleExtSecmanEncryptionSpring.class,
})
-@TestPropertySource(IsisPresets.UseLog4j2Test)
+@TestPropertySource(CausewayPresets.UseLog4j2Test)
class ShiroSecmanTest extends AbstractShiroTest {
@Inject CausewayConfiguration isisConfig;
diff --git a/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/wrapper/WrapperAsyncTest.java b/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/wrapper/WrapperAsyncTest.java
index 1f8b71161b..c74bd3f4fc 100644
--- a/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/wrapper/WrapperAsyncTest.java
+++ b/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/wrapper/WrapperAsyncTest.java
@@ -46,7 +46,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
import org.apache.causeway.applib.services.factory.FactoryService;
import org.apache.causeway.applib.services.repository.RepositoryService;
import org.apache.causeway.applib.services.wrapper.WrapperFactory;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.testdomain.conf.Configuration_usingJdo;
import org.apache.causeway.testdomain.jdo.JdoInventoryManager;
import org.apache.causeway.testdomain.jdo.entities.JdoProduct;
@@ -63,7 +63,7 @@ import lombok.val;
WrapperAsyncTest.ActionDomainEventListener.class
}
)
-@TestPropertySource(IsisPresets.UseLog4j2Test)
+@TestPropertySource(CausewayPresets.UseLog4j2Test)
@DirtiesContext // because of the temporary installed ActionDomainEventListener
class WrapperAsyncTest extends IsisIntegrationTestAbstract {
diff --git a/regressiontests/incubating/src/test/resources/shiro-ldap.ini b/regressiontests/incubating/src/test/resources/shiro-ldap.ini
index f60760fbd5..25be2bb5f1 100644
--- a/regressiontests/incubating/src/test/resources/shiro-ldap.ini
+++ b/regressiontests/incubating/src/test/resources/shiro-ldap.ini
@@ -19,14 +19,14 @@
[main]
-contextFactory = org.apache.causeway.extensions.shirorealmldap.realm.impl.IsisLdapContextFactory
+contextFactory = org.apache.causeway.extensions.shirorealmldap.realm.impl.CausewayLdapContextFactory
contextFactory.url = ldap://localhost:10389
contextFactory.authenticationMechanism = simple
contextFactory.systemAuthenticationMechanism = simple
contextFactory.systemUsername = uid=admin,ou=system
contextFactory.systemPassword = secret
-ldapRealm = org.apache.causeway.extensions.shirorealmldap.realm.impl.IsisLdapRealm
+ldapRealm = org.apache.causeway.extensions.shirorealmldap.realm.impl.CausewayLdapRealm
ldapRealm.contextFactory = $contextFactory
ldapRealm.searchBase = ou=groups,o=mojo
diff --git a/regressiontests/incubating/src/test/resources/shiro-secman-ldap-cached.ini b/regressiontests/incubating/src/test/resources/shiro-secman-ldap-cached.ini
index 56f83a85ab..da9f9ddbf3 100644
--- a/regressiontests/incubating/src/test/resources/shiro-secman-ldap-cached.ini
+++ b/regressiontests/incubating/src/test/resources/shiro-secman-ldap-cached.ini
@@ -19,14 +19,14 @@
[main]
-contextFactory = org.apache.causeway.extensions.shirorealmldap.realm.impl.IsisLdapContextFactory
+contextFactory = org.apache.causeway.extensions.shirorealmldap.realm.impl.CausewayLdapContextFactory
contextFactory.url = ldap://localhost:10389
contextFactory.authenticationMechanism = simple
contextFactory.systemAuthenticationMechanism = simple
contextFactory.systemUsername = uid=admin,ou=system
contextFactory.systemPassword = secret
-ldapRealm = org.apache.causeway.extensions.shirorealmldap.realm.impl.IsisLdapRealm
+ldapRealm = org.apache.causeway.extensions.shirorealmldap.realm.impl.CausewayLdapRealm
ldapRealm.contextFactory = $contextFactory
ldapRealm.searchBase = ou=groups,o=mojo
ldapRealm.groupObjectClass = groupOfUniqueNames
@@ -34,14 +34,14 @@ ldapRealm.uniqueMemberAttribute = uniqueMember
ldapRealm.uniqueMemberAttributeValueTemplate = uid={0}
authenticationStrategy=org.apache.causeway.extensions.secman.delegated.shiro.realm.AuthenticationStrategyForSecMan
-isisModuleSecurityRealm=org.apache.causeway.extensions.secman.delegated.shiro.realm.IsisModuleExtSecmanShiroRealm
-isisModuleSecurityRealm.delegateAuthenticationRealm=$ldapRealm
-isisModuleSecurityRealm.authenticationCachingEnabled = true
+causewayModuleSecurityRealm=org.apache.causeway.extensions.secman.delegated.shiro.realm.CausewayModuleExtSecmanShiroRealm
+causewayModuleSecurityRealm.delegateAuthenticationRealm=$ldapRealm
+causewayModuleSecurityRealm.authenticationCachingEnabled = true
cacheManager = org.apache.shiro.cache.MemoryConstrainedCacheManager
securityManager.authenticator.authenticationStrategy = $authenticationStrategy
-securityManager.realms = $isisModuleSecurityRealm
+securityManager.realms = $causewayModuleSecurityRealm
securityManager.cacheManager = $cacheManager
[users]
diff --git a/regressiontests/incubating/src/test/resources/shiro-secman-ldap.ini b/regressiontests/incubating/src/test/resources/shiro-secman-ldap.ini
index a374bf97d1..338714a551 100644
--- a/regressiontests/incubating/src/test/resources/shiro-secman-ldap.ini
+++ b/regressiontests/incubating/src/test/resources/shiro-secman-ldap.ini
@@ -19,14 +19,14 @@
[main]
-contextFactory = org.apache.causeway.extensions.shirorealmldap.realm.impl.IsisLdapContextFactory
+contextFactory = org.apache.causeway.extensions.shirorealmldap.realm.impl.CausewayLdapContextFactory
contextFactory.url = ldap://localhost:10389
contextFactory.authenticationMechanism = simple
contextFactory.systemAuthenticationMechanism = simple
contextFactory.systemUsername = uid=admin,ou=system
contextFactory.systemPassword = secret
-ldapRealm = org.apache.causeway.extensions.shirorealmldap.realm.impl.IsisLdapRealm
+ldapRealm = org.apache.causeway.extensions.shirorealmldap.realm.impl.CausewayLdapRealm
ldapRealm.contextFactory = $contextFactory
ldapRealm.searchBase = ou=groups,o=mojo
ldapRealm.groupObjectClass = groupOfUniqueNames
@@ -34,11 +34,11 @@ ldapRealm.uniqueMemberAttribute = uniqueMember
ldapRealm.uniqueMemberAttributeValueTemplate = uid={0}
authenticationStrategy=org.apache.causeway.extensions.secman.delegated.shiro.realm.AuthenticationStrategyForSecMan
-isisModuleSecurityRealm=org.apache.causeway.extensions.secman.delegated.shiro.realm.IsisModuleExtSecmanShiroRealm
-isisModuleSecurityRealm.delegateAuthenticationRealm=$ldapRealm
+causewayModuleSecurityRealm=org.apache.causeway.extensions.secman.delegated.shiro.realm.CausewayModuleExtSecmanShiroRealm
+causewayModuleSecurityRealm.delegateAuthenticationRealm=$ldapRealm
securityManager.authenticator.authenticationStrategy = $authenticationStrategy
-securityManager.realms = $isisModuleSecurityRealm
+securityManager.realms = $causewayModuleSecurityRealm
[users]
# unused
diff --git a/regressiontests/incubating/src/test/resources/shiro-secman.ini b/regressiontests/incubating/src/test/resources/shiro-secman.ini
index 5e77beea89..59085f0c10 100644
--- a/regressiontests/incubating/src/test/resources/shiro-secman.ini
+++ b/regressiontests/incubating/src/test/resources/shiro-secman.ini
@@ -20,10 +20,10 @@
[main]
authenticationStrategy=org.apache.causeway.extensions.secman.delegated.shiro.realm.AuthenticationStrategyForSecMan
-isisModuleSecurityRealm=org.apache.causeway.extensions.secman.delegated.shiro.realm.IsisModuleExtSecmanShiroRealm
+causewayModuleSecurityRealm=org.apache.causeway.extensions.secman.delegated.shiro.realm.CausewayModuleExtSecmanShiroRealm
securityManager.authenticator.authenticationStrategy = $authenticationStrategy
-securityManager.realms = $isisModuleSecurityRealm
+securityManager.realms = $causewayModuleSecurityRealm
[users]
[roles]
diff --git a/regressiontests/stable-bootstrapping/src/test/java/org/apache/causeway/testdomain/bootstrapping/AutoConfigurationTest.java b/regressiontests/stable-bootstrapping/src/test/java/org/apache/causeway/testdomain/bootstrapping/AutoConfigurationTest.java
index f1ea15cc72..5469b5cb7f 100644
--- a/regressiontests/stable-bootstrapping/src/test/java/org/apache/causeway/testdomain/bootstrapping/AutoConfigurationTest.java
+++ b/regressiontests/stable-bootstrapping/src/test/java/org/apache/causeway/testdomain/bootstrapping/AutoConfigurationTest.java
@@ -35,10 +35,10 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
import org.apache.causeway.applib.services.registry.ServiceRegistry;
import org.apache.causeway.core.config.beans.IsisBeanFactoryPostProcessorForSpring;
-import org.apache.causeway.core.config.beans.IsisBeanTypeRegistry;
+import org.apache.causeway.core.config.beans.CausewayBeanTypeRegistry;
import org.apache.causeway.core.config.beans.IsisBeanTypeRegistryDefault;
import org.apache.causeway.core.config.environment.CausewaySystemEnvironment;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.core.metamodel.context.MetaModelContexts;
import org.apache.causeway.core.metamodel.services.registry.ServiceRegistryDefault;
import org.apache.causeway.testdomain.conf.Configuration_usingStereotypes;
@@ -63,15 +63,15 @@ import lombok.val;
// "logging.level.ObjectSpecificationAbstract=TRACE"
})
@TestPropertySource({
- IsisPresets.SilenceMetaModel,
- IsisPresets.SilenceProgrammingModel,
- IsisPresets.UseLog4j2Test,
+ CausewayPresets.SilenceMetaModel,
+ CausewayPresets.SilenceProgrammingModel,
+ CausewayPresets.UseLog4j2Test,
})
class AutoConfigurationTest {
@Inject private ApplicationContext applicationContext;
@Inject private CausewaySystemEnvironment isisSystemEnvironment;
- @Inject private IsisBeanTypeRegistry isisBeanTypeRegistry;
+ @Inject private CausewayBeanTypeRegistry isisBeanTypeRegistry;
@Inject private ServiceRegistry serviceRegistry;
//XXX for debugging and experimenting
diff --git a/regressiontests/stable-bootstrapping/src/test/java/org/apache/causeway/testdomain/bootstrapping/SpringServiceInjectPriorityTest.java b/regressiontests/stable-bootstrapping/src/test/java/org/apache/causeway/testdomain/bootstrapping/SpringServiceInjectPriorityTest.java
index 6cd9c2f262..8f3290fde5 100644
--- a/regressiontests/stable-bootstrapping/src/test/java/org/apache/causeway/testdomain/bootstrapping/SpringServiceInjectPriorityTest.java
+++ b/regressiontests/stable-bootstrapping/src/test/java/org/apache/causeway/testdomain/bootstrapping/SpringServiceInjectPriorityTest.java
@@ -44,7 +44,7 @@ import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.applib.services.inject.ServiceInjector;
import org.apache.causeway.applib.services.message.MessageService;
import org.apache.causeway.applib.services.registry.ServiceRegistry;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.core.runtimeservices.message.MessageServiceDefault;
import org.apache.causeway.testdomain.conf.Configuration_headless;
@@ -66,9 +66,9 @@ import lombok.val;
// "logging.level.ObjectSpecificationAbstract=TRACE"
})
@TestPropertySource({
- IsisPresets.SilenceMetaModel,
- IsisPresets.SilenceProgrammingModel,
- IsisPresets.UseLog4j2Test
+ CausewayPresets.SilenceMetaModel,
+ CausewayPresets.SilenceProgrammingModel,
+ CausewayPresets.UseLog4j2Test
})
class SpringServiceInjectPriorityTest {
diff --git a/regressiontests/stable-bootstrapping/src/test/java/org/apache/causeway/testdomain/bootstrapping/SpringServiceProvisioningTest.java b/regressiontests/stable-bootstrapping/src/test/java/org/apache/causeway/testdomain/bootstrapping/SpringServiceProvisioningTest.java
index c414832781..d4ff24c5e3 100644
--- a/regressiontests/stable-bootstrapping/src/test/java/org/apache/causeway/testdomain/bootstrapping/SpringServiceProvisioningTest.java
+++ b/regressiontests/stable-bootstrapping/src/test/java/org/apache/causeway/testdomain/bootstrapping/SpringServiceProvisioningTest.java
@@ -41,7 +41,7 @@ import static org.junit.jupiter.api.Assertions.assertFalse;
import org.apache.causeway.applib.services.registry.ServiceRegistry;
import org.apache.causeway.core.config.environment.CausewaySystemEnvironment;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.testdomain.conf.Configuration_headless;
import lombok.val;
@@ -58,9 +58,9 @@ import lombok.val;
})
@TestPropertySource({
//IsisPresets.DebugDiscovery
- IsisPresets.SilenceMetaModel,
- IsisPresets.SilenceProgrammingModel,
- IsisPresets.UseLog4j2Test,
+ CausewayPresets.SilenceMetaModel,
+ CausewayPresets.SilenceProgrammingModel,
+ CausewayPresets.UseLog4j2Test,
})
//@Incubating("with development work on 'v2' the reference list of services constantly changes")
class SpringServiceProvisioningTest {
diff --git a/regressiontests/stable-cmdexecauditsess/generic/src/main/java/org/apache/causeway/regressiontests/cmdexecauditsess/generic/integtest/CmdExecAuditSessLog_IntegTestAbstract.java b/regressiontests/stable-cmdexecauditsess/generic/src/main/java/org/apache/causeway/regressiontests/cmdexecauditsess/generic/integtest/CmdExecAuditSessLog_IntegTestAbstract.java
index d0917f0ca3..8be5e90666 100644
--- a/regressiontests/stable-cmdexecauditsess/generic/src/main/java/org/apache/causeway/regressiontests/cmdexecauditsess/generic/integtest/CmdExecAuditSessLog_IntegTestAbstract.java
+++ b/regressiontests/stable-cmdexecauditsess/generic/src/main/java/org/apache/causeway/regressiontests/cmdexecauditsess/generic/integtest/CmdExecAuditSessLog_IntegTestAbstract.java
@@ -36,8 +36,8 @@ import org.apache.causeway.applib.services.clock.ClockService;
import org.apache.causeway.applib.services.iactnlayer.InteractionService;
import org.apache.causeway.applib.services.sudo.SudoService;
import org.apache.causeway.applib.services.wrapper.WrapperFactory;
-import org.apache.causeway.core.config.beans.IsisBeanTypeRegistry;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.beans.CausewayBeanTypeRegistry;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.core.metamodel.facets.object.publish.entitychange.EntityChangePublishingFacet;
import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
import org.apache.causeway.core.metamodel.specloader.SpecificationLoader;
@@ -63,7 +63,7 @@ public abstract class CmdExecAuditSessLog_IntegTestAbstract extends IsisIntegrat
@BeforeAll
static void beforeAll() {
- IsisPresets.forcePrototyping();
+ CausewayPresets.forcePrototyping();
}
Bookmark target1;
@@ -333,6 +333,6 @@ public abstract class CmdExecAuditSessLog_IntegTestAbstract extends IsisIntegrat
@Inject WrapperFactory wrapperFactory;
@Inject BookmarkService bookmarkService;
- @Inject IsisBeanTypeRegistry isisBeanTypeRegistry;
+ @Inject CausewayBeanTypeRegistry isisBeanTypeRegistry;
}
diff --git a/regressiontests/stable-cmdexecauditsess/persistence-jdo/src/test/java/org/apache/causeway/regressiontests/cmdexecauditsess/jdo/integtests/CmdExecAuditSessLog_IntegTest.java b/regressiontests/stable-cmdexecauditsess/persistence-jdo/src/test/java/org/apache/causeway/regressiontests/cmdexecauditsess/jdo/integtests/CmdExecAuditSessLog_IntegTest.java
index bc81d7ed26..c043b06047 100644
--- a/regressiontests/stable-cmdexecauditsess/persistence-jdo/src/test/java/org/apache/causeway/regressiontests/cmdexecauditsess/jdo/integtests/CmdExecAuditSessLog_IntegTest.java
+++ b/regressiontests/stable-cmdexecauditsess/persistence-jdo/src/test/java/org/apache/causeway/regressiontests/cmdexecauditsess/jdo/integtests/CmdExecAuditSessLog_IntegTest.java
@@ -27,7 +27,7 @@ import org.springframework.context.annotation.PropertySource;
import org.springframework.context.annotation.PropertySources;
import org.springframework.test.context.ActiveProfiles;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.core.runtimeservices.CausewayModuleCoreRuntimeServices;
import org.apache.causeway.extensions.audittrail.jdo.CausewayModuleExtAuditTrailPersistenceJdo;
import org.apache.causeway.extensions.commandlog.jdo.CausewayModuleExtCommandLogPersistenceJdo;
@@ -59,7 +59,7 @@ public class CmdExecAuditSessLog_IntegTest extends CmdExecAuditSessLog_IntegTest
CausewayModuleExtSessionLogPersistenceJdo.class,
})
@PropertySources({
- @PropertySource(IsisPresets.UseLog4j2Test)
+ @PropertySource(CausewayPresets.UseLog4j2Test)
})
@ComponentScan(basePackageClasses = {AppManifest.class, CmdExecAuditSessTestDomainModel.class, CounterRepository.class})
public static class AppManifest {
diff --git a/regressiontests/stable-cmdexecauditsess/persistence-jpa/src/test/java/org/apache/causeway/regressiontests/cmdexecauditsess/jpa/integtests/CmdExecAuditSessLog_IntegTest.java b/regressiontests/stable-cmdexecauditsess/persistence-jpa/src/test/java/org/apache/causeway/regressiontests/cmdexecauditsess/jpa/integtests/CmdExecAuditSessLog_IntegTest.java
index 019f9d4aa6..1a9184ff49 100644
--- a/regressiontests/stable-cmdexecauditsess/persistence-jpa/src/test/java/org/apache/causeway/regressiontests/cmdexecauditsess/jpa/integtests/CmdExecAuditSessLog_IntegTest.java
+++ b/regressiontests/stable-cmdexecauditsess/persistence-jpa/src/test/java/org/apache/causeway/regressiontests/cmdexecauditsess/jpa/integtests/CmdExecAuditSessLog_IntegTest.java
@@ -28,7 +28,7 @@ import org.springframework.context.annotation.PropertySource;
import org.springframework.context.annotation.PropertySources;
import org.springframework.test.context.ActiveProfiles;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.core.runtimeservices.CausewayModuleCoreRuntimeServices;
import org.apache.causeway.extensions.audittrail.jpa.CausewayModuleExtAuditTrailPersistenceJpa;
import org.apache.causeway.extensions.commandlog.jpa.CausewayModuleExtCommandLogPersistenceJpa;
@@ -59,7 +59,7 @@ public class CmdExecAuditSessLog_IntegTest extends CmdExecAuditSessLog_IntegTest
CausewayModuleExtSessionLogPersistenceJpa.class,
})
@PropertySources({
- @PropertySource(IsisPresets.UseLog4j2Test)
+ @PropertySource(CausewayPresets.UseLog4j2Test)
})
@EntityScan(basePackageClasses = {Counter.class})
@ComponentScan(basePackageClasses = {AppManifest.class, CmdExecAuditSessTestDomainModel.class})
diff --git a/regressiontests/stable-config/src/test/java/org/apache/causeway/testdomain/config/FooTest.java b/regressiontests/stable-config/src/test/java/org/apache/causeway/testdomain/config/FooTest.java
index 6c10a8bf1a..205611e43b 100644
--- a/regressiontests/stable-config/src/test/java/org/apache/causeway/testdomain/config/FooTest.java
+++ b/regressiontests/stable-config/src/test/java/org/apache/causeway/testdomain/config/FooTest.java
@@ -36,7 +36,7 @@ import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
@SpringBootTest(
classes = {
@@ -49,7 +49,7 @@ import org.apache.causeway.core.config.presets.IsisPresets;
"foo.random-schema=test_${random.uuid}",
"foo.ConnectionURL=jdbc:h2:mem:test"
})
-@TestPropertySource(IsisPresets.UseLog4j2Test)
+@TestPropertySource(CausewayPresets.UseLog4j2Test)
@EnableConfigurationProperties(FooProperties.class)
class FooTest {
diff --git a/regressiontests/stable-config/src/test/java/org/apache/causeway/testdomain/config/IsisConfigBeanTest.java b/regressiontests/stable-config/src/test/java/org/apache/causeway/testdomain/config/IsisConfigBeanTest.java
index cfdab3ac20..22217f82df 100644
--- a/regressiontests/stable-config/src/test/java/org/apache/causeway/testdomain/config/IsisConfigBeanTest.java
+++ b/regressiontests/stable-config/src/test/java/org/apache/causeway/testdomain/config/IsisConfigBeanTest.java
@@ -29,7 +29,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.config.CausewayModuleCoreConfig;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
@SpringBootTest(
classes = {
@@ -37,7 +37,7 @@ import org.apache.causeway.core.config.presets.IsisPresets;
})
@TestPropertySource({
"classpath:/application-config-test.properties",
- IsisPresets.UseLog4j2Test
+ CausewayPresets.UseLog4j2Test
})
class IsisConfigBeanTest {
diff --git a/regressiontests/stable-config/src/test/java/org/apache/causeway/testdomain/config/IsisConfigBeanTest_usingHeadless.java b/regressiontests/stable-config/src/test/java/org/apache/causeway/testdomain/config/IsisConfigBeanTest_usingHeadless.java
index 3cf79673a8..f7edc748d1 100644
--- a/regressiontests/stable-config/src/test/java/org/apache/causeway/testdomain/config/IsisConfigBeanTest_usingHeadless.java
+++ b/regressiontests/stable-config/src/test/java/org/apache/causeway/testdomain/config/IsisConfigBeanTest_usingHeadless.java
@@ -28,7 +28,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
import org.apache.causeway.core.config.CausewayConfiguration;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.testdomain.conf.Configuration_headless;
@SpringBootTest(
@@ -38,7 +38,7 @@ import org.apache.causeway.testdomain.conf.Configuration_headless;
)
@TestPropertySource({
"classpath:/application-config-test.properties",
- IsisPresets.UseLog4j2Test
+ CausewayPresets.UseLog4j2Test
})
class IsisConfigBeanTest_usingHeadless {
diff --git a/regressiontests/stable-core-wrapperfactory/src/test/java/org/apache/isis/regressiontests/core/wrapperfactory/integtests/CoreWrapperFactory_IntegTestAbstract.java b/regressiontests/stable-core-wrapperfactory/src/test/java/org/apache/isis/regressiontests/core/wrapperfactory/integtests/CoreWrapperFactory_IntegTestAbstract.java
index 9dbcd2eda2..05c4503c6a 100644
--- a/regressiontests/stable-core-wrapperfactory/src/test/java/org/apache/isis/regressiontests/core/wrapperfactory/integtests/CoreWrapperFactory_IntegTestAbstract.java
+++ b/regressiontests/stable-core-wrapperfactory/src/test/java/org/apache/isis/regressiontests/core/wrapperfactory/integtests/CoreWrapperFactory_IntegTestAbstract.java
@@ -31,7 +31,7 @@ import org.springframework.context.annotation.PropertySources;
import org.springframework.test.context.ActiveProfiles;
import org.springframework.transaction.annotation.Propagation;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.persistence.jdo.datanucleus.CausewayModulePersistenceJdoDatanucleus;
import org.apache.causeway.testing.fixtures.applib.IsisIntegrationTestAbstractWithFixtures;
import org.apache.causeway.testing.fixtures.applib.CausewayModuleTestingFixturesApplib;
@@ -59,17 +59,17 @@ public abstract class CoreWrapperFactory_IntegTestAbstract extends IsisIntegrati
WrapperTestFixtures.class,
})
@PropertySources({
- @PropertySource(IsisPresets.H2InMemory_withUniqueSchema),
- @PropertySource(IsisPresets.DatanucleusAutocreateNoValidate),
- @PropertySource(IsisPresets.DatanucleusEagerlyCreateTables),
- @PropertySource(IsisPresets.UseLog4j2Test),
+ @PropertySource(CausewayPresets.H2InMemory_withUniqueSchema),
+ @PropertySource(CausewayPresets.DatanucleusAutocreateNoValidate),
+ @PropertySource(CausewayPresets.DatanucleusEagerlyCreateTables),
+ @PropertySource(CausewayPresets.UseLog4j2Test),
})
public static class AppManifest {
}
@BeforeAll
static void beforeAll() {
- IsisPresets.forcePrototyping();
+ CausewayPresets.forcePrototyping();
}
protected Counter newCounter(final String name) {
diff --git a/regressiontests/stable-domainmodel/src/test/java/org/apache/causeway/testdomain/domainmodel/AnnotationSyntesizerTest.java b/regressiontests/stable-domainmodel/src/test/java/org/apache/causeway/testdomain/domainmodel/AnnotationSyntesizerTest.java
index ec6c938d9f..85379fb3b8 100644
--- a/regressiontests/stable-domainmodel/src/test/java/org/apache/causeway/testdomain/domainmodel/AnnotationSyntesizerTest.java
+++ b/regressiontests/stable-domainmodel/src/test/java/org/apache/causeway/testdomain/domainmodel/AnnotationSyntesizerTest.java
@@ -34,7 +34,7 @@ import org.apache.causeway.applib.events.domain.ActionDomainEvent;
import org.apache.causeway.applib.services.jaxb.JaxbService;
import org.apache.causeway.applib.services.metamodel.Config;
import org.apache.causeway.applib.services.metamodel.MetaModelService;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.schema.metamodel.v2.DomainClassDto;
import org.apache.causeway.testdomain.conf.Configuration_headless;
import org.apache.causeway.testdomain.model.bad.Configuration_usingInvalidDomain;
@@ -55,8 +55,8 @@ import lombok.val;
@TestPropertySource({
//IsisPresets.DebugMetaModel,
//IsisPresets.DebugProgrammingModel,
- IsisPresets.SilenceMetaModel,
- IsisPresets.SilenceProgrammingModel
+ CausewayPresets.SilenceMetaModel,
+ CausewayPresets.SilenceProgrammingModel
})
class AnnotationSyntesizerTest {
diff --git a/regressiontests/stable-domainmodel/src/test/java/org/apache/causeway/testdomain/domainmodel/DomainModelTest_forEditing.java b/regressiontests/stable-domainmodel/src/test/java/org/apache/causeway/testdomain/domainmodel/DomainModelTest_forEditing.java
index 18959b1870..1b36fcfe0e 100644
--- a/regressiontests/stable-domainmodel/src/test/java/org/apache/causeway/testdomain/domainmodel/DomainModelTest_forEditing.java
+++ b/regressiontests/stable-domainmodel/src/test/java/org/apache/causeway/testdomain/domainmodel/DomainModelTest_forEditing.java
@@ -34,7 +34,7 @@ import org.apache.causeway.applib.annotation.Nature;
import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.services.wrapper.DisabledException;
import org.apache.causeway.applib.services.wrapper.WrapperFactory;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.core.metamodel.specloader.SpecificationLoader;
import org.apache.causeway.core.metamodel.specloader.specimpl.IntrospectionState;
import org.apache.causeway.testdomain.conf.Configuration_headless;
@@ -53,10 +53,10 @@ import lombok.val;
"isis.core.meta-model.validator.explicit-object-type=FALSE", // does not override any of the imports
})
@TestPropertySource({
- IsisPresets.IntrospectFully,
- IsisPresets.UseLog4j2Test,
- IsisPresets.SilenceMetaModel,
- IsisPresets.SilenceProgrammingModel
+ CausewayPresets.IntrospectFully,
+ CausewayPresets.UseLog4j2Test,
+ CausewayPresets.SilenceMetaModel,
+ CausewayPresets.SilenceProgrammingModel
})
class DomainModelTest_forEditing extends IsisIntegrationTestAbstract {
diff --git a/regressiontests/stable-domainmodel/src/test/java/org/apache/causeway/testdomain/domainmodel/DomainModelTest_usingBadDomain.java b/regressiontests/stable-domainmodel/src/test/java/org/apache/causeway/testdomain/domainmodel/DomainModelTest_usingBadDomain.java
index d33749ed9e..5841dba0d3 100644
--- a/regressiontests/stable-domainmodel/src/test/java/org/apache/causeway/testdomain/domainmodel/DomainModelTest_usingBadDomain.java
+++ b/regressiontests/stable-domainmodel/src/test/java/org/apache/causeway/testdomain/domainmodel/DomainModelTest_usingBadDomain.java
@@ -46,7 +46,7 @@ import org.apache.causeway.applib.services.iactnlayer.InteractionService;
import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.config.environment.CausewaySystemEnvironment;
import org.apache.causeway.core.config.metamodel.specloader.IntrospectionMode;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.core.config.progmodel.ProgrammingModelConstants;
import org.apache.causeway.core.config.progmodel.ProgrammingModelConstants.Validation;
import org.apache.causeway.core.metamodel.specloader.SpecificationLoader;
@@ -84,8 +84,8 @@ import lombok.val;
@TestPropertySource({
//IsisPresets.DebugMetaModel,
//IsisPresets.DebugProgrammingModel,
- IsisPresets.SilenceMetaModel,
- IsisPresets.SilenceProgrammingModel
+ CausewayPresets.SilenceMetaModel,
+ CausewayPresets.SilenceProgrammingModel
})
class DomainModelTest_usingBadDomain {
diff --git a/regressiontests/stable-domainmodel/src/test/java/org/apache/causeway/testdomain/domainmodel/DomainModelTest_usingBadDomain_noAnnotationEnforced.java b/regressiontests/stable-domainmodel/src/test/java/org/apache/causeway/testdomain/domainmodel/DomainModelTest_usingBadDomain_noAnnotationEnforced.java
index 528522e3d5..97232748c4 100644
--- a/regressiontests/stable-domainmodel/src/test/java/org/apache/causeway/testdomain/domainmodel/DomainModelTest_usingBadDomain_noAnnotationEnforced.java
+++ b/regressiontests/stable-domainmodel/src/test/java/org/apache/causeway/testdomain/domainmodel/DomainModelTest_usingBadDomain_noAnnotationEnforced.java
@@ -30,7 +30,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.config.environment.CausewaySystemEnvironment;
import org.apache.causeway.core.config.metamodel.specloader.IntrospectionMode;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.core.config.progmodel.ProgrammingModelConstants;
import org.apache.causeway.testdomain.conf.Configuration_headless;
import org.apache.causeway.testdomain.model.badnoactenforce.Configuration_usingInvalidDomain_noActionEnforced;
@@ -51,8 +51,8 @@ import lombok.val;
@TestPropertySource({
//IsisPresets.DebugMetaModel,
//IsisPresets.DebugProgrammingModel,
- IsisPresets.SilenceMetaModel,
- IsisPresets.SilenceProgrammingModel
+ CausewayPresets.SilenceMetaModel,
+ CausewayPresets.SilenceProgrammingModel
})
class DomainModelTest_usingBadDomain_noAnnotationEnforced {
diff --git a/regressiontests/stable-domainmodel/src/test/java/org/apache/causeway/testdomain/domainmodel/DomainModelTest_usingGoodDomain.java b/regressiontests/stable-domainmodel/src/test/java/org/apache/causeway/testdomain/domainmodel/DomainModelTest_usingGoodDomain.java
index 976b304e84..59c9edb9bd 100644
--- a/regressiontests/stable-domainmodel/src/test/java/org/apache/causeway/testdomain/domainmodel/DomainModelTest_usingGoodDomain.java
+++ b/regressiontests/stable-domainmodel/src/test/java/org/apache/causeway/testdomain/domainmodel/DomainModelTest_usingGoodDomain.java
@@ -50,7 +50,7 @@ import org.apache.causeway.applib.services.metamodel.MetaModelService;
import org.apache.causeway.applib.services.registry.ServiceRegistry;
import org.apache.causeway.applib.services.title.TitleService;
import org.apache.causeway.core.config.CausewayConfiguration;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.all.named.MemberNamedFacet;
import org.apache.causeway.core.metamodel.facets.members.publish.execution.ExecutionPublishingFacet;
@@ -112,8 +112,8 @@ import lombok.val;
@TestPropertySource({
//IsisPresets.DebugMetaModel,
//IsisPresets.DebugProgrammingModel,
- IsisPresets.SilenceMetaModel,
- IsisPresets.SilenceProgrammingModel
+ CausewayPresets.SilenceMetaModel,
+ CausewayPresets.SilenceProgrammingModel
})
class DomainModelTest_usingGoodDomain {
diff --git a/regressiontests/stable-domainmodel/src/test/java/org/apache/causeway/testdomain/domainmodel/MetaModelRegressionTest.java b/regressiontests/stable-domainmodel/src/test/java/org/apache/causeway/testdomain/domainmodel/MetaModelRegressionTest.java
index 4d6aa7b744..e4e0aa730e 100644
--- a/regressiontests/stable-domainmodel/src/test/java/org/apache/causeway/testdomain/domainmodel/MetaModelRegressionTest.java
+++ b/regressiontests/stable-domainmodel/src/test/java/org/apache/causeway/testdomain/domainmodel/MetaModelRegressionTest.java
@@ -28,7 +28,7 @@ import org.apache.causeway.applib.services.factory.FactoryService;
import org.apache.causeway.applib.services.metamodel.MetaModelServiceMenu;
import org.apache.causeway.applib.value.Blob;
import org.apache.causeway.applib.value.NamedWithMimeType.CommonMimeType;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.testdomain.conf.Configuration_headless;
import org.apache.causeway.testdomain.model.good.Configuration_usingValidDomain;
import org.approvaltests.Approvals;
@@ -57,8 +57,8 @@ import lombok.val;
"isis.core.meta-model.validator.explicit-object-type=FALSE", // does not override any of the imports
})
@TestPropertySource({
- IsisPresets.SilenceMetaModel,
- IsisPresets.SilenceProgrammingModel
+ CausewayPresets.SilenceMetaModel,
+ CausewayPresets.SilenceProgrammingModel
})
//uncomment if intended only for manual verification.
//@DisabledIfSystemProperty(named = "isRunningWithSurefire", matches = "true")
diff --git a/regressiontests/stable-domainmodel/src/test/java/org/apache/causeway/testdomain/domainmodel/SpecLoaderTest.java b/regressiontests/stable-domainmodel/src/test/java/org/apache/causeway/testdomain/domainmodel/SpecLoaderTest.java
index 9549da2f6d..18f117d948 100644
--- a/regressiontests/stable-domainmodel/src/test/java/org/apache/causeway/testdomain/domainmodel/SpecLoaderTest.java
+++ b/regressiontests/stable-domainmodel/src/test/java/org/apache/causeway/testdomain/domainmodel/SpecLoaderTest.java
@@ -30,7 +30,7 @@ import org.springframework.test.context.TestPropertySource;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.core.metamodel.specloader.SpecificationLoader;
import org.apache.causeway.testdomain.conf.Configuration_headless;
import org.apache.causeway.testdomain.model.good.Configuration_usingValidDomain;
@@ -50,8 +50,8 @@ import lombok.val;
"logging.level.DependentArgUtils=DEBUG"
})
@TestPropertySource({
- IsisPresets.SilenceMetaModel,
- IsisPresets.SilenceProgrammingModel
+ CausewayPresets.SilenceMetaModel,
+ CausewayPresets.SilenceProgrammingModel
})
class SpecLoaderTest {
diff --git a/regressiontests/stable-factory/src/test/java/org/apache/causeway/testdomain/factory/ViewModelFactoryTest.java b/regressiontests/stable-factory/src/test/java/org/apache/causeway/testdomain/factory/ViewModelFactoryTest.java
index 5815ee8861..0b79125b91 100644
--- a/regressiontests/stable-factory/src/test/java/org/apache/causeway/testdomain/factory/ViewModelFactoryTest.java
+++ b/regressiontests/stable-factory/src/test/java/org/apache/causeway/testdomain/factory/ViewModelFactoryTest.java
@@ -30,7 +30,7 @@ import org.springframework.test.context.TestPropertySource;
import org.apache.causeway.applib.annotation.DomainObject;
import org.apache.causeway.applib.annotation.Nature;
import org.apache.causeway.applib.services.repository.RepositoryService;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.testdomain.conf.Configuration_headless;
import org.apache.causeway.testing.integtestsupport.applib.IsisIntegrationTestAbstract;
@@ -43,7 +43,7 @@ import lombok.val;
Configuration_headless.class,
}
)
-@TestPropertySource(IsisPresets.UseLog4j2Test)
+@TestPropertySource(CausewayPresets.UseLog4j2Test)
class ViewModelFactoryTest extends IsisIntegrationTestAbstract {
// -- VIEW MODEL SAMPLES
diff --git a/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/ActionInteractionTest.java b/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/ActionInteractionTest.java
index cd9d914ff8..cf0a848d81 100644
--- a/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/ActionInteractionTest.java
+++ b/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/ActionInteractionTest.java
@@ -33,7 +33,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import org.apache.causeway.applib.annotation.Where;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.core.metamodel.facets.actions.action.invocation.IdentifierUtil;
import org.apache.causeway.core.metamodel.interactions.InteractionHead;
import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
@@ -64,8 +64,8 @@ import lombok.val;
@TestPropertySource({
//IsisPresets.DebugMetaModel,
//IsisPresets.DebugProgrammingModel,
- IsisPresets.SilenceMetaModel,
- IsisPresets.SilenceProgrammingModel
+ CausewayPresets.SilenceMetaModel,
+ CausewayPresets.SilenceProgrammingModel
})
class ActionInteractionTest extends InteractionTestAbstract {
diff --git a/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/CollectionInteractionTest.java b/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/CollectionInteractionTest.java
index 81bc2febcd..9f3f80b8a4 100644
--- a/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/CollectionInteractionTest.java
+++ b/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/CollectionInteractionTest.java
@@ -28,7 +28,7 @@ import org.springframework.test.context.TestPropertySource;
import static org.junit.jupiter.api.Assertions.assertEquals;
import org.apache.causeway.applib.annotation.Where;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.core.metamodel.object.MmUnwrapUtil;
import org.apache.causeway.testdomain.conf.Configuration_headless;
import org.apache.causeway.testdomain.model.interaction.Configuration_usingInteractionDomain;
@@ -51,8 +51,8 @@ import lombok.val;
@TestPropertySource({
//IsisPresets.DebugMetaModel,
//IsisPresets.DebugProgrammingModel,
- IsisPresets.SilenceMetaModel,
- IsisPresets.SilenceProgrammingModel
+ CausewayPresets.SilenceMetaModel,
+ CausewayPresets.SilenceProgrammingModel
})
class CollectionInteractionTest extends InteractionTestAbstract {
diff --git a/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/CommandArgumentTest.java b/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/CommandArgumentTest.java
index fa68efe836..b81b0f34da 100644
--- a/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/CommandArgumentTest.java
+++ b/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/CommandArgumentTest.java
@@ -42,7 +42,7 @@ import org.apache.causeway.applib.annotation.DomainObject;
import org.apache.causeway.applib.annotation.Nature;
import org.apache.causeway.applib.annotation.Where;
import org.apache.causeway.applib.services.wrapper.control.AsyncControl;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.testdomain.conf.Configuration_headless;
import org.apache.causeway.testdomain.util.interaction.InteractionTestAbstract;
@@ -61,8 +61,8 @@ import lombok.val;
properties = {
})
@TestPropertySource({
- IsisPresets.SilenceMetaModel,
- IsisPresets.SilenceProgrammingModel
+ CausewayPresets.SilenceMetaModel,
+ CausewayPresets.SilenceProgrammingModel
})
class CommandArgumentTest extends InteractionTestAbstract {
diff --git a/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/CustomContextTest.java b/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/CustomContextTest.java
index 1cbd2b0072..fd51bc1cf8 100644
--- a/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/CustomContextTest.java
+++ b/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/CustomContextTest.java
@@ -32,7 +32,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
import org.apache.causeway.applib.services.iactnlayer.InteractionService;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.core.config.progmodel.ProgrammingModelConstants.DateTimeFormat;
import org.apache.causeway.testdomain.conf.Configuration_headless;
import org.apache.causeway.testdomain.model.interaction.Configuration_usingInteractionDomain;
@@ -49,8 +49,8 @@ import lombok.val;
properties = {
})
@TestPropertySource({
- IsisPresets.SilenceMetaModel,
- IsisPresets.SilenceProgrammingModel
+ CausewayPresets.SilenceMetaModel,
+ CausewayPresets.SilenceProgrammingModel
})
class CustomContextTest extends IsisIntegrationTestAbstract {
diff --git a/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/NewParameterModelTest.java b/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/NewParameterModelTest.java
index 9ae3b7f33c..ef2a04a9d4 100644
--- a/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/NewParameterModelTest.java
+++ b/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/NewParameterModelTest.java
@@ -30,7 +30,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
import org.apache.causeway.applib.annotation.Where;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.core.metamodel.facets.all.described.ParamDescribedFacet;
import org.apache.causeway.core.metamodel.facets.objectvalue.maxlen.MaxLengthFacet;
import org.apache.causeway.core.metamodel.object.ManagedObject;
@@ -57,8 +57,8 @@ import lombok.val;
@TestPropertySource({
//IsisPresets.DebugMetaModel,
//IsisPresets.DebugProgrammingModel,
- IsisPresets.SilenceMetaModel,
- IsisPresets.SilenceProgrammingModel
+ CausewayPresets.SilenceMetaModel,
+ CausewayPresets.SilenceProgrammingModel
})
class NewParameterModelTest extends InteractionTestAbstract {
diff --git a/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/PropertyBindingTest.java b/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/PropertyBindingTest.java
index 635604b345..aea04afca8 100644
--- a/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/PropertyBindingTest.java
+++ b/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/PropertyBindingTest.java
@@ -29,7 +29,7 @@ import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
import org.apache.causeway.applib.annotation.Where;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.core.metamodel.interactions.managed.PropertyNegotiationModel;
import org.apache.causeway.testdomain.conf.Configuration_headless;
import org.apache.causeway.testdomain.model.interaction.Configuration_usingInteractionDomain;
@@ -49,8 +49,8 @@ import lombok.val;
"isis.core.meta-model.validator.explicit-object-type=FALSE", // does not override any of the imports
})
@TestPropertySource({
- IsisPresets.SilenceMetaModel,
- IsisPresets.SilenceProgrammingModel
+ CausewayPresets.SilenceMetaModel,
+ CausewayPresets.SilenceProgrammingModel
})
class PropertyBindingTest extends InteractionTestAbstract {
diff --git a/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/PropertyInteractionTest.java b/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/PropertyInteractionTest.java
index a92a744c97..4be62c5c4c 100644
--- a/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/PropertyInteractionTest.java
+++ b/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/PropertyInteractionTest.java
@@ -26,7 +26,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import org.apache.causeway.applib.annotation.LabelPosition;
import org.apache.causeway.applib.annotation.Where;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.core.metamodel.facets.objectvalue.labelat.LabelAtFacet;
import org.apache.causeway.core.metamodel.facets.objectvalue.multiline.MultiLineFacet;
import org.apache.causeway.testdomain.conf.Configuration_headless;
@@ -50,8 +50,8 @@ import lombok.val;
@TestPropertySource({
//IsisPresets.DebugMetaModel,
//IsisPresets.DebugProgrammingModel,
- IsisPresets.SilenceMetaModel,
- IsisPresets.SilenceProgrammingModel
+ CausewayPresets.SilenceMetaModel,
+ CausewayPresets.SilenceProgrammingModel
})
class PropertyInteractionTest extends InteractionTestAbstract {
diff --git a/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/ScalarParamNegotiationTest.java b/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/ScalarParamNegotiationTest.java
index 173fb374b9..930a0411f9 100644
--- a/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/ScalarParamNegotiationTest.java
+++ b/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/ScalarParamNegotiationTest.java
@@ -28,7 +28,7 @@ import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
import org.apache.causeway.applib.annotation.Where;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.core.metamodel.interactions.managed.ParameterNegotiationModel;
import org.apache.causeway.testdomain.conf.Configuration_headless;
import org.apache.causeway.testdomain.model.interaction.Configuration_usingInteractionDomain;
@@ -49,8 +49,8 @@ import lombok.val;
"isis.core.meta-model.validator.explicit-object-type=FALSE", // does not override any of the imports
})
@TestPropertySource({
- IsisPresets.SilenceMetaModel,
- IsisPresets.SilenceProgrammingModel
+ CausewayPresets.SilenceMetaModel,
+ CausewayPresets.SilenceProgrammingModel
})
class ScalarParamNegotiationTest extends InteractionTestAbstract {
diff --git a/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/WrapperInteractionTest.java b/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/WrapperInteractionTest.java
index bb5b05e3a5..b0f47ec034 100644
--- a/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/WrapperInteractionTest.java
+++ b/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/WrapperInteractionTest.java
@@ -28,7 +28,7 @@ import org.apache.causeway.applib.annotation.Action;
import org.apache.causeway.applib.annotation.DomainObject;
import org.apache.causeway.applib.annotation.Nature;
import org.apache.causeway.applib.services.wrapper.InvalidException;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.core.metamodel.facets.all.named.MemberNamedFacet;
import org.apache.causeway.core.metamodel.spec.feature.MixedIn;
import org.apache.causeway.core.metamodel.spec.feature.ObjectAction;
@@ -58,8 +58,8 @@ import lombok.val;
}
)
@TestPropertySource({
- IsisPresets.SilenceMetaModel,
- IsisPresets.SilenceProgrammingModel
+ CausewayPresets.SilenceMetaModel,
+ CausewayPresets.SilenceProgrammingModel
})
class WrapperInteractionTest
extends InteractionTestAbstract {
diff --git a/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/WrapperInteractionTest2.java b/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/WrapperInteractionTest2.java
index 93d89d65fe..8bc3830d8e 100644
--- a/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/WrapperInteractionTest2.java
+++ b/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/WrapperInteractionTest2.java
@@ -28,7 +28,7 @@ import org.apache.causeway.applib.annotation.Action;
import org.apache.causeway.applib.annotation.DomainObject;
import org.apache.causeway.applib.annotation.Nature;
import org.apache.causeway.applib.services.wrapper.InvalidException;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.core.metamodel.facets.all.named.MemberNamedFacet;
import org.apache.causeway.core.metamodel.spec.feature.MixedIn;
import org.apache.causeway.core.metamodel.spec.feature.ObjectAction;
@@ -55,8 +55,8 @@ import lombok.val;
}
)
@TestPropertySource({
- IsisPresets.SilenceMetaModel,
- IsisPresets.SilenceProgrammingModel
+ CausewayPresets.SilenceMetaModel,
+ CausewayPresets.SilenceProgrammingModel
})
class WrapperInteractionTest2
extends InteractionTestAbstract {
diff --git a/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/WrapperInteractionTest3.java b/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/WrapperInteractionTest3.java
index 448df6bb8b..0dac2f8180 100644
--- a/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/WrapperInteractionTest3.java
+++ b/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/WrapperInteractionTest3.java
@@ -39,7 +39,7 @@ import org.apache.causeway.applib.annotation.DomainObject;
import org.apache.causeway.applib.annotation.Nature;
import org.apache.causeway.applib.annotation.Optionality;
import org.apache.causeway.applib.annotation.Property;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.core.metamodel.facets.all.named.MemberNamedFacet;
import org.apache.causeway.core.metamodel.spec.feature.MixedIn;
import org.apache.causeway.core.metamodel.spec.feature.ObjectAction;
@@ -63,8 +63,8 @@ import lombok.val;
}
)
@TestPropertySource({
- IsisPresets.SilenceMetaModel,
- IsisPresets.SilenceProgrammingModel
+ CausewayPresets.SilenceMetaModel,
+ CausewayPresets.SilenceProgrammingModel
})
class WrapperInteractionTest3
extends InteractionTestAbstract {
diff --git a/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/WrapperInteractionTest4.java b/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/WrapperInteractionTest4.java
index dbb612c99d..179b5ed4ab 100644
--- a/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/WrapperInteractionTest4.java
+++ b/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/WrapperInteractionTest4.java
@@ -39,7 +39,7 @@ import org.apache.causeway.applib.annotation.DomainObject;
import org.apache.causeway.applib.annotation.Nature;
import org.apache.causeway.applib.annotation.Optionality;
import org.apache.causeway.applib.annotation.Property;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.core.metamodel.facets.all.named.MemberNamedFacet;
import org.apache.causeway.core.metamodel.spec.feature.MixedIn;
import org.apache.causeway.core.metamodel.spec.feature.ObjectAction;
@@ -62,8 +62,8 @@ import lombok.val;
}
)
@TestPropertySource({
- IsisPresets.SilenceMetaModel,
- IsisPresets.SilenceProgrammingModel
+ CausewayPresets.SilenceMetaModel,
+ CausewayPresets.SilenceProgrammingModel
})
class WrapperInteractionTest4
extends InteractionTestAbstract {
diff --git a/regressiontests/stable-layouts/src/main/java/org/apache/causeway/regressiontests/layouts/integtest/Layout_Counter_IntegTest.java b/regressiontests/stable-layouts/src/main/java/org/apache/causeway/regressiontests/layouts/integtest/Layout_Counter_IntegTest.java
index f356a955e7..ad72a6d32b 100644
--- a/regressiontests/stable-layouts/src/main/java/org/apache/causeway/regressiontests/layouts/integtest/Layout_Counter_IntegTest.java
+++ b/regressiontests/stable-layouts/src/main/java/org/apache/causeway/regressiontests/layouts/integtest/Layout_Counter_IntegTest.java
@@ -56,8 +56,8 @@ import org.apache.causeway.applib.services.bookmark.BookmarkService;
import org.apache.causeway.applib.services.iactnlayer.InteractionService;
import org.apache.causeway.applib.services.metamodel.Config;
import org.apache.causeway.applib.services.metamodel.MetaModelService;
-import org.apache.causeway.core.config.beans.IsisBeanTypeRegistry;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.beans.CausewayBeanTypeRegistry;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.core.metamodel.facetapi.Facet;
import org.apache.causeway.core.metamodel.facets.actions.position.ActionPositionFacet;
import org.apache.causeway.core.metamodel.facets.members.layout.group.LayoutGroupFacet;
@@ -93,7 +93,7 @@ public class Layout_Counter_IntegTest extends IsisIntegrationTestAbstract {
CausewayModuleSecurityBypass.class,
})
@PropertySources({
- @PropertySource(IsisPresets.UseLog4j2Test)
+ @PropertySource(CausewayPresets.UseLog4j2Test)
})
@ComponentScan(basePackageClasses = {AppManifest.class, LayoutTestDomainModel.class})
public static class AppManifest {
@@ -122,7 +122,7 @@ public class Layout_Counter_IntegTest extends IsisIntegrationTestAbstract {
@BeforeAll
static void beforeAll() {
- IsisPresets.forcePrototyping();
+ CausewayPresets.forcePrototyping();
}
Bookmark target1;
@@ -774,6 +774,6 @@ public class Layout_Counter_IntegTest extends IsisIntegrationTestAbstract {
@Inject SpecificationLoader specificationLoader;
@Inject BookmarkService bookmarkService;
- @Inject IsisBeanTypeRegistry isisBeanTypeRegistry;
+ @Inject CausewayBeanTypeRegistry isisBeanTypeRegistry;
}
diff --git a/regressiontests/stable-layouts/src/main/java/org/apache/causeway/regressiontests/layouts/integtest/Layout_SimpleObject_IntegTest.java b/regressiontests/stable-layouts/src/main/java/org/apache/causeway/regressiontests/layouts/integtest/Layout_SimpleObject_IntegTest.java
index 5637b89c88..7500cc9c1d 100644
--- a/regressiontests/stable-layouts/src/main/java/org/apache/causeway/regressiontests/layouts/integtest/Layout_SimpleObject_IntegTest.java
+++ b/regressiontests/stable-layouts/src/main/java/org/apache/causeway/regressiontests/layouts/integtest/Layout_SimpleObject_IntegTest.java
@@ -47,8 +47,8 @@ import org.apache.causeway.applib.services.bookmark.BookmarkService;
import org.apache.causeway.applib.services.iactnlayer.InteractionService;
import org.apache.causeway.applib.services.metamodel.Config;
import org.apache.causeway.applib.services.metamodel.MetaModelService;
-import org.apache.causeway.core.config.beans.IsisBeanTypeRegistry;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.beans.CausewayBeanTypeRegistry;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.core.metamodel.facetapi.Facet;
import org.apache.causeway.core.metamodel.facets.actions.position.ActionPositionFacet;
import org.apache.causeway.core.metamodel.facets.members.layout.group.LayoutGroupFacet;
@@ -84,7 +84,7 @@ public class Layout_SimpleObject_IntegTest extends IsisIntegrationTestAbstract {
CausewayModuleSecurityBypass.class,
})
@PropertySources({
- @PropertySource(IsisPresets.UseLog4j2Test)
+ @PropertySource(CausewayPresets.UseLog4j2Test)
})
@ComponentScan(basePackageClasses = {AppManifest.class, LayoutTestDomainModel.class})
public static class AppManifest {
@@ -94,7 +94,7 @@ public class Layout_SimpleObject_IntegTest extends IsisIntegrationTestAbstract {
@BeforeAll
static void beforeAll() {
- IsisPresets.forcePrototyping();
+ CausewayPresets.forcePrototyping();
}
@@ -175,6 +175,6 @@ public class Layout_SimpleObject_IntegTest extends IsisIntegrationTestAbstract {
@Inject SpecificationLoader specificationLoader;
@Inject BookmarkService bookmarkService;
- @Inject IsisBeanTypeRegistry isisBeanTypeRegistry;
+ @Inject CausewayBeanTypeRegistry isisBeanTypeRegistry;
}
diff --git a/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/domainmodel/jdo/DomainModelTest.java b/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/domainmodel/jdo/DomainModelTest.java
index 1af6223bd7..9890bcbdf1 100644
--- a/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/domainmodel/jdo/DomainModelTest.java
+++ b/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/domainmodel/jdo/DomainModelTest.java
@@ -32,7 +32,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
import org.apache.causeway.applib.services.metamodel.BeanSort;
import org.apache.causeway.applib.services.registry.ServiceRegistry;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.core.metamodel.specloader.SpecificationLoader;
import org.apache.causeway.persistence.jdo.provider.metamodel.facets.object.datastoreidentity.JdoDatastoreIdentityFacet;
import org.apache.causeway.persistence.jdo.provider.metamodel.facets.object.persistencecapable.JdoPersistenceCapableFacet;
@@ -58,8 +58,8 @@ import lombok.val;
"logging.level.DependentArgUtils=DEBUG"
})
@TestPropertySource({
- IsisPresets.SilenceMetaModel,
- IsisPresets.SilenceProgrammingModel
+ CausewayPresets.SilenceMetaModel,
+ CausewayPresets.SilenceProgrammingModel
})
class DomainModelTest {
diff --git a/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/injecting/jdo/JdoEntityInjectingTest.java b/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/injecting/jdo/JdoEntityInjectingTest.java
index 3fee159037..21ae474b7d 100644
--- a/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/injecting/jdo/JdoEntityInjectingTest.java
+++ b/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/injecting/jdo/JdoEntityInjectingTest.java
@@ -36,7 +36,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
import org.apache.causeway.applib.services.repository.RepositoryService;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.testdomain.conf.Configuration_usingJdo;
import org.apache.causeway.testdomain.jdo.JdoTestFixtures;
import org.apache.causeway.testdomain.jdo.entities.JdoBook;
@@ -57,7 +57,7 @@ import lombok.extern.log4j.Log4j2;
// "logging.level.org.apache.isis.testdomain.injecting.jdo.JdoEntityInjectingTest=DEBUG"
}
)
-@TestPropertySource(IsisPresets.UseLog4j2Test)
+@TestPropertySource(CausewayPresets.UseLog4j2Test)
@Transactional
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
@Log4j2
diff --git a/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/persistence/jdo/JdoBootstrappingTest.java b/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/persistence/jdo/JdoBootstrappingTest.java
index 853393c2fd..7374018989 100644
--- a/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/persistence/jdo/JdoBootstrappingTest.java
+++ b/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/persistence/jdo/JdoBootstrappingTest.java
@@ -36,7 +36,7 @@ import org.springframework.transaction.annotation.Transactional;
import static org.junit.Assert.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertEquals;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.testdomain.conf.Configuration_usingJdo;
import org.apache.causeway.testdomain.jdo.JdoTestFixtures;
import org.apache.causeway.testdomain.jdo.entities.JdoInventory;
@@ -49,7 +49,7 @@ import lombok.val;
Configuration_usingJdo.class,
}
)
-@TestPropertySource(IsisPresets.UseLog4j2Test)
+@TestPropertySource(CausewayPresets.UseLog4j2Test)
@Transactional @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
class JdoBootstrappingTest extends IsisIntegrationTestAbstract {
diff --git a/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/persistence/jdo/JdoExceptionTranslationTest.java b/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/persistence/jdo/JdoExceptionTranslationTest.java
index a7e80a3157..f388dcbd29 100644
--- a/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/persistence/jdo/JdoExceptionTranslationTest.java
+++ b/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/persistence/jdo/JdoExceptionTranslationTest.java
@@ -33,7 +33,7 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.testdomain.RegressionTestAbstract;
import org.apache.causeway.testdomain.conf.Configuration_usingJdo;
import org.apache.causeway.testdomain.jdo.JdoTestFixtures;
@@ -46,7 +46,7 @@ import lombok.val;
Configuration_usingJdo.class,
})
@TestPropertySources({
- @TestPropertySource(IsisPresets.UseLog4j2Test)
+ @TestPropertySource(CausewayPresets.UseLog4j2Test)
})
//@Transactional ... we manage transaction ourselves
class JdoExceptionTranslationTest extends RegressionTestAbstract {
diff --git a/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/persistence/jdo/JdoExceptionTranslationTest_usingTransactional.java b/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/persistence/jdo/JdoExceptionTranslationTest_usingTransactional.java
index 4e5f96dc6c..0796a2f04c 100644
--- a/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/persistence/jdo/JdoExceptionTranslationTest_usingTransactional.java
+++ b/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/persistence/jdo/JdoExceptionTranslationTest_usingTransactional.java
@@ -42,7 +42,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.testdomain.RegressionTestAbstract;
import org.apache.causeway.testdomain.conf.Configuration_usingJdo;
import org.apache.causeway.testdomain.jdo.JdoInventoryDao;
@@ -57,7 +57,7 @@ import lombok.val;
JdoInventoryDao.class,
})
@TestPropertySources({
- @TestPropertySource(IsisPresets.UseLog4j2Test)
+ @TestPropertySource(CausewayPresets.UseLog4j2Test)
})
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
class JdoExceptionTranslationTest_usingTransactional
diff --git a/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/persistence/jdo/JdoJaxbTest.java b/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/persistence/jdo/JdoJaxbTest.java
index 9d0ef5459a..fdb89f8997 100644
--- a/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/persistence/jdo/JdoJaxbTest.java
+++ b/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/persistence/jdo/JdoJaxbTest.java
@@ -25,7 +25,7 @@ import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.TestPropertySource;
import org.apache.causeway.applib.services.jaxb.JaxbService;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.testdomain.RegressionTestAbstract;
import org.apache.causeway.testdomain.conf.Configuration_usingJdo;
import org.apache.causeway.testdomain.jdo.JdoInventoryJaxbVm;
@@ -37,7 +37,7 @@ import lombok.val;
classes = {
Configuration_usingJdo.class
})
-@TestPropertySource(IsisPresets.UseLog4j2Test)
+@TestPropertySource(CausewayPresets.UseLog4j2Test)
//@Transactional
class JdoJaxbTest extends RegressionTestAbstract {
diff --git a/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/persistence/jdo/JdoQueryTest.java b/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/persistence/jdo/JdoQueryTest.java
index c3f8dea40d..4b8d69888d 100644
--- a/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/persistence/jdo/JdoQueryTest.java
+++ b/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/persistence/jdo/JdoQueryTest.java
@@ -36,7 +36,7 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertEquals;
import org.apache.causeway.applib.query.Query;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.testdomain.conf.Configuration_usingJdo;
import org.apache.causeway.testdomain.jdo.JdoTestFixtures;
import org.apache.causeway.testdomain.jdo.entities.JdoBook;
@@ -50,7 +50,7 @@ import lombok.val;
classes = {
Configuration_usingJdo.class,
})
-@TestPropertySource(IsisPresets.UseLog4j2Test)
+@TestPropertySource(CausewayPresets.UseLog4j2Test)
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
@Transactional
class JdoQueryTest extends IsisIntegrationTestAbstract {
diff --git a/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/transactions/jdo/JdoTransactionRollbackTest_usingTransactionService.java b/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/transactions/jdo/JdoTransactionRollbackTest_usingTransactionService.java
index e06e402b0b..338eddd3f1 100644
--- a/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/transactions/jdo/JdoTransactionRollbackTest_usingTransactionService.java
+++ b/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/transactions/jdo/JdoTransactionRollbackTest_usingTransactionService.java
@@ -32,7 +32,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
import org.apache.causeway.applib.services.repository.RepositoryService;
import org.apache.causeway.applib.services.xactn.TransactionService;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.testdomain.conf.Configuration_usingJdo;
import org.apache.causeway.testdomain.jdo.JdoTestFixtures;
import org.apache.causeway.testdomain.jdo.JdoTestFixtures.Lock;
@@ -44,7 +44,7 @@ import lombok.val;
classes = {
Configuration_usingJdo.class,
})
-@TestPropertySource(IsisPresets.UseLog4j2Test)
+@TestPropertySource(CausewayPresets.UseLog4j2Test)
class JdoTransactionRollbackTest_usingTransactionService {
@Inject private JdoTestFixtures jdoTestFixtures;
diff --git a/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/transactions/jdo/JdoTransactionScopeListenerTest.java b/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/transactions/jdo/JdoTransactionScopeListenerTest.java
index d8b39c6a4c..2fa2fa67b9 100644
--- a/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/transactions/jdo/JdoTransactionScopeListenerTest.java
+++ b/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/transactions/jdo/JdoTransactionScopeListenerTest.java
@@ -31,7 +31,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import org.apache.causeway.applib.services.iactnlayer.InteractionService;
import org.apache.causeway.applib.services.repository.RepositoryService;
import org.apache.causeway.applib.services.xactn.TransactionService;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.testdomain.conf.Configuration_usingJdo;
import org.apache.causeway.testdomain.jdo.JdoTestFixtures;
import org.apache.causeway.testdomain.jdo.JdoTestFixtures.Lock;
@@ -45,7 +45,7 @@ import org.apache.causeway.testdomain.util.kv.KVStoreForTesting;
InteractionBoundaryProbe.class
})
//@Transactional
-@TestPropertySource(IsisPresets.UseLog4j2Test)
+@TestPropertySource(CausewayPresets.UseLog4j2Test)
/**
* With this test we manage IsisInteractions ourselves. (not sub-classing IsisIntegrationTestAbstract)
*/
diff --git a/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/wrapper/jdo/JdoWrapperSyncTest.java b/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/wrapper/jdo/JdoWrapperSyncTest.java
index f4feffeb0c..175e48d1e9 100644
--- a/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/wrapper/jdo/JdoWrapperSyncTest.java
+++ b/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/wrapper/jdo/JdoWrapperSyncTest.java
@@ -31,7 +31,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import org.apache.causeway.applib.services.factory.FactoryService;
import org.apache.causeway.applib.services.repository.RepositoryService;
import org.apache.causeway.applib.services.wrapper.WrapperFactory;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.testdomain.conf.Configuration_usingJdo;
import org.apache.causeway.testdomain.jdo.JdoInventoryManager;
import org.apache.causeway.testdomain.jdo.entities.JdoBook;
@@ -45,7 +45,7 @@ import lombok.val;
Configuration_usingJdo.class,
}
)
-@TestPropertySource(IsisPresets.UseLog4j2Test)
+@TestPropertySource(CausewayPresets.UseLog4j2Test)
class JdoWrapperSyncTest extends IsisIntegrationTestAbstract {
@Inject private RepositoryService repository;
diff --git a/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/injecting/jpa/JpaEntityInjectingTest.java b/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/injecting/jpa/JpaEntityInjectingTest.java
index 9a5208d5bc..cb43191f33 100644
--- a/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/injecting/jpa/JpaEntityInjectingTest.java
+++ b/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/injecting/jpa/JpaEntityInjectingTest.java
@@ -37,7 +37,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
import org.apache.causeway.applib.services.repository.RepositoryService;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.testdomain.conf.Configuration_usingJpa;
import org.apache.causeway.testdomain.jpa.JpaTestFixtures;
import org.apache.causeway.testdomain.jpa.entities.JpaBook;
@@ -56,7 +56,7 @@ import lombok.extern.log4j.Log4j2;
properties = {
}
)
-@TestPropertySource(IsisPresets.UseLog4j2Test)
+@TestPropertySource(CausewayPresets.UseLog4j2Test)
@Transactional
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
@Log4j2
diff --git a/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/JpaBootstrappingTest.java b/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/JpaBootstrappingTest.java
index 94c4fa33da..4aedaad334 100644
--- a/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/JpaBootstrappingTest.java
+++ b/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/JpaBootstrappingTest.java
@@ -41,7 +41,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.core.metamodel.specloader.SpecificationLoader;
import org.apache.causeway.testdomain.conf.Configuration_usingJpa;
import org.apache.causeway.testdomain.jdo.JdoTestFixtures;
@@ -56,7 +56,7 @@ import lombok.val;
classes = {
Configuration_usingJpa.class,
})
-@TestPropertySource(IsisPresets.UseLog4j2Test)
+@TestPropertySource(CausewayPresets.UseLog4j2Test)
@Transactional @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
// @DirtiesContext // doesn't seem to tidy up correctly ... I see InteractionService still injected into entities in the _next_ tests run (JpaExceptionTranslationTest_usingTransactional)
class JpaBootstrappingTest extends IsisIntegrationTestAbstract {
diff --git a/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/JpaExceptionTranslationTest.java b/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/JpaExceptionTranslationTest.java
index 733fa747a3..a86369294a 100644
--- a/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/JpaExceptionTranslationTest.java
+++ b/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/JpaExceptionTranslationTest.java
@@ -33,7 +33,7 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.testdomain.RegressionTestAbstract;
import org.apache.causeway.testdomain.conf.Configuration_usingJpa;
import org.apache.causeway.testdomain.jpa.JpaTestFixtures;
@@ -46,7 +46,7 @@ import lombok.val;
Configuration_usingJpa.class,
})
@TestPropertySources({
- @TestPropertySource(IsisPresets.UseLog4j2Test)
+ @TestPropertySource(CausewayPresets.UseLog4j2Test)
})
//@Transactional ... we manage transaction ourselves
//@DirtiesContext
diff --git a/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/JpaExceptionTranslationTest_usingTransactional.java b/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/JpaExceptionTranslationTest_usingTransactional.java
index 3ec7591c86..3d20f32885 100644
--- a/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/JpaExceptionTranslationTest_usingTransactional.java
+++ b/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/JpaExceptionTranslationTest_usingTransactional.java
@@ -43,7 +43,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.testdomain.RegressionTestAbstract;
import org.apache.causeway.testdomain.conf.Configuration_usingJpa;
import org.apache.causeway.testdomain.jpa.JpaInventoryDao;
@@ -58,7 +58,7 @@ import lombok.val;
JpaInventoryDao.class
})
@TestPropertySources({
- @TestPropertySource(IsisPresets.UseLog4j2Test)
+ @TestPropertySource(CausewayPresets.UseLog4j2Test)
})
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
class JpaExceptionTranslationTest_usingTransactional
diff --git a/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/JpaJaxbTest.java b/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/JpaJaxbTest.java
index ded5c89739..78b8bde54c 100644
--- a/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/JpaJaxbTest.java
+++ b/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/JpaJaxbTest.java
@@ -27,7 +27,7 @@ import org.springframework.test.context.TestPropertySource;
import org.apache.causeway.applib.annotation.InteractionScope;
import org.apache.causeway.applib.services.iactnlayer.InteractionService;
import org.apache.causeway.applib.services.jaxb.JaxbService;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.testdomain.RegressionTestAbstract;
import org.apache.causeway.testdomain.conf.Configuration_usingJpa;
import org.apache.causeway.testdomain.jpa.JpaInventoryJaxbVm;
@@ -39,7 +39,7 @@ import lombok.val;
classes = {
Configuration_usingJpa.class,
})
-@TestPropertySource(IsisPresets.UseLog4j2Test)
+@TestPropertySource(CausewayPresets.UseLog4j2Test)
//@Transactional
class JpaJaxbTest extends RegressionTestAbstract {
diff --git a/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/JpaQueryTest.java b/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/JpaQueryTest.java
index 81f0f17f05..91d8b5b577 100644
--- a/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/JpaQueryTest.java
+++ b/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/JpaQueryTest.java
@@ -39,7 +39,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import org.apache.causeway.applib.query.Query;
import org.apache.causeway.applib.services.iactnlayer.InteractionService;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.persistence.jpa.applib.services.JpaSupportService;
import org.apache.causeway.testdomain.conf.Configuration_usingJpa;
import org.apache.causeway.testdomain.jpa.JpaTestFixtures;
@@ -55,7 +55,7 @@ import lombok.val;
Configuration_usingJpa.class,
}
)
-@TestPropertySource(IsisPresets.UseLog4j2Test)
+@TestPropertySource(CausewayPresets.UseLog4j2Test)
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
@Transactional
class JpaQueryTest extends IsisIntegrationTestAbstract {
diff --git a/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/entitylifecycle/JpaGeneratedLongIdEntityLifecycleTest.java b/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/entitylifecycle/JpaGeneratedLongIdEntityLifecycleTest.java
index ed61b74409..2b3b6d1124 100644
--- a/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/entitylifecycle/JpaGeneratedLongIdEntityLifecycleTest.java
+++ b/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/entitylifecycle/JpaGeneratedLongIdEntityLifecycleTest.java
@@ -37,7 +37,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
import org.apache.causeway.applib.services.repository.EntityState;
import org.apache.causeway.applib.services.repository.RepositoryService;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.core.metamodel.object.MmEntityUtil;
import org.apache.causeway.core.metamodel.objectmanager.ObjectManager;
@@ -54,7 +54,7 @@ import lombok.val;
properties = {
})
@Transactional
-@TestPropertySource(IsisPresets.UseLog4j2Test)
+@TestPropertySource(CausewayPresets.UseLog4j2Test)
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
//@DirtiesContext
class JpaGeneratedLongIdEntityLifecycleTest {
diff --git a/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/entitylifecycle/JpaNonGeneratedStringIdEntityLifecycleTest.java b/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/entitylifecycle/JpaNonGeneratedStringIdEntityLifecycleTest.java
index f475ee6747..eef389dca0 100644
--- a/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/entitylifecycle/JpaNonGeneratedStringIdEntityLifecycleTest.java
+++ b/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/entitylifecycle/JpaNonGeneratedStringIdEntityLifecycleTest.java
@@ -37,7 +37,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
import org.apache.causeway.applib.services.repository.EntityState;
import org.apache.causeway.applib.services.repository.RepositoryService;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.core.metamodel.object.MmEntityUtil;
import org.apache.causeway.core.metamodel.objectmanager.ObjectManager;
@@ -54,7 +54,7 @@ import lombok.val;
properties = {
})
@Transactional
-@TestPropertySource(IsisPresets.UseLog4j2Test)
+@TestPropertySource(CausewayPresets.UseLog4j2Test)
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
//@DirtiesContext
class JpaNonGeneratedStringIdEntityLifecycleTest {
diff --git a/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/springdata/SpringDataJpaBootstrappingTest.java b/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/springdata/SpringDataJpaBootstrappingTest.java
index 4aac84379d..0da30a8ce9 100644
--- a/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/springdata/SpringDataJpaBootstrappingTest.java
+++ b/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/springdata/SpringDataJpaBootstrappingTest.java
@@ -41,7 +41,7 @@ import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
import org.apache.causeway.applib.services.repository.RepositoryService;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.core.metamodel.specloader.SpecificationLoader;
import org.apache.causeway.testdomain.conf.Configuration_usingSpringDataJpa;
import org.apache.causeway.testdomain.jpa.springdata.Employee;
@@ -59,7 +59,7 @@ import lombok.val;
FixtureScriptsSpecificationProviderAutoConfiguration.class, // because @DataJpaTest disables autoconfiguration
ExecutionParametersServiceAutoConfiguration.class // because @DataJpaTest disables autoconfiguration
})
-@TestPropertySource(IsisPresets.UseLog4j2Test)
+@TestPropertySource(CausewayPresets.UseLog4j2Test)
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
@DirtiesContext
// @Disabled // ISIS-2789 revert
diff --git a/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/transactions/jpa/JpaTransactionRollbackTest_usingInteractionService.java b/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/transactions/jpa/JpaTransactionRollbackTest_usingInteractionService.java
index 2309ded9c5..91082b454a 100644
--- a/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/transactions/jpa/JpaTransactionRollbackTest_usingInteractionService.java
+++ b/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/transactions/jpa/JpaTransactionRollbackTest_usingInteractionService.java
@@ -42,7 +42,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
import org.apache.causeway.applib.services.iactnlayer.InteractionService;
import org.apache.causeway.applib.services.repository.RepositoryService;
import org.apache.causeway.applib.services.xactn.TransactionService;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.core.transaction.events.TransactionAfterCompletionEvent;
import org.apache.causeway.core.transaction.events.TransactionBeforeCompletionEvent;
import org.apache.causeway.testdomain.conf.Configuration_usingJpa;
@@ -63,7 +63,7 @@ import lombok.val;
// "logging.level.org.springframework.test.context.transaction.*=DEBUG",
// "logging.level.org.springframework.orm.jpa.*=DEBUG",
})
-@TestPropertySource(IsisPresets.UseLog4j2Test)
+@TestPropertySource(CausewayPresets.UseLog4j2Test)
@ExtendWith({IsisInteractionHandler.class})
@DirtiesContext
@DisabledIfSystemProperty(named = "isRunningWithSurefire", matches = "true")
diff --git a/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/transactions/jpa/JpaTransactionRollbackTest_usingTransactionService.java b/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/transactions/jpa/JpaTransactionRollbackTest_usingTransactionService.java
index bd97201851..7e572eca70 100644
--- a/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/transactions/jpa/JpaTransactionRollbackTest_usingTransactionService.java
+++ b/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/transactions/jpa/JpaTransactionRollbackTest_usingTransactionService.java
@@ -41,7 +41,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
import org.apache.causeway.applib.services.repository.RepositoryService;
import org.apache.causeway.applib.services.xactn.TransactionService;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.core.transaction.events.TransactionAfterCompletionEvent;
import org.apache.causeway.core.transaction.events.TransactionBeforeCompletionEvent;
import org.apache.causeway.testdomain.conf.Configuration_usingJpa;
@@ -62,7 +62,7 @@ import lombok.val;
// "logging.level.org.springframework.test.context.transaction.*=DEBUG",
// "logging.level.org.springframework.orm.jpa.*=DEBUG",
})
-@TestPropertySource(IsisPresets.UseLog4j2Test)
+@TestPropertySource(CausewayPresets.UseLog4j2Test)
@ExtendWith({IsisInteractionHandler.class})
@DirtiesContext
@DisabledIfSystemProperty(named = "isRunningWithSurefire", matches = "true")
diff --git a/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/transactions/jpa/JpaTransactionRollbackTest_usingTransactional.java b/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/transactions/jpa/JpaTransactionRollbackTest_usingTransactional.java
index ff106852f7..47c72f95f8 100644
--- a/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/transactions/jpa/JpaTransactionRollbackTest_usingTransactional.java
+++ b/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/transactions/jpa/JpaTransactionRollbackTest_usingTransactional.java
@@ -33,7 +33,7 @@ import org.springframework.transaction.annotation.Transactional;
import static org.junit.jupiter.api.Assertions.assertEquals;
import org.apache.causeway.applib.services.repository.RepositoryService;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.testdomain.conf.Configuration_usingJpa;
import org.apache.causeway.testdomain.jpa.JpaTestDomainPersona;
import org.apache.causeway.testdomain.jpa.entities.JpaBook;
@@ -55,7 +55,7 @@ import org.apache.causeway.testing.integtestsupport.applib.IsisIntegrationTestAb
// "logging.level.org.springframework.test.context.transaction.*=DEBUG"
})
@Transactional
-@TestPropertySource(IsisPresets.UseLog4j2Test)
+@TestPropertySource(CausewayPresets.UseLog4j2Test)
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
@DirtiesContext
// @Disabled // ISIS-2789 revert
diff --git a/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/transactions/jpa/JpaTransactionScopeListenerTest.java b/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/transactions/jpa/JpaTransactionScopeListenerTest.java
index 03d9a50425..237b27b146 100644
--- a/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/transactions/jpa/JpaTransactionScopeListenerTest.java
+++ b/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/transactions/jpa/JpaTransactionScopeListenerTest.java
@@ -34,7 +34,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import org.apache.causeway.applib.services.iactnlayer.InteractionService;
import org.apache.causeway.applib.services.repository.RepositoryService;
import org.apache.causeway.applib.services.xactn.TransactionService;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.testdomain.conf.Configuration_usingJpa;
import org.apache.causeway.testdomain.jpa.JpaTestDomainPersona;
import org.apache.causeway.testdomain.jpa.entities.JpaBook;
@@ -48,7 +48,7 @@ import org.apache.causeway.testing.integtestsupport.applib.IsisInteractionHandle
Configuration_usingJpa.class,
InteractionBoundaryProbe.class
})
-@TestPropertySource(IsisPresets.UseLog4j2Test)
+@TestPropertySource(CausewayPresets.UseLog4j2Test)
/**
* With this test we manage IsisInteractions ourselves. (not sub-classing IsisIntegrationTestAbstract)
*/
diff --git a/regressiontests/stable-publishing-jpa/src/test/java/org/apache/causeway/testdomain/publishing/jpa/JpaCommandPublishingTest.java b/regressiontests/stable-publishing-jpa/src/test/java/org/apache/causeway/testdomain/publishing/jpa/JpaCommandPublishingTest.java
index 72c8f5b9f3..da1ca2e100 100644
--- a/regressiontests/stable-publishing-jpa/src/test/java/org/apache/causeway/testdomain/publishing/jpa/JpaCommandPublishingTest.java
+++ b/regressiontests/stable-publishing-jpa/src/test/java/org/apache/causeway/testdomain/publishing/jpa/JpaCommandPublishingTest.java
@@ -24,7 +24,7 @@ import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.TestPropertySource;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.testdomain.conf.Configuration_usingJpa;
import org.apache.causeway.testdomain.jpa.HasPersistenceStandardJpa;
import org.apache.causeway.testdomain.publishing.PublishingTestFactoryAbstract;
@@ -46,7 +46,7 @@ import org.apache.causeway.testdomain.publishing.stubs.CommandPublishingTestAbst
"logging.level.org.apache.causeway.core.runtimeservices.session.IsisInteractionFactoryDefault=DEBUG"
})
@TestPropertySource({
- IsisPresets.UseLog4j2Test
+ CausewayPresets.UseLog4j2Test
})
@DirtiesContext
class JpaCommandPublishingTest
diff --git a/regressiontests/stable-publishing-jpa/src/test/java/org/apache/causeway/testdomain/publishing/jpa/JpaEntityPublishingTest.java b/regressiontests/stable-publishing-jpa/src/test/java/org/apache/causeway/testdomain/publishing/jpa/JpaEntityPublishingTest.java
index 9890cb61c9..b5ecc72d18 100644
--- a/regressiontests/stable-publishing-jpa/src/test/java/org/apache/causeway/testdomain/publishing/jpa/JpaEntityPublishingTest.java
+++ b/regressiontests/stable-publishing-jpa/src/test/java/org/apache/causeway/testdomain/publishing/jpa/JpaEntityPublishingTest.java
@@ -24,7 +24,7 @@ import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.TestPropertySource;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.testdomain.conf.Configuration_usingJpa;
import org.apache.causeway.testdomain.jpa.HasPersistenceStandardJpa;
import org.apache.causeway.testdomain.publishing.PublishingTestFactoryAbstract;
@@ -45,7 +45,7 @@ import org.apache.causeway.testdomain.publishing.stubs.EntityPublishingTestAbstr
"logging.level.org.apache.isis.testdomain.util.kv.KVStoreForTesting=DEBUG",
})
@TestPropertySource({
- IsisPresets.UseLog4j2Test
+ CausewayPresets.UseLog4j2Test
})
@DirtiesContext
class JpaEntityPublishingTest
diff --git a/regressiontests/stable-publishing-jpa/src/test/java/org/apache/causeway/testdomain/publishing/jpa/JpaExecutionPublishingTest.java b/regressiontests/stable-publishing-jpa/src/test/java/org/apache/causeway/testdomain/publishing/jpa/JpaExecutionPublishingTest.java
index 2c28688596..c8baa89c3e 100644
--- a/regressiontests/stable-publishing-jpa/src/test/java/org/apache/causeway/testdomain/publishing/jpa/JpaExecutionPublishingTest.java
+++ b/regressiontests/stable-publishing-jpa/src/test/java/org/apache/causeway/testdomain/publishing/jpa/JpaExecutionPublishingTest.java
@@ -24,7 +24,7 @@ import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.TestPropertySource;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.testdomain.conf.Configuration_usingJpa;
import org.apache.causeway.testdomain.jpa.HasPersistenceStandardJpa;
import org.apache.causeway.testdomain.publishing.PublishingTestFactoryAbstract;
@@ -46,7 +46,7 @@ import org.apache.causeway.testdomain.publishing.stubs.ExecutionPublishingTestAb
"logging.level.org.apache.causeway.core.runtimeservices.session.IsisInteractionFactoryDefault=DEBUG",
})
@TestPropertySource({
- IsisPresets.UseLog4j2Test
+ CausewayPresets.UseLog4j2Test
})
@DirtiesContext
class JpaExecutionPublishingTest
diff --git a/regressiontests/stable-publishing-jpa/src/test/java/org/apache/causeway/testdomain/publishing/jpa/JpaLifecycleEventPublishingTest.java b/regressiontests/stable-publishing-jpa/src/test/java/org/apache/causeway/testdomain/publishing/jpa/JpaLifecycleEventPublishingTest.java
index 85b2a856a7..2f160c8f15 100644
--- a/regressiontests/stable-publishing-jpa/src/test/java/org/apache/causeway/testdomain/publishing/jpa/JpaLifecycleEventPublishingTest.java
+++ b/regressiontests/stable-publishing-jpa/src/test/java/org/apache/causeway/testdomain/publishing/jpa/JpaLifecycleEventPublishingTest.java
@@ -24,7 +24,7 @@ import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.TestPropertySource;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.testdomain.conf.Configuration_usingJpa;
import org.apache.causeway.testdomain.jpa.HasPersistenceStandardJpa;
import org.apache.causeway.testdomain.publishing.PublishingTestFactoryAbstract;
@@ -45,7 +45,7 @@ import org.apache.causeway.testdomain.publishing.stubs.LifecycleEventPublishingT
"logging.level.org.apache.isis.testdomain.util.kv.KVStoreForTesting=DEBUG",
})
@TestPropertySource({
- IsisPresets.UseLog4j2Test
+ CausewayPresets.UseLog4j2Test
})
@DirtiesContext
class JpaLifecycleEventPublishingTest
diff --git a/regressiontests/stable-publishing-jpa/src/test/java/org/apache/causeway/testdomain/publishing/jpa/JpaPropertyPublishingTest.java b/regressiontests/stable-publishing-jpa/src/test/java/org/apache/causeway/testdomain/publishing/jpa/JpaPropertyPublishingTest.java
index 68ef18a198..64d4a312b4 100644
--- a/regressiontests/stable-publishing-jpa/src/test/java/org/apache/causeway/testdomain/publishing/jpa/JpaPropertyPublishingTest.java
+++ b/regressiontests/stable-publishing-jpa/src/test/java/org/apache/causeway/testdomain/publishing/jpa/JpaPropertyPublishingTest.java
@@ -24,7 +24,7 @@ import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.TestPropertySource;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.testdomain.conf.Configuration_usingJpa;
import org.apache.causeway.testdomain.jpa.HasPersistenceStandardJpa;
import org.apache.causeway.testdomain.publishing.PublishingTestFactoryAbstract;
@@ -45,7 +45,7 @@ import org.apache.causeway.testdomain.publishing.stubs.PropertyPublishingTestAbs
"logging.level.org.apache.isis.testdomain.util.rest.KVStoreForTesting=DEBUG",
})
@TestPropertySource({
- IsisPresets.UseLog4j2Test
+ CausewayPresets.UseLog4j2Test
})
@DirtiesContext
class JpaPropertyPublishingTest
diff --git a/regressiontests/stable-rest/src/test/java/org/apache/causeway/testdomain/rest/JsonValueEncoderTest.java b/regressiontests/stable-rest/src/test/java/org/apache/causeway/testdomain/rest/JsonValueEncoderTest.java
index 45758f8830..7eab6ffa24 100644
--- a/regressiontests/stable-rest/src/test/java/org/apache/causeway/testdomain/rest/JsonValueEncoderTest.java
+++ b/regressiontests/stable-rest/src/test/java/org/apache/causeway/testdomain/rest/JsonValueEncoderTest.java
@@ -33,7 +33,7 @@ import org.springframework.test.context.TestPropertySource;
import org.apache.causeway.applib.value.Blob;
import org.apache.causeway.applib.value.Clob;
import org.apache.causeway.applib.value.NamedWithMimeType.CommonMimeType;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.testdomain.conf.Configuration_headless;
import org.apache.causeway.viewer.restfulobjects.applib.JsonRepresentation;
@@ -53,7 +53,7 @@ import lombok.val;
CausewayModuleViewerRestfulObjectsJaxrsResteasy4.class
})
//@DisabledIfSystemProperty(named = "isRunningWithSurefire", matches = "true") //TODO WIP
-@TestPropertySource(IsisPresets.UseLog4j2Test)
+@TestPropertySource(CausewayPresets.UseLog4j2Test)
class JsonValueEncoderTest {
@Inject MetaModelContext mmc;
diff --git a/regressiontests/stable-rest/src/test/java/org/apache/causeway/testdomain/rest/RestServiceStressTest.java b/regressiontests/stable-rest/src/test/java/org/apache/causeway/testdomain/rest/RestServiceStressTest.java
index 7641f28004..0340a091a7 100644
--- a/regressiontests/stable-rest/src/test/java/org/apache/causeway/testdomain/rest/RestServiceStressTest.java
+++ b/regressiontests/stable-rest/src/test/java/org/apache/causeway/testdomain/rest/RestServiceStressTest.java
@@ -35,7 +35,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.testdomain.conf.Configuration_usingJdo;
import org.apache.causeway.testdomain.util.rest.RestEndpointService;
import org.apache.causeway.viewer.restfulobjects.client.RestfulClient;
@@ -47,7 +47,7 @@ import lombok.extern.log4j.Log4j2;
@SpringBootTest(
classes = {RestEndpointService.class},
webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-@TestPropertySource(IsisPresets.UseLog4j2Test)
+@TestPropertySource(CausewayPresets.UseLog4j2Test)
@Import({
Configuration_usingJdo.class,
CausewayModuleViewerRestfulObjectsJaxrsResteasy4.class
diff --git a/regressiontests/stable-rest/src/test/java/org/apache/causeway/testdomain/rest/RestServiceTest.java b/regressiontests/stable-rest/src/test/java/org/apache/causeway/testdomain/rest/RestServiceTest.java
index 4d4c338801..2e07e02aaf 100644
--- a/regressiontests/stable-rest/src/test/java/org/apache/causeway/testdomain/rest/RestServiceTest.java
+++ b/regressiontests/stable-rest/src/test/java/org/apache/causeway/testdomain/rest/RestServiceTest.java
@@ -32,7 +32,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.testdomain.conf.Configuration_usingJdo;
import org.apache.causeway.testdomain.jdo.JdoInventoryJaxbVm;
import org.apache.causeway.testdomain.jdo.JdoTestFixtures;
@@ -45,7 +45,7 @@ import lombok.val;
@SpringBootTest(
classes = {RestEndpointService.class},
webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-@TestPropertySource(IsisPresets.UseLog4j2Test)
+@TestPropertySource(CausewayPresets.UseLog4j2Test)
@Import({
Configuration_usingJdo.class,
CausewayModuleViewerRestfulObjectsJaxrsResteasy4.class
diff --git a/regressiontests/stable-value/src/test/java/org/apache/causeway/testdomain/value/ValueSemanticsTest.java b/regressiontests/stable-value/src/test/java/org/apache/causeway/testdomain/value/ValueSemanticsTest.java
index 34642426f7..48b0a6083c 100644
--- a/regressiontests/stable-value/src/test/java/org/apache/causeway/testdomain/value/ValueSemanticsTest.java
+++ b/regressiontests/stable-value/src/test/java/org/apache/causeway/testdomain/value/ValueSemanticsTest.java
@@ -59,7 +59,7 @@ import org.apache.causeway.applib.value.semantics.Renderer;
import org.apache.causeway.applib.value.semantics.ValueDecomposition;
import org.apache.causeway.applib.value.semantics.ValueSemanticsProvider;
import org.apache.causeway.applib.value.semantics.ValueSemanticsResolver;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.causeway.core.metamodel.interactions.managed.ActionInteraction;
import org.apache.causeway.core.metamodel.object.ManagedObject;
@@ -87,8 +87,8 @@ import lombok.val;
"isis.core.meta-model.introspector.mode=FULL"
})
@TestPropertySource({
- IsisPresets.SilenceMetaModel,
- IsisPresets.SilenceProgrammingModel
+ CausewayPresets.SilenceMetaModel,
+ CausewayPresets.SilenceProgrammingModel
})
@TestInstance(Lifecycle.PER_CLASS)
class ValueSemanticsTest {
diff --git a/regressiontests/stable-viewers-common/src/test/java/org/apache/causeway/testdomain/viewers/common/wkt/InteractionTestWkt.java b/regressiontests/stable-viewers-common/src/test/java/org/apache/causeway/testdomain/viewers/common/wkt/InteractionTestWkt.java
index b2d20d49eb..cabe9ffa87 100644
--- a/regressiontests/stable-viewers-common/src/test/java/org/apache/causeway/testdomain/viewers/common/wkt/InteractionTestWkt.java
+++ b/regressiontests/stable-viewers-common/src/test/java/org/apache/causeway/testdomain/viewers/common/wkt/InteractionTestWkt.java
@@ -35,7 +35,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
import org.apache.causeway.applib.annotation.Where;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.core.metamodel.commons.ScalarRepresentation;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.core.metamodel.object.ManagedObject;
@@ -70,8 +70,8 @@ import lombok.val;
@TestPropertySource({
//IsisPresets.DebugMetaModel,
//IsisPresets.DebugProgrammingModel,
- IsisPresets.SilenceMetaModel,
- IsisPresets.SilenceProgrammingModel
+ CausewayPresets.SilenceMetaModel,
+ CausewayPresets.SilenceProgrammingModel
})
class InteractionTestWkt extends InteractionTestAbstract {
diff --git a/regressiontests/stable-viewers-common/src/test/java/org/apache/causeway/testdomain/viewers/common/wkt/LoggerSetupTestWkt.java b/regressiontests/stable-viewers-common/src/test/java/org/apache/causeway/testdomain/viewers/common/wkt/LoggerSetupTestWkt.java
index d8bbcaf6e3..536a29b8a7 100644
--- a/regressiontests/stable-viewers-common/src/test/java/org/apache/causeway/testdomain/viewers/common/wkt/LoggerSetupTestWkt.java
+++ b/regressiontests/stable-viewers-common/src/test/java/org/apache/causeway/testdomain/viewers/common/wkt/LoggerSetupTestWkt.java
@@ -27,7 +27,7 @@ import org.springframework.test.context.TestPropertySource;
import static org.junit.jupiter.api.Assertions.assertFalse;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import lombok.val;
@@ -37,7 +37,7 @@ import lombok.val;
},
properties = {
})
-@TestPropertySource(IsisPresets.SilenceWicket)
+@TestPropertySource(CausewayPresets.SilenceWicket)
public class LoggerSetupTestWkt {
@Configuration
diff --git a/regressiontests/stable-viewers-jdo/src/main/java/org/apache/causeway/testdomain/viewers/jdo/wkt/TestAppJdoWkt.java b/regressiontests/stable-viewers-jdo/src/main/java/org/apache/causeway/testdomain/viewers/jdo/wkt/TestAppJdoWkt.java
index 8e099ee73a..84e5917d21 100644
--- a/regressiontests/stable-viewers-jdo/src/main/java/org/apache/causeway/testdomain/viewers/jdo/wkt/TestAppJdoWkt.java
+++ b/regressiontests/stable-viewers-jdo/src/main/java/org/apache/causeway/testdomain/viewers/jdo/wkt/TestAppJdoWkt.java
@@ -35,7 +35,7 @@ import org.apache.causeway.applib.annotation.Nature;
import org.apache.causeway.applib.annotation.ObjectSupport;
import org.apache.causeway.applib.services.factory.FactoryService;
import org.apache.causeway.applib.services.user.UserService;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.testdomain.conf.Configuration_usingJdo;
import org.apache.causeway.testdomain.conf.Configuration_usingWicket;
import org.apache.causeway.testdomain.jdo.JdoInventoryJaxbVm;
@@ -66,7 +66,7 @@ public class TestAppJdoWkt extends SpringBootServletInitializer {
* entry point by searching for classes having a {@code main(...)}
*/
public static void main(final String[] args) {
- IsisPresets.prototyping();
+ CausewayPresets.prototyping();
SpringApplication.run(new Class[] { TestAppJdoWkt.class }, args);
}
diff --git a/regressiontests/stable-viewers-jdo/src/test/java/org/apache/causeway/testdomain/viewers/jdo/wkt/InteractionTestJdoWkt.java b/regressiontests/stable-viewers-jdo/src/test/java/org/apache/causeway/testdomain/viewers/jdo/wkt/InteractionTestJdoWkt.java
index 625ad8748b..6f3ff4fa8e 100644
--- a/regressiontests/stable-viewers-jdo/src/test/java/org/apache/causeway/testdomain/viewers/jdo/wkt/InteractionTestJdoWkt.java
+++ b/regressiontests/stable-viewers-jdo/src/test/java/org/apache/causeway/testdomain/viewers/jdo/wkt/InteractionTestJdoWkt.java
@@ -34,7 +34,7 @@ import static org.apache.causeway.testdomain.conf.Configuration_usingWicket.Enti
import org.apache.causeway.testdomain.viewers.jdo.wkt.TestAppJdoWkt;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.testdomain.RegressionTestAbstract;
import org.apache.causeway.testdomain.conf.Configuration_usingJdo;
import org.apache.causeway.testdomain.conf.Configuration_usingWicket;
@@ -58,8 +58,8 @@ import lombok.val;
properties = {
})
@TestPropertySource({
- IsisPresets.SilenceMetaModel,
- IsisPresets.SilenceProgrammingModel
+ CausewayPresets.SilenceMetaModel,
+ CausewayPresets.SilenceProgrammingModel
})
class InteractionTestJdoWkt extends RegressionTestAbstract {
diff --git a/regressiontests/stable-viewers-jpa/src/main/java/org/apache/causeway/testdomain/viewers/jpa/wkt/TestAppJpaWkt.java b/regressiontests/stable-viewers-jpa/src/main/java/org/apache/causeway/testdomain/viewers/jpa/wkt/TestAppJpaWkt.java
index 4c08865998..482854e3e7 100644
--- a/regressiontests/stable-viewers-jpa/src/main/java/org/apache/causeway/testdomain/viewers/jpa/wkt/TestAppJpaWkt.java
+++ b/regressiontests/stable-viewers-jpa/src/main/java/org/apache/causeway/testdomain/viewers/jpa/wkt/TestAppJpaWkt.java
@@ -35,7 +35,7 @@ import org.apache.causeway.applib.annotation.Nature;
import org.apache.causeway.applib.annotation.ObjectSupport;
import org.apache.causeway.applib.services.factory.FactoryService;
import org.apache.causeway.applib.services.user.UserService;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.testdomain.conf.Configuration_usingJpa;
import org.apache.causeway.testdomain.conf.Configuration_usingWicket;
import org.apache.causeway.testdomain.jpa.JpaInventoryJaxbVm;
@@ -66,7 +66,7 @@ public class TestAppJpaWkt extends SpringBootServletInitializer {
* entry point by searching for classes having a {@code main(...)}
*/
public static void main(final String[] args) {
- IsisPresets.prototyping();
+ CausewayPresets.prototyping();
_OsUtil.thereCanBeOnlyOne();
diff --git a/regressiontests/stable-viewers-jpa/src/test/java/org/apache/causeway/testdomain/viewers/jpa/wkt/InteractionTestJpaWkt.java b/regressiontests/stable-viewers-jpa/src/test/java/org/apache/causeway/testdomain/viewers/jpa/wkt/InteractionTestJpaWkt.java
index 705e36f42d..b966465ff8 100644
--- a/regressiontests/stable-viewers-jpa/src/test/java/org/apache/causeway/testdomain/viewers/jpa/wkt/InteractionTestJpaWkt.java
+++ b/regressiontests/stable-viewers-jpa/src/test/java/org/apache/causeway/testdomain/viewers/jpa/wkt/InteractionTestJpaWkt.java
@@ -36,7 +36,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
import org.apache.causeway.testdomain.viewers.jpa.wkt.TestAppJpaWkt;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.testdomain.RegressionTestAbstract;
import org.apache.causeway.testdomain.conf.Configuration_usingJpa;
@@ -62,8 +62,8 @@ import lombok.val;
"logging.level.org.springframework.orm.jpa=DEBUG"
})
@TestPropertySource({
- IsisPresets.SilenceMetaModel,
- IsisPresets.SilenceProgrammingModel
+ CausewayPresets.SilenceMetaModel,
+ CausewayPresets.SilenceProgrammingModel
})
class InteractionTestJpaWkt extends RegressionTestAbstract {
diff --git a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/conf/Configuration_headless.java b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/conf/Configuration_headless.java
index 41084ec761..1b69ef0e48 100644
--- a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/conf/Configuration_headless.java
+++ b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/conf/Configuration_headless.java
@@ -37,7 +37,7 @@ import org.apache.causeway.applib.services.iactn.Interaction;
import org.apache.causeway.applib.services.metrics.MetricsService;
import org.apache.causeway.core.interaction.scope.TransactionBoundaryAware;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.core.runtimeservices.CausewayModuleCoreRuntimeServices;
import org.apache.causeway.security.bypass.CausewayModuleSecurityBypass;
import org.apache.causeway.testdomain.util.interaction.DomainObjectTesterFactory;
@@ -54,7 +54,7 @@ import lombok.RequiredArgsConstructor;
DomainObjectTesterFactory.class // Helper for JUnit Tests
})
@PropertySources({
- @PropertySource(IsisPresets.NoTranslations),
+ @PropertySource(CausewayPresets.NoTranslations),
})
public class Configuration_headless {
diff --git a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/conf/Configuration_usingJdo.java b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/conf/Configuration_usingJdo.java
index 69ccaaa281..39220023af 100644
--- a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/conf/Configuration_usingJdo.java
+++ b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/conf/Configuration_usingJdo.java
@@ -23,7 +23,7 @@ import org.springframework.context.annotation.Import;
import org.springframework.context.annotation.PropertySource;
import org.springframework.context.annotation.PropertySources;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.core.runtimeservices.CausewayModuleCoreRuntimeServices;
import org.apache.causeway.persistence.jdo.datanucleus.CausewayModulePersistenceJdoDatanucleus;
import org.apache.causeway.persistence.jdo.datanucleus.CausewayModulePersistenceJdoDatanucleusMixins;
@@ -46,9 +46,9 @@ import org.apache.causeway.testing.fixtures.applib.CausewayModuleTestingFixtures
JdoTestDomainModule.class
})
@PropertySources({
- @PropertySource(IsisPresets.NoTranslations),
- @PropertySource(IsisPresets.DatanucleusAutocreateNoValidate),
- @PropertySource(IsisPresets.H2InMemory_withUniqueSchema),
+ @PropertySource(CausewayPresets.NoTranslations),
+ @PropertySource(CausewayPresets.DatanucleusAutocreateNoValidate),
+ @PropertySource(CausewayPresets.H2InMemory_withUniqueSchema),
})
public class Configuration_usingJdo {
diff --git a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/conf/Configuration_usingJdoAndShiro.java b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/conf/Configuration_usingJdoAndShiro.java
index 042d79393d..43c5c6def7 100644
--- a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/conf/Configuration_usingJdoAndShiro.java
+++ b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/conf/Configuration_usingJdoAndShiro.java
@@ -24,7 +24,7 @@ import org.springframework.context.annotation.Import;
import org.springframework.context.annotation.PropertySource;
import org.springframework.context.annotation.PropertySources;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.core.runtimeservices.CausewayModuleCoreRuntimeServices;
import org.apache.causeway.persistence.jdo.datanucleus.CausewayModulePersistenceJdoDatanucleus;
import org.apache.causeway.security.shiro.CausewayModuleSecurityShiro;
@@ -45,9 +45,9 @@ import org.apache.causeway.testing.fixtures.applib.CausewayModuleTestingFixtures
JdoTestDomainModule.class
})
@PropertySources({
- @PropertySource(IsisPresets.NoTranslations),
- @PropertySource(IsisPresets.DatanucleusAutocreateNoValidate),
- @PropertySource(IsisPresets.H2InMemory_withUniqueSchema),
+ @PropertySource(CausewayPresets.NoTranslations),
+ @PropertySource(CausewayPresets.DatanucleusAutocreateNoValidate),
+ @PropertySource(CausewayPresets.H2InMemory_withUniqueSchema),
})
public class Configuration_usingJdoAndShiro {
diff --git a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/conf/Configuration_usingJpa.java b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/conf/Configuration_usingJpa.java
index 20e450b828..6f2461bffb 100644
--- a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/conf/Configuration_usingJpa.java
+++ b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/conf/Configuration_usingJpa.java
@@ -24,7 +24,7 @@ import org.springframework.context.annotation.Import;
import org.springframework.context.annotation.PropertySource;
import org.springframework.context.annotation.PropertySources;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.core.runtimeservices.CausewayModuleCoreRuntimeServices;
import org.apache.causeway.persistence.jpa.eclipselink.CausewayModulePersistenceJpaEclipselink;
import org.apache.causeway.security.bypass.CausewayModuleSecurityBypass;
@@ -46,8 +46,8 @@ import org.apache.causeway.testing.fixtures.applib.CausewayModuleTestingFixtures
JpaTestDomainModule.class
})
@PropertySources({
- @PropertySource(IsisPresets.NoTranslations),
- @PropertySource(IsisPresets.H2InMemory_withUniqueSchema),
+ @PropertySource(CausewayPresets.NoTranslations),
+ @PropertySource(CausewayPresets.H2InMemory_withUniqueSchema),
})
public class Configuration_usingJpa {
diff --git a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/conf/Configuration_usingSpringDataJpa.java b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/conf/Configuration_usingSpringDataJpa.java
index d5bd110afc..a9d9d2323d 100644
--- a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/conf/Configuration_usingSpringDataJpa.java
+++ b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/conf/Configuration_usingSpringDataJpa.java
@@ -24,7 +24,7 @@ import org.springframework.context.annotation.Import;
import org.springframework.context.annotation.PropertySource;
import org.springframework.context.annotation.PropertySources;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.core.runtimeservices.CausewayModuleCoreRuntimeServices;
import org.apache.causeway.persistence.jpa.eclipselink.CausewayModulePersistenceJpaEclipselink;
import org.apache.causeway.security.bypass.CausewayModuleSecurityBypass;
@@ -47,8 +47,8 @@ import org.apache.causeway.testdomain.util.kv.KVStoreForTesting;
,KVStoreForTesting.class, // Helper for JUnit Tests
})
@PropertySources({
- @PropertySource(IsisPresets.NoTranslations),
- @PropertySource(IsisPresets.H2InMemory_withUniqueSchema),
+ @PropertySource(CausewayPresets.NoTranslations),
+ @PropertySource(CausewayPresets.H2InMemory_withUniqueSchema),
})
public class Configuration_usingSpringDataJpa {
diff --git a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/conf/Configuration_usingWicket.java b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/conf/Configuration_usingWicket.java
index ea4f842f8f..7fcd89f607 100644
--- a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/conf/Configuration_usingWicket.java
+++ b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/conf/Configuration_usingWicket.java
@@ -64,7 +64,7 @@ import org.apache.causeway.viewer.wicket.ui.components.scalars.ScalarFragmentFac
import org.apache.causeway.viewer.wicket.ui.pages.PageClassRegistry;
import org.apache.causeway.viewer.wicket.ui.pages.entity.EntityPage;
import org.apache.causeway.viewer.wicket.viewer.CausewayModuleViewerWicketViewer;
-import org.apache.causeway.viewer.wicket.viewer.wicketapp.IsisWicketAjaxRequestListenerUtil;
+import org.apache.causeway.viewer.wicket.viewer.wicketapp.CausewayWicketAjaxRequestListenerUtil;
import lombok.AccessLevel;
import lombok.Getter;
@@ -370,7 +370,7 @@ public class Configuration_usingWicket {
protected void internalInit() {
super.internalInit();
// intercept AJAX requests and reload view-models so any detached entities are re-fetched
- IsisWicketAjaxRequestListenerUtil.setRootRequestMapper(this, metaModelContext);
+ CausewayWicketAjaxRequestListenerUtil.setRootRequestMapper(this, metaModelContext);
}
}
diff --git a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/jpa/entities/JpaBook.java b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/jpa/entities/JpaBook.java
index d5fa9638d0..9c2995fc9e 100644
--- a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/jpa/entities/JpaBook.java
+++ b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/jpa/entities/JpaBook.java
@@ -43,7 +43,7 @@ import org.apache.causeway.applib.events.lifecycle.ObjectRemovingEvent;
import org.apache.causeway.applib.events.lifecycle.ObjectUpdatedEvent;
import org.apache.causeway.applib.events.lifecycle.ObjectUpdatingEvent;
import org.apache.causeway.applib.jaxb.PersistentEntityAdapter;
-import org.apache.causeway.persistence.jpa.applib.integration.IsisEntityListener;
+import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
import org.apache.causeway.testdomain.model.stereotypes.MyService;
import org.apache.causeway.testdomain.util.dto.BookDto;
import org.apache.causeway.testdomain.util.dto.IBook;
@@ -58,7 +58,7 @@ import lombok.val;
import lombok.extern.log4j.Log4j2;
@Entity
-@EntityListeners(IsisEntityListener.class)
+@EntityListeners(CausewayEntityListener.class)
@DiscriminatorValue("Book")
@Named("testdomain.jpa.Book")
@DomainObject(
diff --git a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/publishing/subscriber/EntityPropertyChangeSubscriberForTesting.java b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/publishing/subscriber/EntityPropertyChangeSubscriberForTesting.java
index 1ab21e232f..21f53ce98f 100644
--- a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/publishing/subscriber/EntityPropertyChangeSubscriberForTesting.java
+++ b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/publishing/subscriber/EntityPropertyChangeSubscriberForTesting.java
@@ -31,7 +31,7 @@ import org.apache.causeway.applib.id.LogicalType;
import org.apache.causeway.applib.services.bookmark.Bookmark;
import org.apache.causeway.applib.services.publishing.spi.EntityPropertyChange;
import org.apache.causeway.applib.services.publishing.spi.EntityPropertyChangeSubscriber;
-import org.apache.causeway.core.config.beans.IsisBeanTypeRegistry;
+import org.apache.causeway.core.config.beans.CausewayBeanTypeRegistry;
import org.apache.causeway.core.config.beans.PersistenceStack;
import org.apache.causeway.core.metamodel.specloader.SpecificationLoader;
import org.apache.causeway.testdomain.util.kv.KVStoreForTesting;
@@ -45,7 +45,7 @@ implements EntityPropertyChangeSubscriber {
@Inject private KVStoreForTesting kvStore;
@Inject private SpecificationLoader specificationLoader;
- @Inject private IsisBeanTypeRegistry isisBeanTypeRegistry;
+ @Inject private CausewayBeanTypeRegistry isisBeanTypeRegistry;
@PostConstruct
public void init() {
diff --git a/security/shiro/src/main/java/org/apache/causeway/security/shiro/authorization/AuthorizorShiro.java b/security/shiro/src/main/java/org/apache/causeway/security/shiro/authorization/AuthorizorShiro.java
index 3bfa43a5c5..47738e6455 100644
--- a/security/shiro/src/main/java/org/apache/causeway/security/shiro/authorization/AuthorizorShiro.java
+++ b/security/shiro/src/main/java/org/apache/causeway/security/shiro/authorization/AuthorizorShiro.java
@@ -80,7 +80,7 @@ public class AuthorizorShiro implements Authorizor {
//_Assert.assertEquals(userName, subject.getPrincipal().toString()); ... does not work
return subject.isPermitted(permission);
} finally {
- IsisPermission.resetVetoedPermissions();
+ CausewayPermission.resetVetoedPermissions();
}
}
diff --git a/security/shiro/src/main/java/org/apache/causeway/security/shiro/authorization/IsisPermission.java b/security/shiro/src/main/java/org/apache/causeway/security/shiro/authorization/CausewayPermission.java
similarity index 83%
rename from security/shiro/src/main/java/org/apache/causeway/security/shiro/authorization/IsisPermission.java
rename to security/shiro/src/main/java/org/apache/causeway/security/shiro/authorization/CausewayPermission.java
index 4d1b0209bb..abb8f09a32 100644
--- a/security/shiro/src/main/java/org/apache/causeway/security/shiro/authorization/IsisPermission.java
+++ b/security/shiro/src/main/java/org/apache/causeway/security/shiro/authorization/CausewayPermission.java
@@ -31,7 +31,7 @@ import lombok.val;
/**
* @since 1.x {@index}
*/
-public class IsisPermission extends WildcardPermission {
+public class CausewayPermission extends WildcardPermission {
private static final long serialVersionUID = 1L;
private static final Pattern PATTERN = Pattern.compile("([!]?)([^/]+)[/](.+)");
@@ -39,14 +39,14 @@ public class IsisPermission extends WildcardPermission {
private boolean isVetoed;
private String permissionGroup;
- public IsisPermission() {
+ public CausewayPermission() {
}
- public IsisPermission(String wildcardString, boolean caseSensitive) {
+ public CausewayPermission(String wildcardString, boolean caseSensitive) {
super(wildcardString, caseSensitive);
}
- public IsisPermission(String wildcardString) {
+ public CausewayPermission(String wildcardString) {
super(wildcardString);
}
@@ -74,8 +74,8 @@ public class IsisPermission extends WildcardPermission {
@Override
public boolean equals(Object other) {
- if (other instanceof IsisPermission) {
- IsisPermission ip = (IsisPermission) other;
+ if (other instanceof CausewayPermission) {
+ CausewayPermission ip = (CausewayPermission) other;
return permissionGroup.equals(ip.getPermissionGroup()) && super.equals(other);
}
return false;
@@ -94,26 +94,26 @@ public class IsisPermission extends WildcardPermission {
// -- HELPER
- private static final ThreadLocal<ListMultimap<String, IsisPermission>> VETOING_PERMISSIONS =
+ private static final ThreadLocal<ListMultimap<String, CausewayPermission>> VETOING_PERMISSIONS =
ThreadLocal.withInitial(_Multimaps::newListMultimap);
public static void resetVetoedPermissions() {
- IsisPermission.VETOING_PERMISSIONS.remove();
+ CausewayPermission.VETOING_PERMISSIONS.remove();
}
private boolean isVetoed(String permissionGroup, Permission permission) {
if(permissionGroup == null) {
return false;
}
- val vetoMultimap = IsisPermission.VETOING_PERMISSIONS.get();
+ val vetoMultimap = CausewayPermission.VETOING_PERMISSIONS.get();
return vetoMultimap.getOrElseEmpty(permissionGroup)
.stream()
.anyMatch(vetoingPermission->vetoingPermission.impliesWithoutVeto(permission));
}
- private void addVeto(IsisPermission vetoingPermission) {
+ private void addVeto(CausewayPermission vetoingPermission) {
val permissionGroup = vetoingPermission.getPermissionGroup();
- val vetoMultimap = IsisPermission.VETOING_PERMISSIONS.get();
+ val vetoMultimap = CausewayPermission.VETOING_PERMISSIONS.get();
vetoMultimap.putElement(permissionGroup, vetoingPermission);
}
diff --git a/security/shiro/src/main/java/org/apache/causeway/security/shiro/authorization/IsisPermissionResolver.java b/security/shiro/src/main/java/org/apache/causeway/security/shiro/authorization/CausewayPermissionResolver.java
similarity index 86%
rename from security/shiro/src/main/java/org/apache/causeway/security/shiro/authorization/IsisPermissionResolver.java
rename to security/shiro/src/main/java/org/apache/causeway/security/shiro/authorization/CausewayPermissionResolver.java
index 88928c6998..60cbeab74d 100644
--- a/security/shiro/src/main/java/org/apache/causeway/security/shiro/authorization/IsisPermissionResolver.java
+++ b/security/shiro/src/main/java/org/apache/causeway/security/shiro/authorization/CausewayPermissionResolver.java
@@ -24,14 +24,14 @@ import org.apache.shiro.authz.permission.PermissionResolver;
/**
* @since 1.x {@index}
*/
-public class IsisPermissionResolver implements PermissionResolver {
+public class CausewayPermissionResolver implements PermissionResolver {
- public IsisPermissionResolver(){
+ public CausewayPermissionResolver(){
}
@Override
public Permission resolvePermission(String permissionString) {
- return new IsisPermission(permissionString);
+ return new CausewayPermission(permissionString);
}
}
diff --git a/security/shiro/src/test/java/org/apache/causeway/security/shiro/IsisPermissionTest_setParts.java b/security/shiro/src/test/java/org/apache/causeway/security/shiro/IsisPermissionTest_setParts.java
index f23e165ebb..4d78603a27 100644
--- a/security/shiro/src/test/java/org/apache/causeway/security/shiro/IsisPermissionTest_setParts.java
+++ b/security/shiro/src/test/java/org/apache/causeway/security/shiro/IsisPermissionTest_setParts.java
@@ -18,7 +18,7 @@
*/
package org.apache.causeway.security.shiro;
-import org.apache.causeway.security.shiro.authorization.IsisPermission;
+import org.apache.causeway.security.shiro.authorization.CausewayPermission;
import org.junit.Test;
import static org.hamcrest.CoreMatchers.is;
@@ -28,27 +28,27 @@ public class IsisPermissionTest_setParts {
@Test
public void noVeto() throws Exception {
- IsisPermission ip = new IsisPermission("com.mycompany.myapp:Customer:changeAddress:r");
+ CausewayPermission ip = new CausewayPermission("com.mycompany.myapp:Customer:changeAddress:r");
assertThat(ip.toString(), is("com.mycompany.myapp:customer:changeaddress:r"));
}
@Test
public void withVetoableDomain() throws Exception {
- IsisPermission ip = new IsisPermission("foo/com.mycompany.myapp:Customer:changeAddress:r");
+ CausewayPermission ip = new CausewayPermission("foo/com.mycompany.myapp:Customer:changeAddress:r");
assertThat(ip.toString(), is("foo/com.mycompany.myapp:customer:changeaddress:r"));
}
@Test
public void withVetoAndVetoableDomain() throws Exception {
- IsisPermission ip = new IsisPermission("!foo/com.mycompany.myapp:Customer:changeAddress:r");
+ CausewayPermission ip = new CausewayPermission("!foo/com.mycompany.myapp:Customer:changeAddress:r");
assertThat(ip.toString(), is("!foo/com.mycompany.myapp:customer:changeaddress:r"));
}
@Test
public void xxx() throws Exception {
- IsisPermission ip = new IsisPermission("schwartz/com.mycompany.myapp:Order:submit:*");
- IsisPermission ip2 = new IsisPermission("com.mycompany.myapp:Customer:remove:r");
+ CausewayPermission ip = new CausewayPermission("schwartz/com.mycompany.myapp:Order:submit:*");
+ CausewayPermission ip2 = new CausewayPermission("com.mycompany.myapp:Customer:remove:r");
assertThat(ip2.implies(ip), is(false));
assertThat(ip.implies(ip2), is(false));
diff --git a/security/shiro/src/test/java/org/apache/causeway/security/shiro/IsisPermissionTest_typicalUsage.java b/security/shiro/src/test/java/org/apache/causeway/security/shiro/IsisPermissionTest_typicalUsage.java
index 431ee61494..5d39105876 100644
--- a/security/shiro/src/test/java/org/apache/causeway/security/shiro/IsisPermissionTest_typicalUsage.java
+++ b/security/shiro/src/test/java/org/apache/causeway/security/shiro/IsisPermissionTest_typicalUsage.java
@@ -18,7 +18,7 @@
*/
package org.apache.causeway.security.shiro;
-import org.apache.causeway.security.shiro.authorization.IsisPermission;
+import org.apache.causeway.security.shiro.authorization.CausewayPermission;
import org.apache.shiro.authz.Permission;
import org.apache.shiro.authz.permission.WildcardPermission;
import org.hamcrest.Description;
@@ -36,12 +36,12 @@ public class IsisPermissionTest_typicalUsage {
@Before
public void setUp() throws Exception {
- IsisPermission.resetVetoedPermissions();
+ CausewayPermission.resetVetoedPermissions();
}
@After
public void tearDown() throws Exception {
- IsisPermission.resetVetoedPermissions();
+ CausewayPermission.resetVetoedPermissions();
}
@@ -132,10 +132,10 @@ public class IsisPermissionTest_typicalUsage {
private static Matcher<? super Permission> permittedBy(final String permissionString) {
- return permittedBy(new IsisPermission(permissionString));
+ return permittedBy(new CausewayPermission(permissionString));
}
- private static Matcher<? super Permission> permittedBy(final IsisPermission wp) {
+ private static Matcher<? super Permission> permittedBy(final CausewayPermission wp) {
return new TypeSafeMatcher<Permission>() {
@Override
diff --git a/security/shiro/src/test/java/org/apache/causeway/security/shiro/authorization/IsisPermissionTest_equals.java b/security/shiro/src/test/java/org/apache/causeway/security/shiro/authorization/IsisPermissionTest_equals.java
index 4fc180a62b..04952bcae9 100644
--- a/security/shiro/src/test/java/org/apache/causeway/security/shiro/authorization/IsisPermissionTest_equals.java
+++ b/security/shiro/src/test/java/org/apache/causeway/security/shiro/authorization/IsisPermissionTest_equals.java
@@ -18,7 +18,7 @@
*/
package org.apache.causeway.security.shiro.authorization;
-import org.apache.causeway.security.shiro.authorization.IsisPermission;
+import org.apache.causeway.security.shiro.authorization.CausewayPermission;
import org.junit.Assert;
import org.junit.Test;
@@ -28,8 +28,8 @@ public class IsisPermissionTest_equals {
@Test
public void differentByPermGroup() throws Exception {
- final IsisPermission perm1 = new IsisPermission("adm/*");
- final IsisPermission perm2 = new IsisPermission("aba/*");
+ final CausewayPermission perm1 = new CausewayPermission("adm/*");
+ final CausewayPermission perm2 = new CausewayPermission("aba/*");
Assert.assertThat(perm1.equals(perm2), is(false));
}
diff --git a/security/shiro/src/test/resources/shiro.ini b/security/shiro/src/test/resources/shiro.ini
index 292d12b262..ac7cd0dc2d 100644
--- a/security/shiro/src/test/resources/shiro.ini
+++ b/security/shiro/src/test/resources/shiro.ini
@@ -20,7 +20,7 @@
# use Causeway components to enable Causeway' syntax for permissions
-globalPermissionResolver = org.apache.causeway.security.shiro.authorization.IsisPermissionResolver
+globalPermissionResolver = org.apache.causeway.security.shiro.authorization.CausewayPermissionResolver
securityManager.authorizer.permissionResolver = $globalPermissionResolver
diff --git a/testing/archtestsupport/applib/src/main/java/org/apache/causeway/testing/archtestsupport/applib/classrules/ArchitectureJpaRules.java b/testing/archtestsupport/applib/src/main/java/org/apache/causeway/testing/archtestsupport/applib/classrules/ArchitectureJpaRules.java
index e054a89c57..ca37f3850d 100644
--- a/testing/archtestsupport/applib/src/main/java/org/apache/causeway/testing/archtestsupport/applib/classrules/ArchitectureJpaRules.java
+++ b/testing/archtestsupport/applib/src/main/java/org/apache/causeway/testing/archtestsupport/applib/classrules/ArchitectureJpaRules.java
@@ -46,7 +46,7 @@ import static com.tngtech.archunit.lang.syntax.ArchRuleDefinition.classes;
import static com.tngtech.archunit.lang.syntax.ArchRuleDefinition.fields;
import org.apache.causeway.applib.annotation.DomainObject;
-import org.apache.causeway.persistence.jpa.applib.integration.IsisEntityListener;
+import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
import static org.apache.causeway.testing.archtestsupport.applib.classrules.CommonPredicates.annotationOf;
import static org.apache.causeway.testing.archtestsupport.applib.classrules.CommonPredicates.haveNoArgProtectedConstructor;
@@ -119,8 +119,8 @@ public class ArchitectureJpaRules {
private boolean containsIsisEntityListener(final JavaClass[] classes) {
//noinspection deprecation
return Arrays.stream(classes)
- .anyMatch(x -> Objects.equals(x.getFullName(), IsisEntityListener.class.getName())
- || x.isAssignableTo(IsisEntityListener.class));
+ .anyMatch(x -> Objects.equals(x.getFullName(), CausewayEntityListener.class.getName())
+ || x.isAssignableTo(CausewayEntityListener.class));
}
};
}
diff --git a/testing/archtestsupport/applib/src/test/java/org/apache/causeway/testing/archtestsupport/applib/entity/jpa/dom/JpaEntity.java b/testing/archtestsupport/applib/src/test/java/org/apache/causeway/testing/archtestsupport/applib/entity/jpa/dom/JpaEntity.java
index a8e75bd757..e9cab3df27 100644
--- a/testing/archtestsupport/applib/src/test/java/org/apache/causeway/testing/archtestsupport/applib/entity/jpa/dom/JpaEntity.java
+++ b/testing/archtestsupport/applib/src/test/java/org/apache/causeway/testing/archtestsupport/applib/entity/jpa/dom/JpaEntity.java
@@ -34,7 +34,7 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.apache.causeway.applib.annotation.DomainObject;
import org.apache.causeway.applib.annotation.Nature;
import org.apache.causeway.applib.jaxb.PersistentEntityAdapter;
-import org.apache.causeway.persistence.jpa.applib.integration.IsisEntityListener;
+import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
import lombok.AccessLevel;
import lombok.RequiredArgsConstructor;
@@ -47,7 +47,7 @@ import lombok.RequiredArgsConstructor;
@DomainObject(nature = Nature.ENTITY)
@XmlJavaTypeAdapter(PersistentEntityAdapter.class)
@RequiredArgsConstructor(access = AccessLevel.PROTECTED)
-@EntityListeners({ IsisEntityListener.class})
+@EntityListeners({ CausewayEntityListener.class})
public class JpaEntity implements Comparable<JpaEntity> {
@Id @Column(name = "id", nullable = false)
diff --git a/testing/archtestsupport/applib/src/test/java/org/apache/causeway/testing/archtestsupport/applib/entity/jpa/dom/JpaEntity2.java b/testing/archtestsupport/applib/src/test/java/org/apache/causeway/testing/archtestsupport/applib/entity/jpa/dom/JpaEntity2.java
index cf42421df3..6911200da3 100644
--- a/testing/archtestsupport/applib/src/test/java/org/apache/causeway/testing/archtestsupport/applib/entity/jpa/dom/JpaEntity2.java
+++ b/testing/archtestsupport/applib/src/test/java/org/apache/causeway/testing/archtestsupport/applib/entity/jpa/dom/JpaEntity2.java
@@ -32,7 +32,7 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.apache.causeway.applib.annotation.DomainObject;
import org.apache.causeway.applib.annotation.Nature;
import org.apache.causeway.applib.jaxb.PersistentEntityAdapter;
-import org.apache.causeway.persistence.jpa.applib.integration.IsisEntityListener;
+import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
@Entity
@Table(
@@ -41,7 +41,7 @@ import org.apache.causeway.persistence.jpa.applib.integration.IsisEntityListener
)
@DomainObject(nature = Nature.ENTITY)
@XmlJavaTypeAdapter(PersistentEntityAdapter.class)
-@EntityListeners({ IsisEntityListener.class})
+@EntityListeners({ CausewayEntityListener.class})
public abstract class JpaEntity2 implements Comparable<JpaEntity2> {
@Id @Column(name = "id", nullable = false)
diff --git a/testing/fakedata/integtests/src/test/java/org/apache/causeway/testing/fakedata/integtests/FakeDataModuleIntegTestAbstract.java b/testing/fakedata/integtests/src/test/java/org/apache/causeway/testing/fakedata/integtests/FakeDataModuleIntegTestAbstract.java
index a316eb1773..85bcba947d 100644
--- a/testing/fakedata/integtests/src/test/java/org/apache/causeway/testing/fakedata/integtests/FakeDataModuleIntegTestAbstract.java
+++ b/testing/fakedata/integtests/src/test/java/org/apache/causeway/testing/fakedata/integtests/FakeDataModuleIntegTestAbstract.java
@@ -20,7 +20,7 @@ package org.apache.causeway.testing.fakedata.integtests;
import javax.transaction.Transactional;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.core.runtimeservices.CausewayModuleCoreRuntimeServices;
import org.apache.causeway.persistence.jdo.applib.CausewayModulePersistenceJdoApplib;
import org.apache.causeway.security.bypass.CausewayModuleSecurityBypass;
@@ -38,15 +38,15 @@ import org.springframework.test.context.TestPropertySource;
@SpringBootTest(
classes = FakeDataModuleIntegTestAbstract.TestManifest.class
)
-@TestPropertySource(IsisPresets.UseLog4j2Test)
+@TestPropertySource(CausewayPresets.UseLog4j2Test)
@ContextConfiguration
@Transactional
public abstract class FakeDataModuleIntegTestAbstract extends IsisIntegrationTestAbstractWithFixtures {
@Configuration
@PropertySources({
- @PropertySource(IsisPresets.NoTranslations),
- @PropertySource(IsisPresets.DatanucleusAutocreateNoValidate),
+ @PropertySource(CausewayPresets.NoTranslations),
+ @PropertySource(CausewayPresets.DatanucleusAutocreateNoValidate),
})
@Import({
CausewayModuleCoreRuntimeServices.class,
diff --git a/viewers/restfulobjects/viewer/src/test/java/org/apache/causeway/viewer/restfulobjects/viewer/context/ResourceContext_getArg_Test.java b/viewers/restfulobjects/viewer/src/test/java/org/apache/causeway/viewer/restfulobjects/viewer/context/ResourceContext_getArg_Test.java
index 0f09b5d312..69cef04e13 100644
--- a/viewers/restfulobjects/viewer/src/test/java/org/apache/causeway/viewer/restfulobjects/viewer/context/ResourceContext_getArg_Test.java
+++ b/viewers/restfulobjects/viewer/src/test/java/org/apache/causeway/viewer/restfulobjects/viewer/context/ResourceContext_getArg_Test.java
@@ -22,7 +22,7 @@ import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
import org.apache.causeway.commons.internal.codec._UrlDecoderUtil;
-import org.apache.causeway.core.interaction.session.IsisInteraction;
+import org.apache.causeway.core.interaction.session.CausewayInteraction;
import org.jmock.Expectations;
import org.jmock.auto.Mock;
import org.junit.Before;
@@ -55,7 +55,7 @@ public class ResourceContext_getArg_Test {
@Mock private HttpServletRequest mockHttpServletRequest;
@Mock private ServletContext mockServletContext;
- @Mock private IsisInteraction mockIsisInteraction;
+ @Mock private CausewayInteraction mockIsisInteraction;
@Mock private InteractionService mockInteractionService;
@Mock private InteractionLayerTracker mockInteractionLayerTracker;
@Mock private AuthenticationManager mockAuthenticationManager;
diff --git a/viewers/wicket/adoc/modules/ROOT/pages/extending/custom-bootstrap-theme.adoc b/viewers/wicket/adoc/modules/ROOT/pages/extending/custom-bootstrap-theme.adoc
index f83a0b94a0..b57010f353 100644
--- a/viewers/wicket/adoc/modules/ROOT/pages/extending/custom-bootstrap-theme.adoc
+++ b/viewers/wicket/adoc/modules/ROOT/pages/extending/custom-bootstrap-theme.adoc
@@ -18,7 +18,7 @@ This defines:
* the resources it needs (the CSS and optional JS and/or fonts), and
* optional urls to load them from a Content Delivery Network (CDN).
-To make use of the custom `ITheme` the application should register it by subclassing `IsisWicketApplication` (also register this in `web.xml`) and add the following snippet:
+To make use of the custom `ITheme` the application should register it by subclassing `CausewayWicketApplication` (also register this in `web.xml`) and add the following snippet:
[source,java]
----
diff --git a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/isis/WicketApplicationInitializer.java b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/isis/WicketApplicationInitializer.java
index 55c4c9277a..41976f0ba7 100644
--- a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/isis/WicketApplicationInitializer.java
+++ b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/isis/WicketApplicationInitializer.java
@@ -21,7 +21,7 @@ package org.apache.causeway.viewer.wicket.model.isis;
import org.apache.wicket.protocol.http.WebApplication;
/**
- * {@code IsisWicketApplication} refiner, supposed to be managed by <i>Spring</i>.
+ * {@code CausewayWicketApplication} refiner, supposed to be managed by <i>Spring</i>.
*
* @since 2.0 {index}
*/
diff --git a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/EntityCollectionModelAbstract.java b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/EntityCollectionModelAbstract.java
index cc80ff99e8..17d2c33ccf 100644
--- a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/EntityCollectionModelAbstract.java
+++ b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/EntityCollectionModelAbstract.java
@@ -20,17 +20,16 @@ package org.apache.causeway.viewer.wicket.model.models;
import java.util.List;
+import org.apache.causeway.applib.Identifier;
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.internal.collections._Lists;
-import org.apache.wicket.model.ChainingModel;
-
-import org.apache.causeway.applib.Identifier;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.core.metamodel.interactions.managed.nonscalar.DataTableModel;
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.core.metamodel.spec.feature.ObjectMember;
import org.apache.causeway.viewer.wicket.model.links.LinkAndLabel;
import org.apache.causeway.viewer.wicket.model.models.interaction.coll.DataTableModelWkt;
+import org.apache.wicket.model.ChainingModel;
import lombok.NonNull;
@@ -71,7 +70,7 @@ implements EntityCollectionModel {
return getObject();
}
-//XXX experiments from IsisWicketApplication_experimental
+//XXX experiments from CausewayWicketApplication_experimental
// public final void setDataTableModel(final DataTableModel dataTableModel) {
// delegate().setObject(dataTableModel);
// }
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/ComponentFactory.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/ComponentFactory.java
index 2587683cc4..67709f9623 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/ComponentFactory.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/ComponentFactory.java
@@ -20,13 +20,12 @@ package org.apache.causeway.viewer.wicket.ui;
import java.io.Serializable;
+import org.apache.causeway.viewer.commons.model.components.UiComponentType;
import org.apache.causeway.viewer.wicket.ui.app.registry.ComponentFactoryRegistry;
import org.apache.wicket.Component;
import org.apache.wicket.model.IModel;
import org.apache.wicket.request.resource.CssResourceReference;
-import org.apache.causeway.viewer.commons.model.components.UiComponentType;
-
/**
* Creates {@link Component}s of a specified {@link UiComponentType}, optionally
* {@link #appliesTo(UiComponentType, IModel) dependent on} the provided
@@ -36,7 +35,7 @@ import org.apache.causeway.viewer.commons.model.components.UiComponentType;
* usage of the chain-of-responsibility design pattern. The available
* {@link ComponentFactory}s are registered through
* {@link ComponentFactoryRegistry} (bootstrapped from the
- * <tt>IsisWicketApplication</tt>); various adapters make it easy to lookup
+ * <tt>CausewayWicketApplication</tt>); various adapters make it easy to lookup
* {@link Component}s from this registry.
*
* @apiNote any implementing class (when used as a plugin) must also be
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/app/logout/LogoutHandlerWkt.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/app/logout/LogoutHandlerWkt.java
index 818035df64..81e31f3fe3 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/app/logout/LogoutHandlerWkt.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/app/logout/LogoutHandlerWkt.java
@@ -23,7 +23,7 @@ import org.apache.wicket.request.cycle.RequestCycle;
import org.springframework.stereotype.Service;
import org.apache.causeway.applib.services.iactnlayer.InteractionLayerTracker;
-import org.apache.causeway.core.interaction.session.IsisInteraction;
+import org.apache.causeway.core.interaction.session.CausewayInteraction;
import org.apache.causeway.core.security.authentication.logout.LogoutHandler;
@@ -46,7 +46,7 @@ public class LogoutHandlerWkt implements LogoutHandler {
if(interactionLayerTracker.isInInteraction()) {
interactionLayerTracker.currentInteraction()
- .map(IsisInteraction.class::cast)
+ .map(CausewayInteraction.class::cast)
.ifPresent(interaction->
interaction.setOnClose(currentWktSession::invalidateNow));
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/PrototypingMessageProvider.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/PrototypingMessageProvider.java
index 899babc560..fecfc08061 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/PrototypingMessageProvider.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/PrototypingMessageProvider.java
@@ -21,7 +21,7 @@ package org.apache.causeway.viewer.wicket.ui.components.collectioncontents.ajaxt
import java.util.Locale;
import org.apache.causeway.commons.internal.base._Timing;
-import org.apache.causeway.core.interaction.session.IsisInteraction;
+import org.apache.causeway.core.interaction.session.CausewayInteraction;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.viewer.wicket.model.models.HasCommonContext;
@@ -59,7 +59,7 @@ implements HasCommonContext {
final StringBuilder tookTimingMessage = new StringBuilder();
getInteractionService().currentInteraction()
- .map(IsisInteraction.class::cast)
+ .map(CausewayInteraction.class::cast)
.ifPresent(interaction->{
val stopWatch = _Timing.atSystemNanos(interaction.getStartedAtSystemNanos());
tookTimingMessage.append(String.format(Locale.US, "... took %.2f seconds", stopWatch.getSeconds()));
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/entity/EntityPage.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/entity/EntityPage.java
index b343661ad3..596f6a184c 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/entity/EntityPage.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/entity/EntityPage.java
@@ -18,26 +18,16 @@
*/
package org.apache.causeway.viewer.wicket.ui.pages.entity;
+import org.apache.causeway.applib.services.user.UserMemento;
import org.apache.causeway.commons.internal.debug._Debug;
import org.apache.causeway.commons.internal.debug.xray.XrayUi;
-import org.apache.wicket.Application;
-import org.apache.wicket.RestartResponseException;
-import org.apache.wicket.authroles.authorization.strategies.role.annotations.AuthorizeInstantiation;
-import org.apache.wicket.markup.head.CssHeaderItem;
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.markup.html.link.BookmarkablePageLink;
-import org.apache.wicket.markup.repeater.RepeatingView;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.apache.wicket.request.resource.CssResourceReference;
-
-import org.apache.causeway.applib.services.user.UserMemento;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.core.metamodel.object.ManagedObjects;
import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
import org.apache.causeway.core.metamodel.spec.feature.ObjectMember;
import org.apache.causeway.core.metamodel.util.Facets;
+import org.apache.causeway.viewer.commons.model.components.UiComponentType;
import org.apache.causeway.viewer.wicket.model.hints.UiHintContainer;
import org.apache.causeway.viewer.wicket.model.modelhelpers.WhereAmIHelper;
import org.apache.causeway.viewer.wicket.model.models.UiObjectWkt;
@@ -45,8 +35,16 @@ import org.apache.causeway.viewer.wicket.model.util.PageParameterUtils;
import org.apache.causeway.viewer.wicket.ui.components.entity.icontitle.EntityIconAndTitlePanel;
import org.apache.causeway.viewer.wicket.ui.pages.PageAbstract;
import org.apache.causeway.viewer.wicket.ui.util.Wkt;
-
-import org.apache.causeway.viewer.commons.model.components.UiComponentType;
+import org.apache.wicket.Application;
+import org.apache.wicket.RestartResponseException;
+import org.apache.wicket.authroles.authorization.strategies.role.annotations.AuthorizeInstantiation;
+import org.apache.wicket.markup.head.CssHeaderItem;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.link.BookmarkablePageLink;
+import org.apache.wicket.markup.repeater.RepeatingView;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+import org.apache.wicket.request.resource.CssResourceReference;
import lombok.val;
@@ -67,7 +65,7 @@ public class EntityPage extends PageAbstract {
/**
* Called reflectively, in support of {@link BookmarkablePageLink} links.
- * Specifically handled by <code>IsisWicketApplication#newPageFactory()</code>
+ * Specifically handled by <code>CausewayWicketApplication#newPageFactory()</code>
*
* Creates an EntityModel from the given page parameters.
* Redirects to the application home page if there is no OID in the parameters.
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/integration/LocalizerForIsis.java b/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/integration/LocalizerForIsis.java
index 74c87bdbcf..5a9752fc33 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/integration/LocalizerForIsis.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/integration/LocalizerForIsis.java
@@ -38,7 +38,7 @@ import org.apache.causeway.applib.services.i18n.TranslationContext;
import org.apache.causeway.applib.services.i18n.TranslationService;
import org.apache.causeway.applib.services.iactnlayer.InteractionService;
import org.apache.causeway.applib.services.iactnlayer.InteractionLayerTracker;
-import org.apache.causeway.viewer.wicket.viewer.wicketapp.IsisWicketApplication;
+import org.apache.causeway.viewer.wicket.viewer.wicketapp.CausewayWicketApplication;
import lombok.val;
@@ -74,7 +74,7 @@ public class LocalizerForIsis extends Localizer {
}
protected String translate(final String key, final Component component) {
- final Class<?> contextClass = determineContextClassElse(component, IsisWicketApplication.class);
+ final Class<?> contextClass = determineContextClassElse(component, CausewayWicketApplication.class);
final TranslationContext context = TranslationContext.forClassName(contextClass);
if(interactionLayerTracker.isInInteraction()) {
return translate(key, context);
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/wicketapp/IsisWicketAjaxRequestListenerUtil.java b/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/wicketapp/CausewayWicketAjaxRequestListenerUtil.java
similarity index 98%
rename from viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/wicketapp/IsisWicketAjaxRequestListenerUtil.java
rename to viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/wicketapp/CausewayWicketAjaxRequestListenerUtil.java
index 3e8dae90b7..6f6989fdc9 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/wicketapp/IsisWicketAjaxRequestListenerUtil.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/wicketapp/CausewayWicketAjaxRequestListenerUtil.java
@@ -35,7 +35,7 @@ import lombok.experimental.UtilityClass;
@UtilityClass
-public final class IsisWicketAjaxRequestListenerUtil {
+public final class CausewayWicketAjaxRequestListenerUtil {
public void setRootRequestMapper(
final WebApplication app,
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/wicketapp/IsisWicketApplication.java b/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/wicketapp/CausewayWicketApplication.java
similarity index 98%
rename from viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/wicketapp/IsisWicketApplication.java
rename to viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/wicketapp/CausewayWicketApplication.java
index 0af90b19fb..af2eb0fb8a 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/wicketapp/IsisWicketApplication.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/wicketapp/CausewayWicketApplication.java
@@ -96,7 +96,7 @@ import lombok.extern.log4j.Log4j2;
*
*/
@Log4j2
-public class IsisWicketApplication
+public class CausewayWicketApplication
extends AuthenticatedWebApplication
implements
HasComponentFactoryRegistry,
@@ -108,8 +108,8 @@ implements
/**
* Convenience locator, down-casts inherited functionality.
*/
- public static IsisWicketApplication get() {
- return (IsisWicketApplication) AuthenticatedWebApplication.get();
+ public static CausewayWicketApplication get() {
+ return (CausewayWicketApplication) AuthenticatedWebApplication.get();
}
@Getter(onMethod = @__(@Override))
@@ -126,7 +126,7 @@ implements
// -- CONSTRUCTION
- public IsisWicketApplication() {
+ public CausewayWicketApplication() {
// equivalent of -Dwicket.ioc.useByteBuddy=true (as opposed to using CGLIB)
System.setProperty("wicket.ioc.useByteBuddy", "true");
}
@@ -146,7 +146,7 @@ implements
super.internalInit();
// intercept AJAX requests and reload view-models so any detached entities are re-fetched
- IsisWicketAjaxRequestListenerUtil.setRootRequestMapper(this, metaModelContext);
+ CausewayWicketAjaxRequestListenerUtil.setRootRequestMapper(this, metaModelContext);
}
private AjaxRequestTarget decorate(final AjaxRequestTarget ajaxRequestTarget) {
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/wicketapp/_PageFactory.java b/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/wicketapp/_PageFactory.java
index fcafc15cf6..e0b0dad7db 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/wicketapp/_PageFactory.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/wicketapp/_PageFactory.java
@@ -42,7 +42,7 @@ import lombok.val;
@RequiredArgsConstructor
class _PageFactory implements IPageFactory {
- private final IsisWicketApplication holder;
+ private final CausewayWicketApplication holder;
private final IPageFactory delegate;
@Override
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/wicketapp/config/WicketViewerCssBundleInit.java b/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/wicketapp/config/WicketViewerCssBundleInit.java
index 088cf24284..6cdaa9c8a6 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/wicketapp/config/WicketViewerCssBundleInit.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/wicketapp/config/WicketViewerCssBundleInit.java
@@ -26,12 +26,11 @@ import org.apache.causeway.viewer.wicket.ui.ComponentFactory;
import org.apache.causeway.viewer.wicket.ui.components.actionmenu.entityactions.AdditionalLinksPanel;
import org.apache.causeway.viewer.wicket.ui.components.scalars.string.MultiLineStringPanel;
import org.apache.causeway.viewer.wicket.ui.panels.PanelUtil;
+import org.apache.causeway.viewer.wicket.viewer.wicketapp.CausewayWicketApplication;
import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.request.resource.CssResourceReference;
import org.springframework.context.annotation.Configuration;
-import org.apache.causeway.viewer.wicket.viewer.wicketapp.IsisWicketApplication;
-
@Configuration
public class WicketViewerCssBundleInit implements WicketApplicationInitializer {
@@ -47,7 +46,7 @@ public class WicketViewerCssBundleInit implements WicketApplicationInitializer {
// create the bundle
webApplication.getResourceBundles()
.addCssBundle(
- IsisWicketApplication.class,
+ CausewayWicketApplication.class,
"isis-wicket-viewer-bundle.css",
cssReferences.toArray(new CssResourceReference[]{}));
@@ -84,7 +83,7 @@ public class WicketViewerCssBundleInit implements WicketApplicationInitializer {
// ... though it turns out we cannot add this particular one to the bundle, because
// it has CSS image links intended to be resolved relative to LinksSelectorPanelAbstract.class.
- // Adding them into the bundle would mean these CSS links are resolved relative to IsisWicketApplication.class
+ // Adding them into the bundle would mean these CSS links are resolved relative to CausewayWicketApplication.class
// instead.
// references.add(PanelUtil.cssResourceReferenceFor(LinksSelectorPanelAbstract.class));
diff --git a/viewers/wicket/viewer/src/test/java/org/apache/causeway/viewer/wicket/viewer/wicketapp/IsisWicketApplication_Defaults.java b/viewers/wicket/viewer/src/test/java/org/apache/causeway/viewer/wicket/viewer/wicketapp/CausewayWicketApplication_Defaults.java
similarity index 90%
rename from viewers/wicket/viewer/src/test/java/org/apache/causeway/viewer/wicket/viewer/wicketapp/IsisWicketApplication_Defaults.java
rename to viewers/wicket/viewer/src/test/java/org/apache/causeway/viewer/wicket/viewer/wicketapp/CausewayWicketApplication_Defaults.java
index f4b2e669e9..ae1f3990d4 100644
--- a/viewers/wicket/viewer/src/test/java/org/apache/causeway/viewer/wicket/viewer/wicketapp/IsisWicketApplication_Defaults.java
+++ b/viewers/wicket/viewer/src/test/java/org/apache/causeway/viewer/wicket/viewer/wicketapp/CausewayWicketApplication_Defaults.java
@@ -32,15 +32,15 @@ import static org.hamcrest.Matchers.nullValue;
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.core.metamodel.objectmanager.memento.ObjectMemento;
import org.apache.causeway.viewer.wicket.viewer.integration.AuthenticatedWebSessionForIsis;
-import org.apache.causeway.viewer.wicket.viewer.wicketapp.IsisWicketApplication;
+import org.apache.causeway.viewer.wicket.viewer.wicketapp.CausewayWicketApplication;
-class IsisWicketApplication_Defaults {
+class CausewayWicketApplication_Defaults {
- private IsisWicketApplication application;
+ private CausewayWicketApplication application;
@BeforeEach
public void setUp() throws Exception {
- application = new IsisWicketApplication();
+ application = new CausewayWicketApplication();
}
@AfterEach
diff --git a/viewers/wicket/viewer/src/test/java/org/apache/causeway/viewer/wicket/viewer/wicketapp/IsisWicketApplication_Pages.java b/viewers/wicket/viewer/src/test/java/org/apache/causeway/viewer/wicket/viewer/wicketapp/CausewayWicketApplication_Pages.java
similarity index 91%
rename from viewers/wicket/viewer/src/test/java/org/apache/causeway/viewer/wicket/viewer/wicketapp/IsisWicketApplication_Pages.java
rename to viewers/wicket/viewer/src/test/java/org/apache/causeway/viewer/wicket/viewer/wicketapp/CausewayWicketApplication_Pages.java
index 82a5e8c38d..65bf4998b8 100644
--- a/viewers/wicket/viewer/src/test/java/org/apache/causeway/viewer/wicket/viewer/wicketapp/IsisWicketApplication_Pages.java
+++ b/viewers/wicket/viewer/src/test/java/org/apache/causeway/viewer/wicket/viewer/wicketapp/CausewayWicketApplication_Pages.java
@@ -22,7 +22,7 @@ import org.apache.causeway.commons.internal.base._Casts;
import org.apache.causeway.viewer.wicket.model.models.PageType;
import org.apache.causeway.viewer.wicket.ui.pages.PageClassRegistry;
import org.apache.causeway.viewer.wicket.ui.pages.home.HomePage;
-import org.apache.causeway.viewer.wicket.viewer.wicketapp.IsisWicketApplication;
+import org.apache.causeway.viewer.wicket.viewer.wicketapp.CausewayWicketApplication;
import org.apache.wicket.Page;
import org.apache.wicket.markup.html.WebPage;
import org.junit.jupiter.api.Test;
@@ -35,18 +35,18 @@ import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;
@ExtendWith(MockitoExtension.class)
-class IsisWicketApplication_Pages {
+class CausewayWicketApplication_Pages {
@Mock PageClassRegistry mockPageClassRegistry;
- private IsisWicketApplication application;
+ private CausewayWicketApplication application;
@Test
public void delegatesToPageClassRegistryToObtainPageTypes() {
final PageType pageType = PageType.HOME;
final Class<HomePage> expectedPageClass = HomePage.class;
- application = new IsisWicketApplication() {
+ application = new CausewayWicketApplication() {
private static final long serialVersionUID = 1L;
@Override
@@ -70,7 +70,7 @@ class IsisWicketApplication_Pages {
final Class<WebPage> expectedPageClass = WebPage.class;
final PageClassRegistry mockPageClassRegistry = Mockito.mock(PageClassRegistry.class);
- application = new IsisWicketApplication() {
+ application = new CausewayWicketApplication() {
private static final long serialVersionUID = 1L;
@Override