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:05:32 UTC
[isis] branch master updated: ISIS-3142: rename IsisConfiguration* and IsisSystemEnvironment*
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 641c9d7216 ISIS-3142: rename IsisConfiguration* and IsisSystemEnvironment*
641c9d7216 is described below
commit 641c9d7216d12b20387990a8fe398559dc40fad8
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Oct 21 08:05:17 2022 +0200
ISIS-3142: rename IsisConfiguration* and IsisSystemEnvironment*
---
.../value/semantics/ValueSemanticsProvider.java | 2 +-
...nfiguration.java => CausewayConfiguration.java} | 39 +++++++++++-----------
.../core/config/CausewayModuleCoreConfig.java | 6 ++--
.../core/config/EclipselinkConfiguration.java | 18 +++++-----
.../config/beans/IsisComponentScanInterceptor.java | 2 +-
...ronment.java => CausewaySystemEnvironment.java} | 8 ++---
.../config/environment/IsisLocaleInitializer.java | 4 +--
.../environment/IsisTimeZoneInitializer.java | 4 +--
.../metamodel/facets/ActionConfigOptions.java | 6 ++--
.../facets/CollectionLayoutConfigOptions.java | 6 ++--
.../facets/DomainObjectConfigOptions.java | 4 +--
.../facets/DomainObjectLayoutConfigOptions.java | 4 +--
.../metamodel/facets/ParameterConfigOptions.java | 4 +--
.../metamodel/facets/PropertyConfigOptions.java | 6 ++--
.../metamodel/specloader/IntrospectionMode.java | 6 ++--
...ion_getMaxTitleLengthInParentedTables_Test.java | 8 ++---
...n_getMaxTitleLengthInStandaloneTables_Test.java | 8 ++---
.../_testing/MetaModelContext_forTesting.java | 18 +++++-----
.../metamodel/_testing/_ServiceInjectorLegacy.java | 6 ++--
.../metamodel/context/HasMetaModelContext.java | 8 ++---
.../context/MetaModelContext_usingSpring.java | 21 ++++++------
.../core/metamodel/context/MetaModelContexts.java | 4 +--
.../PromptStyleFacetForActionLayoutAnnotation.java | 4 +--
.../metamodel/facets/jaxb/JaxbFacetFactory.java | 6 ++--
.../CommandPublishingFacetForActionAnnotation.java | 4 +--
...ommandPublishingFacetForPropertyAnnotation.java | 4 +--
...onPublishingActionFacetForActionAnnotation.java | 4 +--
...blishingPropertyFacetForPropertyAnnotation.java | 4 +--
.../ImmutableFacetForDomainObjectAnnotation.java | 4 +--
...gePublishingFacetForDomainObjectAnnotation.java | 4 +--
.../object/immutable/EditingEnabledFacet.java | 2 +-
.../introspection/IntrospectionPolicyFacet.java | 4 +--
.../title/methods/TitleFacetViaTitleMethod.java | 4 +--
.../depdef/ParameterDependentDefaultsFacet.java | 4 +--
...romptStyleFacetForPropertyLayoutAnnotation.java | 4 +--
.../ProgrammingModelInitFilterDefault.java | 4 +--
.../ApplicationFeatureRepositoryDefault.java | 6 ++--
.../services/grid/GridLoaderServiceDefault.java | 4 +--
.../services/grid/GridSystemServiceAbstract.java | 4 +--
.../grid/bootstrap/GridSystemServiceBootstrap.java | 4 +--
.../services/registry/ServiceRegistryDefault.java | 4 +--
.../causeway/core/metamodel/spec/ActionScope.java | 4 +--
.../core/metamodel/spec/feature/ObjectAction.java | 2 +-
.../specloader/SpecificationLoaderDefault.java | 20 +++++------
.../temporal/TemporalValueSemanticsProvider.java | 6 ++--
.../ViewModelSemanticCheckingFacetFactoryTest.java | 4 +--
.../DomainObjectAnnotationFacetFactoryTest.java | 4 +--
...romptStyleFacetFromPropertyAnnotation_Test.java | 4 +--
.../TemporalValueSemanticsProviderTest.java | 4 +--
.../runtimeservices/email/EmailServiceDefault.java | 4 +--
.../executor/MemberExecutorServiceDefault.java | 4 +--
.../factory/FactoryServiceDefault.java | 4 +--
.../i18n/po/TranslationServicePo.java | 8 ++---
.../menubars/MenuBarsLoaderServiceDefault.java | 8 ++---
.../menubars/bootstrap/MenuBarsServiceBS.java | 4 +--
.../ExceptionRecognizerForDataAccessException.java | 6 ++--
.../repository/RepositoryServiceDefault.java | 4 +--
...eptionRecognizerForDataAccessExceptionTest.java | 4 +--
.../confmenu/ConfigurationViewServiceDefault.java | 12 +++----
.../core/webapp/modules/WebModuleContext.java | 4 +--
.../webappctx/IsisWebAppContextInitializer.java | 4 +--
.../domain/tests/DomainIntrospectionTestJdo.java | 2 +-
.../domain/tests/DomainIntrospectionTestJpa.java | 2 +-
.../_infra/resources/AsciiDocReaderService.java | 4 +--
.../resources/MarkupVariableResolverService.java | 4 +--
.../resources/ResourceReaderService_Test.java | 4 +--
.../applib/dom/CommandLogEntryRepository.java | 4 +--
.../subscriber/CommandSubscriberForCommandLog.java | 4 +--
.../applib/dom/ExecutionLogEntryRepository.java | 4 +--
.../applib/dom/ExecutionOutboxEntryRepository.java | 4 +--
.../examples/DemoIsisInteractionTemplate.java | 2 +-
.../adoc/modules/quartz/examples/DemoJob.java | 4 +--
.../applib/dom/AuditTrailEntryRepository.java | 4 +--
.../dom/ApplicationRoleRepositoryAbstract.java | 4 +--
.../mixins/ApplicationRole_removePermissions.java | 6 ++--
...> CausewayConfigurationRoleAndPermissions.java} | 4 +--
.../seed/IsisExtSecmanAdminRoleAndPermissions.java | 6 ++--
...IsisExtSecmanRegularUserRoleAndPermissions.java | 4 +--
.../scripts/SeedUsersAndRolesFixtureScript.java | 10 +++---
.../secman/applib/user/dom/ApplicationUser.java | 6 ++--
.../dom/ApplicationUserRepositoryAbstract.java | 4 +--
.../user/dom/mixins/ApplicationUser_lock.java | 4 +--
.../ApplicationUserManager_newDelegateUser.java | 4 +--
.../ApplicationUserManager_newLocalUser.java | 4 +--
.../secman/applib/user/menu/MeService.java | 4 +--
.../applib/user/seed/IsisExtSecmanAdminUser.java | 2 +-
.../realm/CausewayModuleExtSecmanShiroRealm.java | 6 ++--
.../dom/ApplicationUserAutoCreationService.java | 4 +--
.../PermissionsEvaluationServiceForSecman.java | 8 ++---
.../userreg/UserRegistrationServiceForSecman.java | 4 +--
.../applib/dom/SessionLogEntryRepository.java | 4 +--
.../spiimpl/SessionLogServiceInitializer.java | 4 +--
.../cors/impl/CausewayModuleExtCors.java | 6 ++--
.../cors/impl/IsisModuleExtCorsImplTest.java | 6 ++--
.../primary/config/PrimaryConfig.java | 4 +--
.../CausewayModuleExtCommandReplaySecondary.java | 4 +--
.../analyser/CommandReplayAnalyserException.java | 4 +--
.../analyser/CommandReplayAnalyserResult.java | 4 +--
.../secondary/config/SecondaryConfig.java | 4 +--
.../viewer/test/source/EndToEnd_IntegTest.java | 4 +--
.../viewer/test/source/GQLSchema_IntegTest.java | 4 +--
.../viewer/source/GraphQlSourceForIsis.java | 8 ++---
.../javafx/ui/components/UiComponentFactoryFx.java | 4 +--
.../vaadin/ui/pages/login/VaadinLoginView.java | 6 ++--
.../CausewayModulePersistenceJdoDatanucleus.java | 6 ++--
.../jdo/metamodel/JdoProgrammingModel.java | 2 +-
...VersionAnnotationFacetFactoryTest_validate.java | 4 +--
.../CausewayModulePersistenceJpaEclipselink.java | 8 ++---
.../jpa/metamodel/JpaProgrammingModel.java | 2 +-
.../domainmodel/SpecloaderPerformanceTest.java | 4 +--
.../causeway/testdomain/shiro/ShiroSecmanTest.java | 4 +--
.../bootstrapping/AutoConfigurationTest.java | 6 ++--
.../SpringServiceProvisioningTest.java | 4 +--
.../testdomain/config/IsisConfigBeanTest.java | 4 +--
.../config/IsisConfigBeanTest_usingHeadless.java | 4 +--
.../DomainModelTest_usingBadDomain.java | 8 ++---
...elTest_usingBadDomain_noAnnotationEnforced.java | 8 ++---
.../DomainModelTest_usingGoodDomain.java | 4 +--
.../testdomain/jdo/JdoTestDomainPersona.java | 4 +--
.../testdomain/jpa/JpaTestDomainPersona.java | 4 +--
.../interaction/DomainObjectTesterFactory.java | 8 ++---
.../keycloak/CausewayModuleSecurityKeycloak.java | 8 ++---
.../services/KeycloakOauth2UserService.java | 4 +--
.../shiro/authentication/AuthenticatorShiro.java | 6 ++--
...AuthenticatorOrAuthorizorTest_authenticate.java | 4 +--
...ticatorOrAuthorizorTest_isVisibleInAnyRole.java | 4 +--
.../spring/CausewayModuleSecuritySpring.java | 4 +--
.../FixtureScriptsSpecificationProvider.java | 2 +-
...iptsSpecificationProviderAutoConfiguration.java | 6 ++--
.../services/InitialFixtureScriptsInstaller.java | 4 +--
.../h2console/ui/webmodule/WebModuleH2Console.java | 10 +++---
.../applib/validate/DomainModelValidator.java | 14 ++++----
.../branding/BrandingUiServiceDefault.java | 6 ++--
.../webmodule/WebModuleJaxrsResteasy4.java | 6 ++--
.../restfulobjects/rendering/IResourceContext.java | 2 +-
...entNegotiationServiceForRestfulObjectsV1_0.java | 8 ++---
.../rendering/util/JsonWriterUtil.java | 4 +--
.../resources/DomainObjectResourceServerside.java | 4 +--
.../resources/DomainServiceResourceServerside.java | 4 +--
.../resources/DomainTypeResourceServerside.java | 4 +--
.../resources/HomePageResourceServerside.java | 4 +--
.../viewer/resources/ImageResourceServerside.java | 4 +--
.../resources/MenuBarsResourceServerside.java | 4 +--
.../viewer/resources/ResourceAbstract.java | 6 ++--
.../viewer/resources/UserResourceServerside.java | 4 +--
.../resources/VersionResourceServerside.java | 4 +--
.../viewer/wicket/model/models/AboutModel.java | 6 ++--
.../wicket/model/models/HasCommonContext.java | 2 +-
.../viewer/wicket/model/models/WelcomeModel.java | 6 ++--
.../viewer/wicket/ui/components/LabelBase.java | 8 ++---
.../wicket/ui/components/about/AboutPanel.java | 4 +--
.../wicket/ui/components/footer/FooterPanel.java | 2 +-
.../wicket/ui/components/welcome/WelcomePanel.java | 4 +--
.../widgets/linkandlabel/ActionLink.java | 2 +-
.../themepicker/IsisWicketThemeSupportDefault.java | 6 ++--
.../viewer/wicket/ui/errors/JGrowlUtil.java | 14 ++++----
.../DatatablesJavaScriptResourceReferenceInit.java | 6 ++--
.../apache/causeway/viewer/wicket/ui/util/Wkt.java | 2 +-
.../services/TranslationsResolverWicket.java | 4 +--
.../wicket/viewer/webmodule/WebModuleWicket.java | 12 +++----
.../viewer/wicketapp/IsisWicketApplication.java | 14 ++++----
.../viewer/wicketapp/config/DebugInitWkt.java | 8 ++---
.../viewer/wicketapp/config/JQueryInitWkt.java | 4 +--
163 files changed, 446 insertions(+), 448 deletions(-)
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/value/semantics/ValueSemanticsProvider.java b/api/applib/src/main/java/org/apache/causeway/applib/value/semantics/ValueSemanticsProvider.java
index db12fd3823..9c5b6e1a93 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/value/semantics/ValueSemanticsProvider.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/value/semantics/ValueSemanticsProvider.java
@@ -43,7 +43,7 @@ import org.apache.causeway.schema.ixn.v2.InteractionDto;
* Whatever the class that implements this interface, it must also expose either
* a <tt>public</tt> no-arg constructor, or (for implementations that also are
* <tt>Facet</tt>s) a <tt>public</tt> constructor that accepts a
- * <tt>FacetHolder</tt>, and <tt>IsisConfiguration</tt> and a
+ * <tt>FacetHolder</tt>, and <tt>CausewayConfiguration</tt> and a
* <tt>ValueSemanticsProviderContext</tt>. This constructor is then used by the
* framework to instantiate the object reflectively.
*
diff --git a/core/config/src/main/java/org/apache/causeway/core/config/IsisConfiguration.java b/core/config/src/main/java/org/apache/causeway/core/config/CausewayConfiguration.java
similarity index 99%
rename from core/config/src/main/java/org/apache/causeway/core/config/IsisConfiguration.java
rename to core/config/src/main/java/org/apache/causeway/core/config/CausewayConfiguration.java
index cb3ce742df..2838887673 100644
--- a/core/config/src/main/java/org/apache/causeway/core/config/IsisConfiguration.java
+++ b/core/config/src/main/java/org/apache/causeway/core/config/CausewayConfiguration.java
@@ -49,21 +49,6 @@ import javax.validation.Payload;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
-import org.apache.causeway.commons.internal.base._NullSafe;
-import org.apache.causeway.commons.internal.context._Context;
-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;
-import org.apache.causeway.core.config.metamodel.facets.DomainObjectLayoutConfigOptions;
-import org.apache.causeway.core.config.metamodel.facets.ParameterConfigOptions;
-import org.apache.causeway.core.config.metamodel.facets.PropertyConfigOptions;
-import org.apache.causeway.core.config.metamodel.services.ApplicationFeaturesInitConfiguration;
-import org.apache.causeway.core.config.metamodel.specloader.IntrospectionMode;
-import org.apache.causeway.core.config.viewer.web.DialogMode;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.core.env.ConfigurableEnvironment;
-import org.springframework.validation.annotation.Validated;
-
import org.apache.causeway.applib.CausewayModuleApplib;
import org.apache.causeway.applib.annotation.ActionLayout;
import org.apache.causeway.applib.annotation.CollectionLayout;
@@ -79,6 +64,20 @@ import org.apache.causeway.applib.services.userreg.EmailNotificationService;
import org.apache.causeway.applib.services.userreg.UserRegistrationService;
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.metamodel.facets.ActionConfigOptions;
+import org.apache.causeway.core.config.metamodel.facets.CollectionLayoutConfigOptions;
+import org.apache.causeway.core.config.metamodel.facets.DomainObjectConfigOptions;
+import org.apache.causeway.core.config.metamodel.facets.DomainObjectLayoutConfigOptions;
+import org.apache.causeway.core.config.metamodel.facets.ParameterConfigOptions;
+import org.apache.causeway.core.config.metamodel.facets.PropertyConfigOptions;
+import org.apache.causeway.core.config.metamodel.services.ApplicationFeaturesInitConfiguration;
+import org.apache.causeway.core.config.metamodel.specloader.IntrospectionMode;
+import org.apache.causeway.core.config.viewer.web.DialogMode;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.core.env.ConfigurableEnvironment;
+import org.springframework.validation.annotation.Validated;
import lombok.Data;
import lombok.Getter;
@@ -94,15 +93,15 @@ import lombok.val;
*
* @since 2.0
*/
-@ConfigurationProperties(IsisConfiguration.ROOT_PREFIX)
+@ConfigurationProperties(CausewayConfiguration.ROOT_PREFIX)
@Data
@Validated
-public class IsisConfiguration {
+public class CausewayConfiguration {
public static final String ROOT_PREFIX = "isis";
private final ConfigurableEnvironment environment;
- public IsisConfiguration(final ConfigurableEnvironment environment) {
+ public CausewayConfiguration(final ConfigurableEnvironment environment) {
this.environment = environment;
}
@@ -3311,7 +3310,7 @@ public class IsisConfiguration {
String value();
String message()
- default "{org.apache.causeway.core.config.IsisConfiguration.AssignableFrom.message}";
+ default "{org.apache.causeway.core.config.CausewayConfiguration.AssignableFrom.message}";
Class<?>[] groups() default { };
@@ -3353,7 +3352,7 @@ public class IsisConfiguration {
String[] value();
String message()
- default "{org.apache.causeway.core.config.IsisConfiguration.OneOf.message}";
+ default "{org.apache.causeway.core.config.CausewayConfiguration.OneOf.message}";
Class<?>[] groups() default { };
diff --git a/core/config/src/main/java/org/apache/causeway/core/config/CausewayModuleCoreConfig.java b/core/config/src/main/java/org/apache/causeway/core/config/CausewayModuleCoreConfig.java
index 974bfdcfbd..8f51bd800e 100644
--- a/core/config/src/main/java/org/apache/causeway/core/config/CausewayModuleCoreConfig.java
+++ b/core/config/src/main/java/org/apache/causeway/core/config/CausewayModuleCoreConfig.java
@@ -27,7 +27,7 @@ import org.apache.causeway.core.config.beans.IsisBeanTypeRegistryDefault;
import org.apache.causeway.core.config.converters.PatternsConverter;
import org.apache.causeway.core.config.datasources.DataSourceIntrospectionService;
import org.apache.causeway.core.config.environment.IsisLocaleInitializer;
-import org.apache.causeway.core.config.environment.IsisSystemEnvironment;
+import org.apache.causeway.core.config.environment.CausewaySystemEnvironment;
import org.apache.causeway.core.config.environment.IsisTimeZoneInitializer;
import org.apache.causeway.core.config.validators.PatternOptionalStringConstraintValidator;
import org.apache.causeway.core.config.viewer.web.WebAppContextPath;
@@ -52,12 +52,12 @@ import lombok.Data;
// @Service's
DataSourceIntrospectionService.class,
IsisBeanTypeRegistryDefault.class,
- IsisSystemEnvironment.class,
+ CausewaySystemEnvironment.class,
WebAppContextPath.class,
})
@EnableConfigurationProperties({
- IsisConfiguration.class,
+ CausewayConfiguration.class,
DatanucleusConfiguration.class,
EclipselinkConfiguration.class,
EclipselinkConfiguration.Weaving.class,
diff --git a/core/config/src/main/java/org/apache/causeway/core/config/EclipselinkConfiguration.java b/core/config/src/main/java/org/apache/causeway/core/config/EclipselinkConfiguration.java
index f6333ffcc5..53820ac6de 100644
--- a/core/config/src/main/java/org/apache/causeway/core/config/EclipselinkConfiguration.java
+++ b/core/config/src/main/java/org/apache/causeway/core/config/EclipselinkConfiguration.java
@@ -80,7 +80,7 @@ public class EclipselinkConfiguration {
/**
* @see <a href="https://www.eclipse.org/eclipselink/documentation/2.7/jpa/extensions/persistenceproperties_ref.htm#CCHIEAIA">eclipselink.descriptor.customizer</a> docs
*/
- @IsisConfiguration.AssignableFrom("org.eclipse.persistence.descriptors.ClassDescriptor")
+ @CausewayConfiguration.AssignableFrom("org.eclipse.persistence.descriptors.ClassDescriptor")
Class<?> customizer = null;
}
@@ -91,7 +91,7 @@ public class EclipselinkConfiguration {
/**
* @see <a href="https://www.eclipse.org/eclipselink/documentation/2.7/jpa/extensions/persistenceproperties_ref.htm#session.customizer">eclipselink.session.customizer</a> docs
*/
- @IsisConfiguration.AssignableFrom("org.eclipse.persistence.config.SessionCustomizer")
+ @CausewayConfiguration.AssignableFrom("org.eclipse.persistence.config.SessionCustomizer")
Class<?> customizer = null;
private final Include include = new Include();
@@ -112,7 +112,7 @@ public class EclipselinkConfiguration {
/**
* @see <a href="https://www.eclipse.org/eclipselink/documentation/2.7/jpa/extensions/persistenceproperties_ref.htm#session-event-listener">eclipselink.session-event-listener</a> docs
*/
- @IsisConfiguration.AssignableFrom("org.eclipse.persistence.sessions.SessionEventListener")
+ @CausewayConfiguration.AssignableFrom("org.eclipse.persistence.sessions.SessionEventListener")
Class<?> sessionEventListener = null;
@@ -174,7 +174,7 @@ public class EclipselinkConfiguration {
/**
* @see <a href="https://www.eclipse.org/eclipselink/documentation/2.7/jpa/extensions/persistenceproperties_ref.htm#CCHEEFGA">eclipselink.cache.database-event-listener</a> docs
*/
- @IsisConfiguration.AssignableFrom("org.eclipse.persistence.platform.database.events.DatabaseEventListener")
+ @CausewayConfiguration.AssignableFrom("org.eclipse.persistence.platform.database.events.DatabaseEventListener")
Class<?> databaseEventListener;
/**
@@ -329,7 +329,7 @@ public class EclipselinkConfiguration {
/**
* @see <a href="https://www.eclipse.org/eclipselink/documentation/2.7/jpa/extensions/persistenceproperties_ref.htm#BABHEJJI">eclipselink.ddl-generation</a> docs
*/
- @IsisConfiguration.OneOf(value={"create-tables", "create-or-extend-tables", "drop-and-create-tables", "none"})
+ @CausewayConfiguration.OneOf(value={"create-tables", "create-or-extend-tables", "drop-and-create-tables", "none"})
String ddlGeneration = "none";
@ConfigurationProperties("eclipselink.ddl-generation")
@@ -340,7 +340,7 @@ public class EclipselinkConfiguration {
/**
* @see <a href="https://www.eclipse.org/eclipselink/documentation/2.7/jpa/extensions/persistenceproperties_ref.htm#BABCDHBB">eclipselink.ddl-generation.output-mode</a> docs
*/
- @IsisConfiguration.OneOf(value={"both", "database", "sql-script"})
+ @CausewayConfiguration.OneOf(value={"both", "database", "sql-script"})
String outputMode = "database";
}
@@ -349,7 +349,7 @@ public class EclipselinkConfiguration {
/**
* @see <a href="https://www.eclipse.org/eclipselink/documentation/2.7/jpa/extensions/persistenceproperties_ref.htm#CCHCJCDJ">eclipselink.exception-handler</a> docs
*/
- @IsisConfiguration.AssignableFrom("org.eclipse.persistence.exceptions.ExceptionHandler")
+ @CausewayConfiguration.AssignableFrom("org.eclipse.persistence.exceptions.ExceptionHandler")
Class<?> exceptionHandler = null;
/**
@@ -382,7 +382,7 @@ public class EclipselinkConfiguration {
/**
* @see <a href="https://www.eclipse.org/eclipselink/documentation/2.7/jpa/extensions/persistenceproperties_ref.htm#CIHIAGAF">eclipselink.jdbc.batch-writing</a> docs
*/
- @IsisConfiguration.OneOf(value={"jdbc", "buffered", "oracle-jdbc", "none"})
+ @CausewayConfiguration.OneOf(value={"jdbc", "buffered", "oracle-jdbc", "none"})
String batchWriting = "none";
@ConfigurationProperties("eclipselink.jdbc.batch-writing")
@@ -508,7 +508,7 @@ public class EclipselinkConfiguration {
@Data
public static class Jpql {
- @IsisConfiguration.OneOf(value={"EclipseLink", "JPA 1.0", "JPA 2.0", "JPA 2.1", "None"})
+ @CausewayConfiguration.OneOf(value={"EclipseLink", "JPA 1.0", "JPA 2.0", "JPA 2.1", "None"})
private String validation = "EclipseLink";
}
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 c918fb70aa..dc4d6e4e5e 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
@@ -24,7 +24,7 @@ import org.springframework.stereotype.Component;
import lombok.NonNull;
/**
- * @apiNote implementing classes must not rely on IsisConfiguration or other provisioned
+ * @apiNote implementing classes must not rely on CausewayConfiguration or other provisioned
* services to be available; type classification happens before the post-construct phase
*
* @since 2.0
diff --git a/core/config/src/main/java/org/apache/causeway/core/config/environment/IsisSystemEnvironment.java b/core/config/src/main/java/org/apache/causeway/core/config/environment/CausewaySystemEnvironment.java
similarity index 96%
rename from core/config/src/main/java/org/apache/causeway/core/config/environment/IsisSystemEnvironment.java
rename to core/config/src/main/java/org/apache/causeway/core/config/environment/CausewaySystemEnvironment.java
index 2b5ebe2d5a..f72cecbdaa 100644
--- a/core/config/src/main/java/org/apache/causeway/core/config/environment/IsisSystemEnvironment.java
+++ b/core/config/src/main/java/org/apache/causeway/core/config/environment/CausewaySystemEnvironment.java
@@ -54,7 +54,7 @@ import lombok.extern.log4j.Log4j2;
@Qualifier("Default")
@Singleton
@Log4j2
-public class IsisSystemEnvironment {
+public class CausewaySystemEnvironment {
@Inject private ApplicationContext springContext;
@@ -74,13 +74,13 @@ public class IsisSystemEnvironment {
// when bootstrapped with Spring, postConstruct() must happen before any call to get() above,
// otherwise we copy over settings from the primed instance already created with get() above,
// then on the _Context replace the primed with this one
- val primed = _Context.getIfAny(IsisSystemEnvironment.class);
+ val primed = _Context.getIfAny(CausewaySystemEnvironment.class);
if(primed!=null) {
- _Context.remove(IsisSystemEnvironment.class);
+ _Context.remove(CausewaySystemEnvironment.class);
this.setPrototyping(primed.isPrototyping());
this.setUnitTesting(primed.isUnitTesting());
}
- _Context.putSingleton(IsisSystemEnvironment.class, this);
+ _Context.putSingleton(CausewaySystemEnvironment.class, this);
}
@PreDestroy
diff --git a/core/config/src/main/java/org/apache/causeway/core/config/environment/IsisLocaleInitializer.java b/core/config/src/main/java/org/apache/causeway/core/config/environment/IsisLocaleInitializer.java
index 1384ef5fe3..9f8624413c 100644
--- a/core/config/src/main/java/org/apache/causeway/core/config/environment/IsisLocaleInitializer.java
+++ b/core/config/src/main/java/org/apache/causeway/core/config/environment/IsisLocaleInitializer.java
@@ -24,7 +24,7 @@ import java.util.Optional;
import javax.annotation.PostConstruct;
import javax.inject.Inject;
-import org.apache.causeway.core.config.IsisConfiguration;
+import org.apache.causeway.core.config.CausewayConfiguration;
import org.springframework.stereotype.Component;
import lombok.extern.log4j.Log4j2;
@@ -33,7 +33,7 @@ import lombok.extern.log4j.Log4j2;
@Log4j2
public class IsisLocaleInitializer {
- @Inject IsisConfiguration configuration;
+ @Inject CausewayConfiguration configuration;
@PostConstruct
public void initLocale() {
diff --git a/core/config/src/main/java/org/apache/causeway/core/config/environment/IsisTimeZoneInitializer.java b/core/config/src/main/java/org/apache/causeway/core/config/environment/IsisTimeZoneInitializer.java
index 2f7e4cf9f6..782d2e3907 100644
--- a/core/config/src/main/java/org/apache/causeway/core/config/environment/IsisTimeZoneInitializer.java
+++ b/core/config/src/main/java/org/apache/causeway/core/config/environment/IsisTimeZoneInitializer.java
@@ -23,7 +23,7 @@ import java.util.TimeZone;
import javax.annotation.PostConstruct;
import javax.inject.Inject;
-import org.apache.causeway.core.config.IsisConfiguration;
+import org.apache.causeway.core.config.CausewayConfiguration;
import org.springframework.stereotype.Component;
import lombok.extern.log4j.Log4j2;
@@ -32,7 +32,7 @@ import lombok.extern.log4j.Log4j2;
@Log4j2
public class IsisTimeZoneInitializer {
- @Inject IsisConfiguration configuration;
+ @Inject CausewayConfiguration configuration;
@PostConstruct
public void initTimeZone() {
diff --git a/core/config/src/main/java/org/apache/causeway/core/config/metamodel/facets/ActionConfigOptions.java b/core/config/src/main/java/org/apache/causeway/core/config/metamodel/facets/ActionConfigOptions.java
index cac4e2379e..025d93271b 100644
--- a/core/config/src/main/java/org/apache/causeway/core/config/metamodel/facets/ActionConfigOptions.java
+++ b/core/config/src/main/java/org/apache/causeway/core/config/metamodel/facets/ActionConfigOptions.java
@@ -18,19 +18,19 @@
*/
package org.apache.causeway.core.config.metamodel.facets;
-import org.apache.causeway.core.config.IsisConfiguration;
+import org.apache.causeway.core.config.CausewayConfiguration;
import lombok.NonNull;
public final class ActionConfigOptions {
public static PublishingPolicy actionCommandPublishingPolicy(
- final @NonNull IsisConfiguration configuration) {
+ final @NonNull CausewayConfiguration configuration) {
return configuration.getApplib().getAnnotation().getAction().getCommandPublishing();
}
public static PublishingPolicy actionExecutionPublishingPolicy(
- final @NonNull IsisConfiguration configuration) {
+ final @NonNull CausewayConfiguration configuration) {
return configuration.getApplib().getAnnotation().getAction().getExecutionPublishing();
}
diff --git a/core/config/src/main/java/org/apache/causeway/core/config/metamodel/facets/CollectionLayoutConfigOptions.java b/core/config/src/main/java/org/apache/causeway/core/config/metamodel/facets/CollectionLayoutConfigOptions.java
index f4b1538999..b376f15f3b 100644
--- a/core/config/src/main/java/org/apache/causeway/core/config/metamodel/facets/CollectionLayoutConfigOptions.java
+++ b/core/config/src/main/java/org/apache/causeway/core/config/metamodel/facets/CollectionLayoutConfigOptions.java
@@ -18,7 +18,7 @@
*/
package org.apache.causeway.core.config.metamodel.facets;
-import org.apache.causeway.core.config.IsisConfiguration;
+import org.apache.causeway.core.config.CausewayConfiguration;
import org.springframework.lang.Nullable;
import lombok.Getter;
@@ -52,7 +52,7 @@ public final class CollectionLayoutConfigOptions {
// -- FACTORIES
public static TableDecoration tableDecoration(
- final @NonNull IsisConfiguration configuration) {
+ final @NonNull CausewayConfiguration configuration) {
return configuration.getApplib().getAnnotation().getCollectionLayout().getTableDecoration();
}
@@ -65,7 +65,7 @@ public final class CollectionLayoutConfigOptions {
return name().toLowerCase();
}
- public static DefaultView from(final IsisConfiguration configuration) {
+ public static DefaultView from(final CausewayConfiguration configuration) {
return configuration.getApplib().getAnnotation().getCollectionLayout().getDefaultView();
}
diff --git a/core/config/src/main/java/org/apache/causeway/core/config/metamodel/facets/DomainObjectConfigOptions.java b/core/config/src/main/java/org/apache/causeway/core/config/metamodel/facets/DomainObjectConfigOptions.java
index 1c0ce9442d..2857da53c5 100644
--- a/core/config/src/main/java/org/apache/causeway/core/config/metamodel/facets/DomainObjectConfigOptions.java
+++ b/core/config/src/main/java/org/apache/causeway/core/config/metamodel/facets/DomainObjectConfigOptions.java
@@ -18,7 +18,7 @@
*/
package org.apache.causeway.core.config.metamodel.facets;
-import org.apache.causeway.core.config.IsisConfiguration;
+import org.apache.causeway.core.config.CausewayConfiguration;
import lombok.NonNull;
@@ -35,7 +35,7 @@ public final class DomainObjectConfigOptions {
}
public static EntityChangePublishingPolicy entityChangePublishingPolicy(
- final @NonNull IsisConfiguration configuration) {
+ final @NonNull CausewayConfiguration configuration) {
return configuration.getApplib().getAnnotation().getDomainObject().getEntityChangePublishing();
}
diff --git a/core/config/src/main/java/org/apache/causeway/core/config/metamodel/facets/DomainObjectLayoutConfigOptions.java b/core/config/src/main/java/org/apache/causeway/core/config/metamodel/facets/DomainObjectLayoutConfigOptions.java
index f45d69b28f..7c9501ac12 100644
--- a/core/config/src/main/java/org/apache/causeway/core/config/metamodel/facets/DomainObjectLayoutConfigOptions.java
+++ b/core/config/src/main/java/org/apache/causeway/core/config/metamodel/facets/DomainObjectLayoutConfigOptions.java
@@ -19,7 +19,7 @@
*/
package org.apache.causeway.core.config.metamodel.facets;
-import org.apache.causeway.core.config.IsisConfiguration;
+import org.apache.causeway.core.config.CausewayConfiguration;
import lombok.NonNull;
@@ -45,7 +45,7 @@ public final class DomainObjectLayoutConfigOptions {
public static DomainObjectLayoutConfigOptions.TableDecoration tableDecoration(
- final @NonNull IsisConfiguration configuration) {
+ final @NonNull CausewayConfiguration configuration) {
return configuration.getApplib().getAnnotation().getDomainObjectLayout().getTableDecoration();
}
diff --git a/core/config/src/main/java/org/apache/causeway/core/config/metamodel/facets/ParameterConfigOptions.java b/core/config/src/main/java/org/apache/causeway/core/config/metamodel/facets/ParameterConfigOptions.java
index 15c7a7fb3d..bcc61a7c5a 100644
--- a/core/config/src/main/java/org/apache/causeway/core/config/metamodel/facets/ParameterConfigOptions.java
+++ b/core/config/src/main/java/org/apache/causeway/core/config/metamodel/facets/ParameterConfigOptions.java
@@ -18,7 +18,7 @@
*/
package org.apache.causeway.core.config.metamodel.facets;
-import org.apache.causeway.core.config.IsisConfiguration;
+import org.apache.causeway.core.config.CausewayConfiguration;
import lombok.NonNull;
@@ -45,7 +45,7 @@ public final class ParameterConfigOptions {
// -- FACTORIES
public static DependentDefaultsPolicy dependentDefaultsPolicy(
- final @NonNull IsisConfiguration configuration) {
+ final @NonNull CausewayConfiguration configuration) {
return configuration.getApplib().getAnnotation().getParameter().getDependentDefaultsPolicy();
}
diff --git a/core/config/src/main/java/org/apache/causeway/core/config/metamodel/facets/PropertyConfigOptions.java b/core/config/src/main/java/org/apache/causeway/core/config/metamodel/facets/PropertyConfigOptions.java
index 0bffc02f44..432215160f 100644
--- a/core/config/src/main/java/org/apache/causeway/core/config/metamodel/facets/PropertyConfigOptions.java
+++ b/core/config/src/main/java/org/apache/causeway/core/config/metamodel/facets/PropertyConfigOptions.java
@@ -18,19 +18,19 @@
*/
package org.apache.causeway.core.config.metamodel.facets;
-import org.apache.causeway.core.config.IsisConfiguration;
+import org.apache.causeway.core.config.CausewayConfiguration;
import lombok.NonNull;
public final class PropertyConfigOptions {
public static PublishingPolicy propertyCommandPublishingPolicy(
- final @NonNull IsisConfiguration configuration) {
+ final @NonNull CausewayConfiguration configuration) {
return configuration.getApplib().getAnnotation().getProperty().getCommandPublishing();
}
public static PublishingPolicy propertyExecutionPublishingPolicy(
- final @NonNull IsisConfiguration configuration) {
+ final @NonNull CausewayConfiguration configuration) {
return configuration.getApplib().getAnnotation().getProperty().getExecutionPublishing();
}
diff --git a/core/config/src/main/java/org/apache/causeway/core/config/metamodel/specloader/IntrospectionMode.java b/core/config/src/main/java/org/apache/causeway/core/config/metamodel/specloader/IntrospectionMode.java
index 8e5d9617b9..d4e0408060 100644
--- a/core/config/src/main/java/org/apache/causeway/core/config/metamodel/specloader/IntrospectionMode.java
+++ b/core/config/src/main/java/org/apache/causeway/core/config/metamodel/specloader/IntrospectionMode.java
@@ -18,9 +18,9 @@
*/
package org.apache.causeway.core.config.metamodel.specloader;
-import org.apache.causeway.core.config.IsisConfiguration;
+import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.config.environment.DeploymentType;
-import org.apache.causeway.core.config.environment.IsisSystemEnvironment;
+import org.apache.causeway.core.config.environment.CausewaySystemEnvironment;
import lombok.val;
@@ -59,7 +59,7 @@ public enum IntrospectionMode {
protected abstract boolean isFullIntrospect(final DeploymentType deploymentType);
- public static boolean isFullIntrospect(IsisConfiguration configuration, IsisSystemEnvironment isisSystemEnvironment) {
+ public static boolean isFullIntrospect(CausewayConfiguration configuration, CausewaySystemEnvironment isisSystemEnvironment) {
val introspectionMode = configuration.getCore().getMetaModel().getIntrospector().getMode();
return introspectionMode.isFullIntrospect(isisSystemEnvironment.getDeploymentType());
}
diff --git a/core/config/src/test/java/org/apache/causeway/core/config/IsisConfiguration_getMaxTitleLengthInParentedTables_Test.java b/core/config/src/test/java/org/apache/causeway/core/config/IsisConfiguration_getMaxTitleLengthInParentedTables_Test.java
index 229301c475..a241f1e207 100644
--- a/core/config/src/test/java/org/apache/causeway/core/config/IsisConfiguration_getMaxTitleLengthInParentedTables_Test.java
+++ b/core/config/src/test/java/org/apache/causeway/core/config/IsisConfiguration_getMaxTitleLengthInParentedTables_Test.java
@@ -18,18 +18,18 @@
*/
package org.apache.causeway.core.config;
-import org.apache.causeway.core.config.IsisConfiguration;
+import org.apache.causeway.core.config.CausewayConfiguration;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-class IsisConfiguration_getMaxTitleLengthInParentedTables_Test {
+class CausewayConfiguration_getMaxTitleLengthInParentedTables_Test {
- private IsisConfiguration configuration;
+ private CausewayConfiguration configuration;
@BeforeEach
void setUp() throws Exception {
- configuration = new IsisConfiguration(null);
+ configuration = new CausewayConfiguration(null);
}
@Test
diff --git a/core/config/src/test/java/org/apache/causeway/core/config/IsisConfiguration_getMaxTitleLengthInStandaloneTables_Test.java b/core/config/src/test/java/org/apache/causeway/core/config/IsisConfiguration_getMaxTitleLengthInStandaloneTables_Test.java
index c48588b128..595e12baae 100644
--- a/core/config/src/test/java/org/apache/causeway/core/config/IsisConfiguration_getMaxTitleLengthInStandaloneTables_Test.java
+++ b/core/config/src/test/java/org/apache/causeway/core/config/IsisConfiguration_getMaxTitleLengthInStandaloneTables_Test.java
@@ -18,18 +18,18 @@
*/
package org.apache.causeway.core.config;
-import org.apache.causeway.core.config.IsisConfiguration;
+import org.apache.causeway.core.config.CausewayConfiguration;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-class IsisConfiguration_getMaxTitleLengthInStandaloneTables_Test {
+class CausewayConfiguration_getMaxTitleLengthInStandaloneTables_Test {
- private IsisConfiguration configuration;
+ private CausewayConfiguration configuration;
@BeforeEach
public void setUp() throws Exception {
- configuration = new IsisConfiguration(null);
+ configuration = new CausewayConfiguration(null);
}
@Test
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 6837b669ad..b4cbf1d0d3 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
@@ -62,12 +62,12 @@ import org.apache.causeway.applib.services.xactn.TransactionState;
import org.apache.causeway.applib.value.semantics.ValueSemanticsAbstract;
import org.apache.causeway.applib.value.semantics.ValueSemanticsProvider;
import org.apache.causeway.applib.value.semantics.ValueSemanticsResolver;
-import org.apache.causeway.core.config.IsisConfiguration;
+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.IsisBeanTypeRegistryDefault;
-import org.apache.causeway.core.config.environment.IsisSystemEnvironment;
+import org.apache.causeway.core.config.environment.CausewaySystemEnvironment;
import org.apache.causeway.core.config.progmodel.ProgrammingModelConstants;
import org.apache.causeway.core.config.viewer.web.WebAppContextPath;
import org.apache.causeway.core.metamodel.commons.ClassUtil;
@@ -128,10 +128,10 @@ implements MetaModelContext {
.build();
@Builder.Default
- private IsisSystemEnvironment systemEnvironment = newIsisSystemEnvironment();
+ private CausewaySystemEnvironment systemEnvironment = newIsisSystemEnvironment();
@Builder.Default
- private IsisConfiguration configuration = newIsisConfiguration();
+ private CausewayConfiguration configuration = newCausewayConfiguration();
@Builder.Default
private ClassSubstitutorRegistry classSubstitutorRegistry =
@@ -260,15 +260,15 @@ implements MetaModelContext {
);
}
- private static IsisSystemEnvironment newIsisSystemEnvironment() {
- val env = new IsisSystemEnvironment();
+ private static CausewaySystemEnvironment newIsisSystemEnvironment() {
+ val env = new CausewaySystemEnvironment();
env.setUnitTesting(true);
return env;
}
- private static IsisConfiguration newIsisConfiguration() {
+ private static CausewayConfiguration newCausewayConfiguration() {
val properties = _Maps.<String, String>newHashMap();
- val config = new IsisConfiguration(new AbstractEnvironment() {
+ val config = new CausewayConfiguration(new AbstractEnvironment() {
@Override
public String getProperty(final String key) {
return properties.get(key);
@@ -410,7 +410,7 @@ implements MetaModelContext {
val currentConfigBackup = this.configuration;
try {
- this.configuration = new IsisConfiguration(new AbstractEnvironment() {
+ this.configuration = new CausewayConfiguration(new AbstractEnvironment() {
@Override
public String getProperty(final String key) {
return properties.get(key);
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/_testing/_ServiceInjectorLegacy.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/_testing/_ServiceInjectorLegacy.java
index 2d37aacc37..098b5798c8 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/_testing/_ServiceInjectorLegacy.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/_testing/_ServiceInjectorLegacy.java
@@ -45,7 +45,7 @@ import org.springframework.core.MethodParameter;
import org.apache.causeway.applib.exceptions.unrecoverable.MetaModelException;
import org.apache.causeway.applib.services.inject.ServiceInjector;
import org.apache.causeway.applib.services.registry.ServiceRegistry;
-import org.apache.causeway.core.config.IsisConfiguration;
+import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.metamodel.commons.ToString;
import lombok.NonNull;
@@ -56,7 +56,7 @@ import lombok.extern.log4j.Log4j2;
final class _ServiceInjectorLegacy implements ServiceInjector {
@SuppressWarnings("unused")
- @Inject private IsisConfiguration configuration;
+ @Inject private CausewayConfiguration configuration;
@Inject private ServiceRegistry serviceRegistry;
@Inject private _InjectorMethodEvaluator injectorMethodEvaluator;
@@ -298,7 +298,7 @@ final class _ServiceInjectorLegacy implements ServiceInjector {
* JUnit Test support.
*/
public static _ServiceInjectorLegacy getInstanceAndInit(
- final IsisConfiguration configuration,
+ final CausewayConfiguration configuration,
final ServiceRegistry serviceRegistry,
final _InjectorMethodEvaluator injectorMethodEvaluator) {
val instance = new _ServiceInjectorLegacy();
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/context/HasMetaModelContext.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/context/HasMetaModelContext.java
index 22d9665e4e..631471ce87 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/context/HasMetaModelContext.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/context/HasMetaModelContext.java
@@ -38,8 +38,8 @@ import org.apache.causeway.applib.services.repository.RepositoryService;
import org.apache.causeway.applib.services.title.TitleService;
import org.apache.causeway.applib.services.wrapper.WrapperFactory;
import org.apache.causeway.applib.services.xactn.TransactionService;
-import org.apache.causeway.core.config.IsisConfiguration;
-import org.apache.causeway.core.config.environment.IsisSystemEnvironment;
+import org.apache.causeway.core.config.CausewayConfiguration;
+import org.apache.causeway.core.config.environment.CausewaySystemEnvironment;
import org.apache.causeway.core.config.viewer.web.WebAppContextPath;
import org.apache.causeway.core.metamodel.execution.MemberExecutorService;
import org.apache.causeway.core.metamodel.facets.object.icon.ObjectIconService;
@@ -60,11 +60,11 @@ public interface HasMetaModelContext {
// -- SHORTCUTS
- default IsisSystemEnvironment getSystemEnvironment() {
+ default CausewaySystemEnvironment getSystemEnvironment() {
return getMetaModelContext().getSystemEnvironment();
}
- default IsisConfiguration getConfiguration() {
+ default CausewayConfiguration getConfiguration() {
return getMetaModelContext().getConfiguration();
}
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/context/MetaModelContext_usingSpring.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/context/MetaModelContext_usingSpring.java
index 18116c6102..7e7ed9a656 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/context/MetaModelContext_usingSpring.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/context/MetaModelContext_usingSpring.java
@@ -24,11 +24,6 @@ import java.util.Optional;
import java.util.stream.Collectors;
import java.util.stream.Stream;
-import org.apache.causeway.commons.internal.base._Lazy;
-import org.apache.causeway.commons.internal.exceptions._Exceptions;
-import org.apache.causeway.commons.internal.ioc._IocContainer;
-import org.apache.causeway.commons.internal.ioc._ManagedBeanAdapter;
-
import org.apache.causeway.applib.services.factory.FactoryService;
import org.apache.causeway.applib.services.homepage.HomePageResolverService;
import org.apache.causeway.applib.services.i18n.TranslationService;
@@ -43,8 +38,12 @@ import org.apache.causeway.applib.services.repository.RepositoryService;
import org.apache.causeway.applib.services.title.TitleService;
import org.apache.causeway.applib.services.wrapper.WrapperFactory;
import org.apache.causeway.applib.services.xactn.TransactionService;
-import org.apache.causeway.core.config.IsisConfiguration;
-import org.apache.causeway.core.config.environment.IsisSystemEnvironment;
+import org.apache.causeway.commons.internal.base._Lazy;
+import org.apache.causeway.commons.internal.exceptions._Exceptions;
+import org.apache.causeway.commons.internal.ioc._IocContainer;
+import org.apache.causeway.commons.internal.ioc._ManagedBeanAdapter;
+import org.apache.causeway.core.config.CausewayConfiguration;
+import org.apache.causeway.core.config.environment.CausewaySystemEnvironment;
import org.apache.causeway.core.config.viewer.web.WebAppContextPath;
import org.apache.causeway.core.metamodel.execution.MemberExecutorService;
import org.apache.causeway.core.metamodel.facets.object.icon.ObjectIconService;
@@ -67,12 +66,12 @@ class MetaModelContext_usingSpring implements MetaModelContext {
}
@Getter(lazy=true)
- private final IsisSystemEnvironment systemEnvironment =
- getSingletonElseFail(IsisSystemEnvironment.class);
+ private final CausewaySystemEnvironment systemEnvironment =
+ getSingletonElseFail(CausewaySystemEnvironment.class);
@Getter(lazy=true)
- private final IsisConfiguration configuration =
- getSingletonElseFail(IsisConfiguration.class);
+ private final CausewayConfiguration configuration =
+ getSingletonElseFail(CausewayConfiguration.class);
@Getter(lazy=true)
private final ServiceInjector serviceInjector =
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/context/MetaModelContexts.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/context/MetaModelContexts.java
index f3eaed2d91..6a44e1a821 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/context/MetaModelContexts.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/context/MetaModelContexts.java
@@ -25,7 +25,7 @@ import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Primary;
-import org.apache.causeway.core.config.environment.IsisSystemEnvironment;
+import org.apache.causeway.core.config.environment.CausewaySystemEnvironment;
import org.apache.causeway.core.metamodel.CausewayModuleCoreMetamodel;
/**
@@ -38,7 +38,7 @@ import org.apache.causeway.core.metamodel.CausewayModuleCoreMetamodel;
public class MetaModelContexts {
@Bean @Singleton @Primary
- public MetaModelContext metaModelContext(final IsisSystemEnvironment systemEnvironment) {
+ public MetaModelContext metaModelContext(final CausewaySystemEnvironment systemEnvironment) {
return new MetaModelContext_usingSpring(systemEnvironment.getIocContainer());
}
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/layout/PromptStyleFacetForActionLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/layout/PromptStyleFacetForActionLayoutAnnotation.java
index 365110e658..36e8b46db1 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/layout/PromptStyleFacetForActionLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/layout/PromptStyleFacetForActionLayoutAnnotation.java
@@ -25,7 +25,7 @@ import org.apache.causeway.commons.internal.base._Optionals;
import org.apache.causeway.applib.annotation.ActionLayout;
import org.apache.causeway.applib.annotation.PromptStyle;
-import org.apache.causeway.core.config.IsisConfiguration;
+import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.object.promptStyle.PromptStyleFacet;
import org.apache.causeway.core.metamodel.facets.object.promptStyle.PromptStyleFacetAbstract;
@@ -43,7 +43,7 @@ extends PromptStyleFacetAbstract {
public static Optional<PromptStyleFacet> create(
final Optional<ActionLayout> actionLayoutIfAny,
- final IsisConfiguration configuration,
+ final CausewayConfiguration configuration,
final FacetHolder holder) {
return _Optionals.<PromptStyleFacet>orNullable(
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/jaxb/JaxbFacetFactory.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/jaxb/JaxbFacetFactory.java
index 1f09d9521e..7cda042f31 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/jaxb/JaxbFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/jaxb/JaxbFacetFactory.java
@@ -40,7 +40,7 @@ import org.apache.causeway.commons.internal.reflection._Reflect;
import static org.apache.causeway.commons.internal.reflection._Reflect.Filter.isPublic;
import static org.apache.causeway.commons.internal.reflection._Reflect.Filter.paramCount;
-import org.apache.causeway.core.config.IsisConfiguration;
+import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.core.metamodel.facetapi.FeatureType;
import org.apache.causeway.core.metamodel.facetapi.MetaModelRefiner;
@@ -185,7 +185,7 @@ implements MetaModelRefiner {
}
- private List<TypeValidator> getTypeValidators(final IsisConfiguration configuration) {
+ private List<TypeValidator> getTypeValidators(final CausewayConfiguration configuration) {
final List<TypeValidator> typeValidators = _Lists.newArrayList();
if(configuration.getCore().getMetaModel().getValidator().getJaxbViewModel().isNotAbstract()) {
@@ -200,7 +200,7 @@ implements MetaModelRefiner {
return typeValidators;
}
- private List<AssociationValidator> getAssociationValidators(final IsisConfiguration configuration) {
+ private List<AssociationValidator> getAssociationValidators(final CausewayConfiguration configuration) {
final List<AssociationValidator> associationValidators = _Lists.newArrayList();
if(configuration.getCore().getMetaModel().getValidator().getJaxbViewModel().isReferenceTypeAdapter()) {
associationValidators.add(new PropertyValidatorForReferenceTypes());
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/publish/command/CommandPublishingFacetForActionAnnotation.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/publish/command/CommandPublishingFacetForActionAnnotation.java
index d9250feff5..709f97489e 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/publish/command/CommandPublishingFacetForActionAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/publish/command/CommandPublishingFacetForActionAnnotation.java
@@ -26,7 +26,7 @@ import org.apache.causeway.applib.annotation.Action;
import org.apache.causeway.applib.annotation.Publishing;
import org.apache.causeway.applib.services.commanddto.processor.CommandDtoProcessor;
import org.apache.causeway.applib.services.inject.ServiceInjector;
-import org.apache.causeway.core.config.IsisConfiguration;
+import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.config.metamodel.facets.ActionConfigOptions;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.actions.semantics.ActionSemanticsFacet;
@@ -37,7 +37,7 @@ public class CommandPublishingFacetForActionAnnotation extends CommandPublishing
public static Optional<CommandPublishingFacet> create(
final Optional<Action> actionsIfAny,
- final IsisConfiguration configuration,
+ final CausewayConfiguration configuration,
final ServiceInjector servicesInjector,
final FacetHolder holder) {
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/publish/command/CommandPublishingFacetForPropertyAnnotation.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/publish/command/CommandPublishingFacetForPropertyAnnotation.java
index 21607c15c0..205e6db69e 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/publish/command/CommandPublishingFacetForPropertyAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/publish/command/CommandPublishingFacetForPropertyAnnotation.java
@@ -26,7 +26,7 @@ import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.Publishing;
import org.apache.causeway.applib.services.commanddto.processor.CommandDtoProcessor;
import org.apache.causeway.applib.services.inject.ServiceInjector;
-import org.apache.causeway.core.config.IsisConfiguration;
+import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.config.metamodel.facets.PropertyConfigOptions;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
@@ -36,7 +36,7 @@ public class CommandPublishingFacetForPropertyAnnotation extends CommandPublishi
public static Optional<CommandPublishingFacet> create(
final Optional<Property> propertyIfAny,
- final IsisConfiguration configuration,
+ final CausewayConfiguration configuration,
final FacetHolder holder,
final ServiceInjector servicesInjector) {
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/publish/execution/ExecutionPublishingActionFacetForActionAnnotation.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/publish/execution/ExecutionPublishingActionFacetForActionAnnotation.java
index ac541b84a5..aa12190222 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/publish/execution/ExecutionPublishingActionFacetForActionAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/publish/execution/ExecutionPublishingActionFacetForActionAnnotation.java
@@ -24,7 +24,7 @@ import org.apache.causeway.commons.internal.base._Optionals;
import org.apache.causeway.applib.annotation.Action;
import org.apache.causeway.applib.annotation.Publishing;
-import org.apache.causeway.core.config.IsisConfiguration;
+import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.config.metamodel.facets.ActionConfigOptions;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.actions.semantics.ActionSemanticsFacet;
@@ -36,7 +36,7 @@ extends ExecutionPublishingFacetAbstract {
public static Optional<ExecutionPublishingFacet> create(
final Optional<Action> actionsIfAny,
- final IsisConfiguration configuration,
+ final CausewayConfiguration configuration,
final FacetHolder holder) {
val publishingPolicy = ActionConfigOptions.actionExecutionPublishingPolicy(configuration);
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/publish/execution/ExecutionPublishingPropertyFacetForPropertyAnnotation.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/publish/execution/ExecutionPublishingPropertyFacetForPropertyAnnotation.java
index c7439576bb..4a46a26b39 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/publish/execution/ExecutionPublishingPropertyFacetForPropertyAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/publish/execution/ExecutionPublishingPropertyFacetForPropertyAnnotation.java
@@ -24,7 +24,7 @@ import org.apache.causeway.commons.internal.base._Optionals;
import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.Publishing;
-import org.apache.causeway.core.config.IsisConfiguration;
+import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.config.metamodel.facets.PropertyConfigOptions;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
@@ -35,7 +35,7 @@ extends ExecutionPublishingFacetAbstract {
public static Optional<ExecutionPublishingFacet> create(
final Optional<Property> propertyIfAny,
- final IsisConfiguration configuration,
+ final CausewayConfiguration configuration,
final FacetHolder holder) {
val publishingPolicy = PropertyConfigOptions.propertyExecutionPublishingPolicy(configuration);
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobject/editing/ImmutableFacetForDomainObjectAnnotation.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobject/editing/ImmutableFacetForDomainObjectAnnotation.java
index d706d47d7e..d2318ba6f1 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobject/editing/ImmutableFacetForDomainObjectAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobject/editing/ImmutableFacetForDomainObjectAnnotation.java
@@ -23,7 +23,7 @@ import java.util.Optional;
import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.apache.causeway.applib.annotation.DomainObject;
-import org.apache.causeway.core.config.IsisConfiguration;
+import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.config.metamodel.facets.DomainObjectConfigOptions;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.object.immutable.ImmutableFacet;
@@ -38,7 +38,7 @@ extends ImmutableFacetAbstract {
public static Optional<ImmutableFacet> create(
final Optional<DomainObject> domainObjectIfAny,
- final IsisConfiguration configuration,
+ final CausewayConfiguration configuration,
final FacetHolder holder) {
final boolean editingDisabledByDefault =
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobject/entitychangepublishing/EntityChangePublishingFacetForDomainObjectAnnotation.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobject/entitychangepublishing/EntityChangePublishingFacetForDomainObjectAnnotation.java
index b2349e68a8..5159d2ed9e 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobject/entitychangepublishing/EntityChangePublishingFacetForDomainObjectAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobject/entitychangepublishing/EntityChangePublishingFacetForDomainObjectAnnotation.java
@@ -24,7 +24,7 @@ import java.util.Optional;
import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.apache.causeway.applib.annotation.Publishing;
-import org.apache.causeway.core.config.IsisConfiguration;
+import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.config.metamodel.facets.DomainObjectConfigOptions;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.object.publish.entitychange.EntityChangePublishingFacet;
@@ -37,7 +37,7 @@ extends EntityChangePublishingFacetAbstract {
public static Optional<EntityChangePublishingFacet> create(
final Optional<Publishing> entityChangePublishingIfAny,
- final IsisConfiguration configuration,
+ final CausewayConfiguration configuration,
final FacetHolder holder) {
val publish = entityChangePublishingIfAny.orElse(Publishing.AS_CONFIGURED);
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/immutable/EditingEnabledFacet.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/immutable/EditingEnabledFacet.java
index a35dfd2981..7bfb2d0561 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/immutable/EditingEnabledFacet.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/immutable/EditingEnabledFacet.java
@@ -26,7 +26,7 @@ import org.apache.causeway.core.metamodel.facets.object.value.ValueFacet;
* modified either through the viewer or indeed programmatically.
* <p>
* Overrides at type level the object editing configuration
- * {@link org.apache.causeway.core.config.IsisConfiguration.Applib.Annotation.DomainObject#getEditing()}
+ * {@link org.apache.causeway.core.config.CausewayConfiguration.Applib.Annotation.DomainObject#getEditing()}
*
* @see ValueFacet
*
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/introspection/IntrospectionPolicyFacet.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/introspection/IntrospectionPolicyFacet.java
index 9e5ac0935b..dd96d9acad 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/introspection/IntrospectionPolicyFacet.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/introspection/IntrospectionPolicyFacet.java
@@ -25,7 +25,7 @@ import org.apache.causeway.applib.annotation.DomainObject;
import org.apache.causeway.applib.annotation.Introspection;
import org.apache.causeway.applib.annotation.Introspection.EncapsulationPolicy;
import org.apache.causeway.applib.annotation.Introspection.IntrospectionPolicy;
-import org.apache.causeway.core.config.IsisConfiguration;
+import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.metamodel.facetapi.Facet;
/**
@@ -37,7 +37,7 @@ public interface IntrospectionPolicyFacet extends Facet {
Introspection getIntrospection();
- default IntrospectionPolicy getIntrospectionPolicy(final IsisConfiguration isisConfig) {
+ default IntrospectionPolicy getIntrospectionPolicy(final CausewayConfiguration isisConfig) {
switch(getIntrospection()) {
case ENCAPSULATION_ENABLED:
return IntrospectionPolicy.ENCAPSULATION_ENABLED;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/title/methods/TitleFacetViaTitleMethod.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/title/methods/TitleFacetViaTitleMethod.java
index 78bede2d55..e6da67e37e 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/title/methods/TitleFacetViaTitleMethod.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/title/methods/TitleFacetViaTitleMethod.java
@@ -26,7 +26,7 @@ import org.springframework.lang.Nullable;
import org.apache.causeway.applib.services.i18n.TranslatableString;
import org.apache.causeway.applib.services.i18n.TranslationContext;
-import org.apache.causeway.core.config.environment.IsisSystemEnvironment;
+import org.apache.causeway.core.config.environment.CausewaySystemEnvironment;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.HasImperativeAspect;
@@ -92,7 +92,7 @@ implements HasImperativeAspect {
} catch (final RuntimeException ex) {
val isUnitTesting = Optional.ofNullable(getMetaModelContext())
.map(MetaModelContext::getSystemEnvironment)
- .map(IsisSystemEnvironment::isUnitTesting)
+ .map(CausewaySystemEnvironment::isUnitTesting)
.orElse(false);
if(!isUnitTesting) {
log.warn("Failed Title {}", owningAdapter.getSpecification(), ex);
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/parameter/depdef/ParameterDependentDefaultsFacet.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/parameter/depdef/ParameterDependentDefaultsFacet.java
index ef08356a2f..26379db749 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/parameter/depdef/ParameterDependentDefaultsFacet.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/parameter/depdef/ParameterDependentDefaultsFacet.java
@@ -24,7 +24,7 @@ import java.util.Optional;
import org.apache.causeway.commons.internal.base._Optionals;
import org.apache.causeway.applib.annotation.Parameter;
-import org.apache.causeway.core.config.IsisConfiguration;
+import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.config.metamodel.facets.ParameterConfigOptions;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.SingleValueFacet;
@@ -42,7 +42,7 @@ extends SingleValueFacet<ParameterConfigOptions.DependentDefaultsPolicy> {
static Optional<ParameterDependentDefaultsFacet> create(
final Optional<Parameter> parameterIfAny,
- final IsisConfiguration configuration,
+ final CausewayConfiguration configuration,
final FacetHolder holder) {
final ParameterConfigOptions.DependentDefaultsPolicy defaultPolicyFromConfig =
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/propertylayout/PromptStyleFacetForPropertyLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/propertylayout/PromptStyleFacetForPropertyLayoutAnnotation.java
index ea8b8fc246..a9f9bce766 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/propertylayout/PromptStyleFacetForPropertyLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/propertylayout/PromptStyleFacetForPropertyLayoutAnnotation.java
@@ -25,7 +25,7 @@ import org.apache.causeway.commons.internal.base._Optionals;
import org.apache.causeway.applib.annotation.PromptStyle;
import org.apache.causeway.applib.annotation.PropertyLayout;
-import org.apache.causeway.core.config.IsisConfiguration;
+import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facetapi.FeatureType;
import org.apache.causeway.core.metamodel.facets.FacetedMethod;
@@ -45,7 +45,7 @@ extends PromptStyleFacetAbstract {
public static Optional<PromptStyleFacet> create(
final Optional<PropertyLayout> propertyLayoutIfAny,
- final IsisConfiguration configuration,
+ final CausewayConfiguration configuration,
final FacetHolder holder) {
// guard against member not being a property
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/progmodel/ProgrammingModelInitFilterDefault.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/progmodel/ProgrammingModelInitFilterDefault.java
index 9a4791dd3c..6110da8ac9 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/progmodel/ProgrammingModelInitFilterDefault.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/progmodel/ProgrammingModelInitFilterDefault.java
@@ -27,7 +27,7 @@ import javax.inject.Named;
import org.springframework.stereotype.Component;
-import org.apache.causeway.core.config.IsisConfiguration;
+import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.metamodel.CausewayModuleCoreMetamodel;
import org.apache.causeway.core.metamodel.facets.FacetFactory;
import org.apache.causeway.core.metamodel.postprocessors.ObjectSpecificationPostProcessor;
@@ -47,7 +47,7 @@ import lombok.val;
@Named(CausewayModuleCoreMetamodel.NAMESPACE + ".ProgrammingModelInitFilterDefault")
public class ProgrammingModelInitFilterDefault implements ProgrammingModelInitFilter {
- @Inject private IsisConfiguration configuration;
+ @Inject private CausewayConfiguration configuration;
private Predicate<ProgrammingModel.Marker[]> filterOnMarker = excludingNone();
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java
index 4c18a704b2..3cbdd1bcda 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java
@@ -46,7 +46,7 @@ import org.apache.causeway.applib.services.appfeat.ApplicationFeatureId;
import org.apache.causeway.applib.services.appfeat.ApplicationFeatureRepository;
import org.apache.causeway.applib.services.appfeat.ApplicationFeatureSort;
import org.apache.causeway.applib.services.appfeat.ApplicationMemberSort;
-import org.apache.causeway.core.config.IsisConfiguration;
+import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.config.metamodel.services.ApplicationFeaturesInitConfiguration;
import org.apache.causeway.core.metamodel.CausewayModuleCoreMetamodel;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
@@ -86,12 +86,12 @@ implements ApplicationFeatureRepository, MetamodelListener {
// apparently not used
//private final ListMultimap<String, ApplicationFeature> memberFeaturesByLogicalTypeName = _Multimaps.newListTreeMultimap();
- private final IsisConfiguration configuration;
+ private final CausewayConfiguration configuration;
private final SpecificationLoader specificationLoader;
@Inject
public ApplicationFeatureRepositoryDefault(
- final IsisConfiguration configuration,
+ final CausewayConfiguration configuration,
final SpecificationLoader specificationLoader) {
this.configuration = configuration;
this.specificationLoader = specificationLoader;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/grid/GridLoaderServiceDefault.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/grid/GridLoaderServiceDefault.java
index 7076a41df7..30d1ac32f7 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/grid/GridLoaderServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/grid/GridLoaderServiceDefault.java
@@ -41,7 +41,7 @@ import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.applib.layout.grid.Grid;
import org.apache.causeway.applib.services.grid.GridLoaderService;
import org.apache.causeway.applib.services.message.MessageService;
-import org.apache.causeway.core.config.environment.IsisSystemEnvironment;
+import org.apache.causeway.core.config.environment.CausewaySystemEnvironment;
import org.apache.causeway.core.metamodel.CausewayModuleCoreMetamodel;
import lombok.NonNull;
@@ -66,7 +66,7 @@ public class GridLoaderServiceDefault implements GridLoaderService {
public GridLoaderServiceDefault(
final GridReaderUsingJaxb gridReader,
final MessageService messageService,
- final IsisSystemEnvironment isisSystemEnvironment) {
+ final CausewaySystemEnvironment isisSystemEnvironment) {
this.gridReader = gridReader;
this.messageService = messageService;
this.supportsReloading = isisSystemEnvironment.isPrototyping();
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/grid/GridSystemServiceAbstract.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/grid/GridSystemServiceAbstract.java
index fce27f787c..3b19ec657b 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/grid/GridSystemServiceAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/grid/GridSystemServiceAbstract.java
@@ -38,7 +38,7 @@ import org.apache.causeway.applib.services.grid.GridSystemService;
import org.apache.causeway.applib.services.i18n.TranslationService;
import org.apache.causeway.applib.services.jaxb.JaxbService;
import org.apache.causeway.applib.services.message.MessageService;
-import org.apache.causeway.core.config.environment.IsisSystemEnvironment;
+import org.apache.causeway.core.config.environment.CausewaySystemEnvironment;
import org.apache.causeway.core.metamodel.facetapi.FacetUtil;
import org.apache.causeway.core.metamodel.facets.actions.layout.ActionPositionFacetForActionLayoutXml;
import org.apache.causeway.core.metamodel.facets.actions.layout.BookmarkPolicyFacetForActionLayoutXml;
@@ -98,7 +98,7 @@ implements GridSystemService<G> {
protected final TranslationService translationService;
protected final JaxbService jaxbService;
protected final MessageService messageService;
- protected final IsisSystemEnvironment isisSystemEnvironment;
+ protected final CausewaySystemEnvironment isisSystemEnvironment;
@Override
public void normalize(final G grid, final Class<?> domainClass) {
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/grid/bootstrap/GridSystemServiceBootstrap.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/grid/bootstrap/GridSystemServiceBootstrap.java
index e9d038e182..4e847573c3 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/grid/bootstrap/GridSystemServiceBootstrap.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/grid/bootstrap/GridSystemServiceBootstrap.java
@@ -62,7 +62,7 @@ import org.apache.causeway.applib.layout.grid.bootstrap.Size;
import org.apache.causeway.applib.services.i18n.TranslationService;
import org.apache.causeway.applib.services.jaxb.JaxbService;
import org.apache.causeway.applib.services.message.MessageService;
-import org.apache.causeway.core.config.environment.IsisSystemEnvironment;
+import org.apache.causeway.core.config.environment.CausewaySystemEnvironment;
import org.apache.causeway.core.metamodel.CausewayModuleCoreMetamodel;
import org.apache.causeway.core.metamodel.facets.actions.position.ActionPositionFacet;
import org.apache.causeway.core.metamodel.facets.members.layout.group.GroupIdAndName;
@@ -105,7 +105,7 @@ extends GridSystemServiceAbstract<BSGrid> {
final TranslationService translationService,
final JaxbService jaxbService,
final MessageService messageService,
- final IsisSystemEnvironment isisSystemEnvironment) {
+ final CausewaySystemEnvironment isisSystemEnvironment) {
super(specificationLoader, translationService, jaxbService, messageService, isisSystemEnvironment);
}
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 057095bef4..3f3dee49a7 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
@@ -39,7 +39,7 @@ 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.environment.IsisSystemEnvironment;
+import org.apache.causeway.core.config.environment.CausewaySystemEnvironment;
import org.apache.causeway.core.metamodel.CausewayModuleCoreMetamodel;
import lombok.val;
@@ -51,7 +51,7 @@ import lombok.val;
public final class ServiceRegistryDefault implements ServiceRegistry {
// enforces provisioning order (this is a depends-on relationship)
- @Inject private IsisSystemEnvironment isisSystemEnvironment;
+ @Inject private CausewaySystemEnvironment isisSystemEnvironment;
@Inject private IsisBeanTypeRegistry isisBeanTypeRegistry;
@Override
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/spec/ActionScope.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/spec/ActionScope.java
index 82464cfefb..f424af1211 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/spec/ActionScope.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/spec/ActionScope.java
@@ -20,7 +20,7 @@ package org.apache.causeway.core.metamodel.spec;
import org.apache.causeway.commons.collections.ImmutableEnumSet;
-import org.apache.causeway.core.config.environment.IsisSystemEnvironment;
+import org.apache.causeway.core.config.environment.CausewaySystemEnvironment;
public enum ActionScope {
PRODUCTION,
@@ -41,7 +41,7 @@ public enum ActionScope {
public static final ImmutableEnumSet<ActionScope> PRODUCTION_ONLY = ImmutableEnumSet.of(ActionScope.PRODUCTION);
public static final ImmutableEnumSet<ActionScope> ANY = ImmutableEnumSet.allOf(ActionScope.class);
- public static ImmutableEnumSet<ActionScope> forEnvironment(final IsisSystemEnvironment systemEnvironment) {
+ public static ImmutableEnumSet<ActionScope> forEnvironment(final CausewaySystemEnvironment systemEnvironment) {
return systemEnvironment.isPrototyping()
? ActionScope.ANY
: ActionScope.PRODUCTION_ONLY;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/spec/feature/ObjectAction.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/spec/feature/ObjectAction.java
index 109375c60c..3fea7da248 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/spec/feature/ObjectAction.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/spec/feature/ObjectAction.java
@@ -38,7 +38,7 @@ import org.apache.causeway.applib.annotation.SemanticsOf;
import org.apache.causeway.applib.annotation.Where;
import org.apache.causeway.applib.value.Blob;
import org.apache.causeway.applib.value.Clob;
-import org.apache.causeway.core.config.IsisConfiguration.Viewer.Wicket;
+import org.apache.causeway.core.config.CausewayConfiguration.Viewer.Wicket;
import org.apache.causeway.core.metamodel.consent.Consent;
import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.causeway.core.metamodel.consent.InteractionResultSet;
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 0ef8e57121..0f6dac91a4 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
@@ -55,11 +55,11 @@ import org.apache.causeway.applib.services.menu.MenuBarsService;
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.IsisConfiguration;
+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.environment.IsisSystemEnvironment;
+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;
import org.apache.causeway.core.metamodel.CausewayModuleCoreMetamodel;
@@ -110,8 +110,8 @@ import lombok.extern.log4j.Log4j2;
@Log4j2
public class SpecificationLoaderDefault implements SpecificationLoader {
- private final IsisConfiguration isisConfiguration;
- private final IsisSystemEnvironment isisSystemEnvironment;
+ private final CausewayConfiguration isisConfiguration;
+ private final CausewaySystemEnvironment isisSystemEnvironment;
private final ServiceRegistry serviceRegistry;
private final IsisBeanTypeClassifier isisBeanTypeClassifier;
private final IsisBeanTypeRegistry isisBeanTypeRegistry;
@@ -140,8 +140,8 @@ public class SpecificationLoaderDefault implements SpecificationLoader {
@Inject
public SpecificationLoaderDefault(
final ProgrammingModelService programmingModelService,
- final IsisConfiguration isisConfiguration,
- final IsisSystemEnvironment isisSystemEnvironment,
+ final CausewayConfiguration isisConfiguration,
+ final CausewaySystemEnvironment isisSystemEnvironment,
final ServiceRegistry serviceRegistry,
final IsisBeanTypeClassifier isisBeanTypeClassifier,
final IsisBeanTypeRegistry isisBeanTypeRegistry,
@@ -160,8 +160,8 @@ public class SpecificationLoaderDefault implements SpecificationLoader {
SpecificationLoaderDefault(
final ProgrammingModel programmingModel,
- final IsisConfiguration isisConfiguration,
- final IsisSystemEnvironment isisSystemEnvironment,
+ final CausewayConfiguration isisConfiguration,
+ final CausewaySystemEnvironment isisSystemEnvironment,
final ServiceRegistry serviceRegistry,
final IsisBeanTypeClassifier isisBeanTypeClassifier,
final IsisBeanTypeRegistry isisBeanTypeRegistry,
@@ -180,8 +180,8 @@ public class SpecificationLoaderDefault implements SpecificationLoader {
/** JUnit Test Support */
public static SpecificationLoaderDefault getInstance(
- final IsisConfiguration isisConfiguration,
- final IsisSystemEnvironment isisSystemEnvironment,
+ final CausewayConfiguration isisConfiguration,
+ final CausewaySystemEnvironment isisSystemEnvironment,
final ServiceRegistry serviceRegistry,
final ProgrammingModel programmingModel,
final IsisBeanTypeClassifier isisBeanTypeClassifier,
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/temporal/TemporalValueSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/temporal/TemporalValueSemanticsProvider.java
index 01325e3b8c..abf826b55e 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/temporal/TemporalValueSemanticsProvider.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/temporal/TemporalValueSemanticsProvider.java
@@ -47,7 +47,7 @@ import org.apache.causeway.applib.value.semantics.TemporalValueSemantics;
import org.apache.causeway.applib.value.semantics.ValueDecomposition;
import org.apache.causeway.applib.value.semantics.ValueSemanticsAbstract;
import org.apache.causeway.applib.value.semantics.ValueSemanticsProvider;
-import org.apache.causeway.core.config.IsisConfiguration;
+import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.core.metamodel.facets.objectvalue.temporalformat.DateFormatStyleFacet;
import org.apache.causeway.core.metamodel.facets.objectvalue.temporalformat.TimeFormatPrecisionFacet;
@@ -403,11 +403,11 @@ implements TemporalValueSemantics<T> {
}
- private org.apache.causeway.core.config.IsisConfiguration.ValueTypes.Temporal temporalConfig() {
+ private org.apache.causeway.core.config.CausewayConfiguration.ValueTypes.Temporal temporalConfig() {
return Optional.ofNullable(mmc) // nullable .. JUnit support
.map(MetaModelContext::getConfiguration)
.map(conf->conf.getValueTypes().getTemporal())
- .orElseGet(IsisConfiguration.ValueTypes.Temporal::new);
+ .orElseGet(CausewayConfiguration.ValueTypes.Temporal::new);
}
protected TemporalEditingPattern temporalEditingPattern() {
diff --git a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/object/ViewModelSemanticCheckingFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/object/ViewModelSemanticCheckingFacetFactoryTest.java
index 12d9980877..3c0b291a84 100644
--- a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/object/ViewModelSemanticCheckingFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/object/ViewModelSemanticCheckingFacetFactoryTest.java
@@ -26,7 +26,7 @@ import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import org.apache.causeway.applib.services.inject.ServiceInjector;
-import org.apache.causeway.core.config.IsisConfiguration;
+import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.metamodel._testing.MetaModelContext_forTesting;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
@@ -47,7 +47,7 @@ class ViewModelSemanticCheckingFacetFactoryTest {
@BeforeEach
public void setUp() throws Exception {
- val configuration = new IsisConfiguration(null);
+ val configuration = new CausewayConfiguration(null);
configuration.getApplib().getAnnotation().getViewModel().getValidation().getSemanticChecking().setEnable(true);
metaModelContext = MetaModelContext_forTesting.builder()
diff --git a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java
index 24581bb55d..8781d7581f 100644
--- a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java
@@ -38,7 +38,7 @@ import org.apache.causeway.applib.annotation.Bounding;
import org.apache.causeway.applib.annotation.DomainObject;
import org.apache.causeway.applib.id.LogicalType;
import org.apache.causeway.applib.mixins.system.HasInteractionId;
-import org.apache.causeway.core.config.IsisConfiguration;
+import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.config.metamodel.facets.DomainObjectConfigOptions;
import org.apache.causeway.core.metamodel.facetapi.Facet;
import org.apache.causeway.core.metamodel.facets.AbstractFacetFactoryJupiterTestCase;
@@ -99,7 +99,7 @@ extends AbstractFacetFactoryJupiterTestCase {
void allowingObjectsEditingToReturn(final DomainObjectConfigOptions.EditingObjectsConfiguration value) {
if(value!=null) {
- final IsisConfiguration config = super.metaModelContext.getConfiguration();
+ final CausewayConfiguration config = super.metaModelContext.getConfiguration();
config.getApplib().getAnnotation().getDomainObject().setEditing(value);
}
}
diff --git a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/properties/promptstyle/PromptStyleFacetFromPropertyAnnotation_Test.java b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/properties/promptstyle/PromptStyleFacetFromPropertyAnnotation_Test.java
index 92d2a275c8..ea90e806c2 100644
--- a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/properties/promptstyle/PromptStyleFacetFromPropertyAnnotation_Test.java
+++ b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/properties/promptstyle/PromptStyleFacetFromPropertyAnnotation_Test.java
@@ -33,7 +33,7 @@ import static org.hamcrest.MatcherAssert.assertThat;
import org.apache.causeway.applib.annotation.PromptStyle;
import org.apache.causeway.applib.annotation.PropertyLayout;
-import org.apache.causeway.core.config.IsisConfiguration;
+import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.object.promptStyle.PromptStyleFacet;
import org.apache.causeway.core.metamodel.facets.object.promptStyle.PromptStyleFacetAsConfigured;
@@ -41,7 +41,7 @@ import org.apache.causeway.core.metamodel.facets.properties.propertylayout.Promp
public class PromptStyleFacetFromPropertyAnnotation_Test {
- IsisConfiguration stubConfiguration = new IsisConfiguration(null);
+ CausewayConfiguration stubConfiguration = new CausewayConfiguration(null);
FacetHolder mockFacetHolder;
PropertyLayout mockPropertyLayout;
diff --git a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/valuesemantics/temporal/TemporalValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/valuesemantics/temporal/TemporalValueSemanticsProviderTest.java
index 099d313620..7e9140865d 100644
--- a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/valuesemantics/temporal/TemporalValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/valuesemantics/temporal/TemporalValueSemanticsProviderTest.java
@@ -37,7 +37,7 @@ import org.apache.causeway.applib.value.semantics.TemporalValueSemantics.OffsetC
import org.apache.causeway.applib.value.semantics.TemporalValueSemantics.TemporalCharacteristic;
import org.apache.causeway.applib.value.semantics.TemporalValueSemantics.TemporalEditingPattern;
import org.apache.causeway.applib.value.semantics.ValueSemanticsProvider.Context;
-import org.apache.causeway.core.config.IsisConfiguration;
+import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.schema.common.v2.ValueType;
import lombok.NonNull;
@@ -50,7 +50,7 @@ class TemporalValueSemanticsProviderTest {
@BeforeEach
void setUp() throws Exception {
- editingPattern = (new IsisConfiguration.ValueTypes.Temporal()).getEditing();
+ editingPattern = (new CausewayConfiguration.ValueTypes.Temporal()).getEditing();
}
@ParameterizedTest
diff --git a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/email/EmailServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/email/EmailServiceDefault.java
index fad831af6d..7a774d711a 100644
--- a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/email/EmailServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/email/EmailServiceDefault.java
@@ -38,7 +38,7 @@ import org.springframework.stereotype.Service;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.applib.services.email.EmailService;
-import org.apache.causeway.core.config.IsisConfiguration;
+import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.runtimeservices.CausewayModuleCoreRuntimeServices;
import lombok.extern.log4j.Log4j2;
@@ -61,7 +61,7 @@ public class EmailServiceDefault implements EmailService {
}
}
- @Inject private IsisConfiguration configuration;
+ @Inject private CausewayConfiguration configuration;
// -- INIT
diff --git a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/executor/MemberExecutorServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/executor/MemberExecutorServiceDefault.java
index 0a45562dd8..3c7160ce0f 100644
--- a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/executor/MemberExecutorServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/executor/MemberExecutorServiceDefault.java
@@ -44,7 +44,7 @@ import org.apache.causeway.applib.services.iactnlayer.InteractionLayerTracker;
import org.apache.causeway.applib.services.inject.ServiceInjector;
import org.apache.causeway.applib.services.metrics.MetricsService;
import org.apache.causeway.applib.services.xactn.TransactionService;
-import org.apache.causeway.core.config.IsisConfiguration;
+import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.metamodel.commons.CanonicalInvoker;
import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.causeway.core.metamodel.execution.InteractionInternal;
@@ -86,7 +86,7 @@ public class MemberExecutorServiceDefault
implements MemberExecutorService {
private final @Getter InteractionLayerTracker interactionLayerTracker;
- private final @Getter IsisConfiguration configuration;
+ private final @Getter CausewayConfiguration configuration;
private final @Getter ObjectManager objectManager;
private final @Getter ClockService clockService;
private final @Getter ServiceInjector serviceInjector;
diff --git a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/factory/FactoryServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/factory/FactoryServiceDefault.java
index c0e8fc3de3..8e83b04ca1 100644
--- a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/factory/FactoryServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/factory/FactoryServiceDefault.java
@@ -35,7 +35,7 @@ import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.applib.services.bookmark.Bookmark;
import org.apache.causeway.applib.services.factory.FactoryService;
import org.apache.causeway.applib.services.iactnlayer.InteractionService;
-import org.apache.causeway.core.config.environment.IsisSystemEnvironment;
+import org.apache.causeway.core.config.environment.CausewaySystemEnvironment;
import org.apache.causeway.core.metamodel.facets.object.mixin.MixinFacet;
import org.apache.causeway.core.metamodel.facets.object.viewmodel.ViewModelFacet;
import org.apache.causeway.core.metamodel.object.ManagedObject;
@@ -55,7 +55,7 @@ public class FactoryServiceDefault implements FactoryService {
@Inject InteractionService interactionService; // dependsOn
@Inject private SpecificationLoader specificationLoader;
- @Inject private IsisSystemEnvironment isisSystemEnvironment;
+ @Inject private CausewaySystemEnvironment isisSystemEnvironment;
@Inject private Provider<ObjectLifecyclePublisher> objectLifecyclePublisherProvider;
private ObjectLifecyclePublisher objectLifecyclePublisher() { return objectLifecyclePublisherProvider.get(); }
diff --git a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/i18n/po/TranslationServicePo.java b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/i18n/po/TranslationServicePo.java
index ed677567b7..c7475e9387 100644
--- a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/i18n/po/TranslationServicePo.java
+++ b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/i18n/po/TranslationServicePo.java
@@ -38,8 +38,8 @@ import org.apache.causeway.applib.services.i18n.TranslationContext;
import org.apache.causeway.applib.services.i18n.TranslationService;
import org.apache.causeway.applib.services.i18n.TranslationsResolver;
import org.apache.causeway.applib.services.registry.ServiceRegistry;
-import org.apache.causeway.core.config.IsisConfiguration;
-import org.apache.causeway.core.config.environment.IsisSystemEnvironment;
+import org.apache.causeway.core.config.CausewayConfiguration;
+import org.apache.causeway.core.config.environment.CausewaySystemEnvironment;
import org.apache.causeway.core.runtimeservices.CausewayModuleCoreRuntimeServices;
import lombok.Getter;
@@ -171,9 +171,9 @@ public class TranslationServicePo implements TranslationService {
// -- DEPENDENCIES
- @Inject private IsisSystemEnvironment systemEnvironment;
+ @Inject private CausewaySystemEnvironment systemEnvironment;
@Inject private ServiceRegistry serviceRegistry;
- @Inject private IsisConfiguration configuration;
+ @Inject private CausewayConfiguration configuration;
@Getter
@Inject private LanguageProvider languageProvider;
diff --git a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/menubars/MenuBarsLoaderServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/menubars/MenuBarsLoaderServiceDefault.java
index 529fd9a73b..876a412729 100644
--- a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/menubars/MenuBarsLoaderServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/menubars/MenuBarsLoaderServiceDefault.java
@@ -37,8 +37,8 @@ import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.applib.layout.menubars.bootstrap.BSMenuBars;
import org.apache.causeway.applib.services.jaxb.JaxbService;
import org.apache.causeway.applib.services.menu.MenuBarsLoaderService;
-import org.apache.causeway.core.config.IsisConfiguration;
-import org.apache.causeway.core.config.environment.IsisSystemEnvironment;
+import org.apache.causeway.core.config.CausewayConfiguration;
+import org.apache.causeway.core.config.environment.CausewaySystemEnvironment;
import org.apache.causeway.core.config.viewer.web.WebAppContextPath;
import org.apache.causeway.core.runtimeservices.CausewayModuleCoreRuntimeServices;
@@ -59,9 +59,9 @@ implements MenuBarsLoaderService {
@Inject
public MenuBarsLoaderServiceDefault(
- final IsisSystemEnvironment isisSystemEnvironment,
+ final CausewaySystemEnvironment isisSystemEnvironment,
final JaxbService jaxbService,
- final IsisConfiguration isisConfiguration) {
+ final CausewayConfiguration isisConfiguration) {
this.jaxbService = jaxbService;
this.supportsReloading = isisSystemEnvironment.isPrototyping();
diff --git a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/menubars/bootstrap/MenuBarsServiceBS.java b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/menubars/bootstrap/MenuBarsServiceBS.java
index d94eec1b1d..3f7a9be41f 100644
--- a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/menubars/bootstrap/MenuBarsServiceBS.java
+++ b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/menubars/bootstrap/MenuBarsServiceBS.java
@@ -51,7 +51,7 @@ import org.apache.causeway.applib.services.jaxb.JaxbService;
import org.apache.causeway.applib.services.menu.MenuBarsLoaderService;
import org.apache.causeway.applib.services.menu.MenuBarsService;
import org.apache.causeway.applib.services.message.MessageService;
-import org.apache.causeway.core.config.environment.IsisSystemEnvironment;
+import org.apache.causeway.core.config.environment.CausewaySystemEnvironment;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.core.metamodel.facetapi.Facet.Precedence;
import org.apache.causeway.core.metamodel.facetapi.FacetUtil;
@@ -101,7 +101,7 @@ implements MenuBarsService {
private final MenuBarsLoaderService menuBarsLoaderService;
private final MessageService messageService;
private final JaxbService jaxbService;
- private final IsisSystemEnvironment isisSystemEnvironment;
+ private final CausewaySystemEnvironment isisSystemEnvironment;
private final MetaModelContext metaModelContext;
private final _Lazy<BSMenuBars> menuBarsFromAnnotationsOnly = _Lazy.threadSafe(this::menuBarsFromAnnotationsOnly);
diff --git a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/recognizer/dae/ExceptionRecognizerForDataAccessException.java b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/recognizer/dae/ExceptionRecognizerForDataAccessException.java
index db39f2a3d1..270cdd0614 100644
--- a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/recognizer/dae/ExceptionRecognizerForDataAccessException.java
+++ b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/recognizer/dae/ExceptionRecognizerForDataAccessException.java
@@ -38,7 +38,7 @@ import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.applib.services.exceprecog.Category;
import org.apache.causeway.applib.services.exceprecog.ExceptionRecognizer;
import org.apache.causeway.applib.services.exceprecog.Recognition;
-import org.apache.causeway.core.config.IsisConfiguration;
+import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.runtime.CausewayModuleCoreRuntime;
import lombok.Getter;
@@ -46,7 +46,7 @@ import lombok.val;
/**
* Translates {@link DataAccessException}(s) to {@link Recognition}(s),
- * unless disabled via {@link IsisConfiguration}.
+ * unless disabled via {@link CausewayConfiguration}.
*/
@Service
@Named(ExceptionRecognizerForDataAccessException.LOGICAL_TYPE_NAME)
@@ -61,7 +61,7 @@ implements ExceptionRecognizer {
private final boolean disabled;
@Inject
- public ExceptionRecognizerForDataAccessException(IsisConfiguration conf) {
+ public ExceptionRecognizerForDataAccessException(CausewayConfiguration conf) {
this.disabled = conf.getCore().getRuntimeServices()
.getExceptionRecognizer().getDae().isDisable();
}
diff --git a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/repository/RepositoryServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/repository/RepositoryServiceDefault.java
index 70d59fcfe2..c01f280d51 100644
--- a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/repository/RepositoryServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/repository/RepositoryServiceDefault.java
@@ -45,7 +45,7 @@ import org.apache.causeway.applib.services.repository.EntityState;
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.IsisConfiguration;
+import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.metamodel.context.HasMetaModelContext;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.core.metamodel.object.ManagedObjects;
@@ -72,7 +72,7 @@ implements RepositoryService, HasMetaModelContext {
final FactoryService factoryService;
final WrapperFactory wrapperFactory;
final TransactionService transactionService;
- final IsisConfiguration isisConfiguration;
+ final CausewayConfiguration isisConfiguration;
@Getter(onMethod_ = {@Override})
final MetaModelContext metaModelContext;
diff --git a/core/runtimeservices/src/test/java/org/apache/causeway/core/runtimeservices/recognizer/dae/ExceptionRecognizerForDataAccessExceptionTest.java b/core/runtimeservices/src/test/java/org/apache/causeway/core/runtimeservices/recognizer/dae/ExceptionRecognizerForDataAccessExceptionTest.java
index 0426d2df10..caf58ad537 100644
--- a/core/runtimeservices/src/test/java/org/apache/causeway/core/runtimeservices/recognizer/dae/ExceptionRecognizerForDataAccessExceptionTest.java
+++ b/core/runtimeservices/src/test/java/org/apache/causeway/core/runtimeservices/recognizer/dae/ExceptionRecognizerForDataAccessExceptionTest.java
@@ -33,7 +33,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
import org.apache.causeway.applib.services.exceprecog.Category;
-import org.apache.causeway.core.config.IsisConfiguration;
+import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.runtimeservices.recognizer.dae.ExceptionRecognizerForDataAccessException;
import lombok.val;
@@ -44,7 +44,7 @@ class ExceptionRecognizerForDataAccessExceptionTest {
@BeforeEach
public void setUp() {
- val conf = new IsisConfiguration(null);
+ val conf = new CausewayConfiguration(null);
recognizerForDae = new ExceptionRecognizerForDataAccessException(conf);
}
diff --git a/core/webapp/src/main/java/org/apache/causeway/core/webapp/confmenu/ConfigurationViewServiceDefault.java b/core/webapp/src/main/java/org/apache/causeway/core/webapp/confmenu/ConfigurationViewServiceDefault.java
index 425c6e9a05..8153dfb03b 100644
--- a/core/webapp/src/main/java/org/apache/causeway/core/webapp/confmenu/ConfigurationViewServiceDefault.java
+++ b/core/webapp/src/main/java/org/apache/causeway/core/webapp/confmenu/ConfigurationViewServiceDefault.java
@@ -44,11 +44,11 @@ import org.springframework.stereotype.Service;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.applib.services.confview.ConfigurationProperty;
import org.apache.causeway.applib.services.confview.ConfigurationViewService;
-import org.apache.causeway.core.config.IsisConfiguration;
-import org.apache.causeway.core.config.IsisConfiguration.Core.Config.ConfigurationPropertyVisibilityPolicy;
+import org.apache.causeway.core.config.CausewayConfiguration;
+import org.apache.causeway.core.config.CausewayConfiguration.Core.Config.ConfigurationPropertyVisibilityPolicy;
import org.apache.causeway.core.config.CausewayModuleCoreConfig;
import org.apache.causeway.core.config.datasources.DataSourceIntrospectionService;
-import org.apache.causeway.core.config.environment.IsisSystemEnvironment;
+import org.apache.causeway.core.config.environment.CausewaySystemEnvironment;
import org.apache.causeway.core.config.util.ValueMaskingUtil;
import org.apache.causeway.core.webapp.modules.WebModule;
@@ -70,8 +70,8 @@ implements
ConfigurationViewService {
private final Environment springEnvironment;
- private final IsisSystemEnvironment systemEnvironment;
- private final IsisConfiguration configuration;
+ private final CausewaySystemEnvironment systemEnvironment;
+ private final CausewayConfiguration configuration;
private final DataSourceIntrospectionService datasourceInfoService;
private final List<WebModule> webModules;
@@ -223,7 +223,7 @@ implements
return Optional.ofNullable(
configuration.getCore().getConfig().getConfigurationPropertyVisibilityPolicy())
// fallback to configuration default policy
- .orElseGet(()->new IsisConfiguration.Core.Config().getConfigurationPropertyVisibilityPolicy());
+ .orElseGet(()->new CausewayConfiguration.Core.Config().getConfigurationPropertyVisibilityPolicy());
}
diff --git a/core/webapp/src/main/java/org/apache/causeway/core/webapp/modules/WebModuleContext.java b/core/webapp/src/main/java/org/apache/causeway/core/webapp/modules/WebModuleContext.java
index 577c6c80e7..7a10b77b5e 100644
--- a/core/webapp/src/main/java/org/apache/causeway/core/webapp/modules/WebModuleContext.java
+++ b/core/webapp/src/main/java/org/apache/causeway/core/webapp/modules/WebModuleContext.java
@@ -30,7 +30,7 @@ import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.applib.services.registry.ServiceRegistry;
-import org.apache.causeway.core.config.IsisConfiguration;
+import org.apache.causeway.core.config.CausewayConfiguration;
import lombok.Getter;
import lombok.NonNull;
@@ -50,7 +50,7 @@ public class WebModuleContext {
private final StringBuilder protectedPath = new StringBuilder();
@NonNull @Getter private final ServletContext servletContext;
- @NonNull @Getter private final IsisConfiguration configuration;
+ @NonNull @Getter private final CausewayConfiguration configuration;
@NonNull @Getter private final ServiceRegistry serviceRegistry;
private Can<WebModule> webModules;
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 6b7cb4343f..6e87fca825 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
@@ -32,7 +32,7 @@ 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.IsisConfiguration;
+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;
@@ -62,7 +62,7 @@ public class IsisWebAppContextInitializer implements ServletContextInitializer {
private static final _Oneshot oneshot = new _Oneshot();
@Inject private ServiceRegistry serviceRegistry; // this dependency ensures Isis has been initialized/provisioned
- @Inject private IsisConfiguration isisConfiguration;
+ @Inject private CausewayConfiguration isisConfiguration;
@Inject private WebAppContextPath webAppContextPath;
// -- INTERFACE IMPLEMENTATION
diff --git a/examples/demo/domain-tests/src/test/java/demoapp/dom/domain/tests/DomainIntrospectionTestJdo.java b/examples/demo/domain-tests/src/test/java/demoapp/dom/domain/tests/DomainIntrospectionTestJdo.java
index d09f44c5a7..cfe7867821 100644
--- a/examples/demo/domain-tests/src/test/java/demoapp/dom/domain/tests/DomainIntrospectionTestJdo.java
+++ b/examples/demo/domain-tests/src/test/java/demoapp/dom/domain/tests/DomainIntrospectionTestJdo.java
@@ -63,7 +63,7 @@ class DomainIntrospectionTestJdo {
@Inject private ServiceRegistry serviceRegistry;
@Inject private SpecificationLoader specificationLoader;
//@Inject private TitleService titleService;
- //@Inject private IsisConfiguration isisConfig;
+ //@Inject private CausewayConfiguration isisConfig;
//@Inject private DomainObjectTesterFactory testerFactory;
@Test
diff --git a/examples/demo/domain-tests/src/test/java/demoapp/dom/domain/tests/DomainIntrospectionTestJpa.java b/examples/demo/domain-tests/src/test/java/demoapp/dom/domain/tests/DomainIntrospectionTestJpa.java
index acef7fb5dd..3ae1c157dc 100644
--- a/examples/demo/domain-tests/src/test/java/demoapp/dom/domain/tests/DomainIntrospectionTestJpa.java
+++ b/examples/demo/domain-tests/src/test/java/demoapp/dom/domain/tests/DomainIntrospectionTestJpa.java
@@ -63,7 +63,7 @@ class DomainIntrospectionTestJpa {
@Inject private ServiceRegistry serviceRegistry;
@Inject private SpecificationLoader specificationLoader;
//@Inject private TitleService titleService;
- //@Inject private IsisConfiguration isisConfig;
+ //@Inject private CausewayConfiguration isisConfig;
//@Inject private DomainObjectTesterFactory testerFactory;
@Test
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/_infra/resources/AsciiDocReaderService.java b/examples/demo/domain/src/main/java/demoapp/dom/_infra/resources/AsciiDocReaderService.java
index fb9337ac07..81dc994b2c 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/_infra/resources/AsciiDocReaderService.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/_infra/resources/AsciiDocReaderService.java
@@ -24,7 +24,7 @@ import org.apache.causeway.commons.internal.base._Refs;
import org.apache.causeway.commons.internal.base._Refs.StringReference;
import org.springframework.stereotype.Service;
-import org.apache.causeway.core.config.IsisConfiguration;
+import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.valuetypes.asciidoc.applib.value.AsciiDoc;
import lombok.RequiredArgsConstructor;
@@ -36,7 +36,7 @@ import lombok.val;
public class AsciiDocReaderService {
final ResourceReaderService resourceReaderService;
- final IsisConfiguration configuration;
+ final CausewayConfiguration configuration;
public AsciiDoc readFor(final Object anObject) {
return readFor(anObject.getClass());
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/_infra/resources/MarkupVariableResolverService.java b/examples/demo/domain/src/main/java/demoapp/dom/_infra/resources/MarkupVariableResolverService.java
index c0c2a29df8..c20ba95c58 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/_infra/resources/MarkupVariableResolverService.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/_infra/resources/MarkupVariableResolverService.java
@@ -28,7 +28,7 @@ import org.apache.causeway.commons.internal.base._Refs;
import org.apache.causeway.commons.internal.collections._Maps;
import org.springframework.stereotype.Service;
-import org.apache.causeway.core.config.IsisConfiguration;
+import org.apache.causeway.core.config.CausewayConfiguration;
import lombok.val;
@@ -39,7 +39,7 @@ public class MarkupVariableResolverService {
private final Map<String, String> constants;
@Inject
- public MarkupVariableResolverService(IsisConfiguration configuration) {
+ public MarkupVariableResolverService(CausewayConfiguration configuration) {
constants = _Maps.unmodifiable(
"SOURCES_ISIS", "https://github.com/apache/isis/blob/master/core/applib/src/main/java",
"SOURCES_DEMO", "https://github.com/apache/isis/tree/master/examples/demo/domain/src/main/java",
diff --git a/examples/demo/domain/src/test/java/demoapp/dom/_infra/resources/ResourceReaderService_Test.java b/examples/demo/domain/src/test/java/demoapp/dom/_infra/resources/ResourceReaderService_Test.java
index c464fa1c6e..00143d945b 100644
--- a/examples/demo/domain/src/test/java/demoapp/dom/_infra/resources/ResourceReaderService_Test.java
+++ b/examples/demo/domain/src/test/java/demoapp/dom/_infra/resources/ResourceReaderService_Test.java
@@ -25,7 +25,7 @@ import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
-import org.apache.causeway.core.config.IsisConfiguration;
+import org.apache.causeway.core.config.CausewayConfiguration;
import lombok.val;
@@ -37,7 +37,7 @@ class ResourceReaderService_Test {
void setUp() {
resourceReaderService = new ResourceReaderService();
resourceReaderService.markupVariableResolverService =
- new MarkupVariableResolverService(new IsisConfiguration(null));
+ new MarkupVariableResolverService(new CausewayConfiguration(null));
}
@Test
diff --git a/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/CommandLogEntryRepository.java b/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/CommandLogEntryRepository.java
index 1cd7d7a179..e879f5659e 100644
--- a/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/CommandLogEntryRepository.java
+++ b/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/CommandLogEntryRepository.java
@@ -42,7 +42,7 @@ import org.apache.causeway.applib.services.command.Command;
import org.apache.causeway.applib.services.factory.FactoryService;
import org.apache.causeway.applib.services.repository.RepositoryService;
import org.apache.causeway.applib.util.schema.CommandDtoUtils;
-import org.apache.causeway.core.config.environment.IsisSystemEnvironment;
+import org.apache.causeway.core.config.environment.CausewaySystemEnvironment;
import org.apache.causeway.schema.cmd.v2.CommandDto;
import org.apache.causeway.schema.cmd.v2.CommandsDto;
import org.apache.causeway.schema.cmd.v2.MapDto;
@@ -65,7 +65,7 @@ public abstract class CommandLogEntryRepository<C extends CommandLogEntry> {
@Inject Provider<RepositoryService> repositoryServiceProvider;
@Inject FactoryService factoryService;
- @Inject IsisSystemEnvironment isisSystemEnvironment;
+ @Inject CausewaySystemEnvironment isisSystemEnvironment;
private final Class<C> commandLogEntryClass;
diff --git a/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/subscriber/CommandSubscriberForCommandLog.java b/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/subscriber/CommandSubscriberForCommandLog.java
index 54953f8001..03386a9351 100644
--- a/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/subscriber/CommandSubscriberForCommandLog.java
+++ b/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/subscriber/CommandSubscriberForCommandLog.java
@@ -27,7 +27,7 @@ import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.applib.services.command.Command;
import org.apache.causeway.applib.services.publishing.spi.CommandSubscriber;
import org.apache.causeway.applib.util.JaxbUtil;
-import org.apache.causeway.core.config.IsisConfiguration;
+import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.extensions.commandlog.applib.CausewayModuleExtCommandLogApplib;
import org.apache.causeway.extensions.commandlog.applib.dom.CommandLogEntry;
import org.apache.causeway.extensions.commandlog.applib.dom.CommandLogEntryRepository;
@@ -47,7 +47,7 @@ import lombok.extern.log4j.Log4j2;
public class CommandSubscriberForCommandLog implements CommandSubscriber {
final CommandLogEntryRepository<? extends CommandLogEntry> commandLogEntryRepository;
- final IsisConfiguration isisConfiguration;
+ final CausewayConfiguration isisConfiguration;
@Override
public void onCompleted(final Command command) {
diff --git a/extensions/core/executionlog/applib/src/main/java/org/apache/causeway/extensions/executionlog/applib/dom/ExecutionLogEntryRepository.java b/extensions/core/executionlog/applib/src/main/java/org/apache/causeway/extensions/executionlog/applib/dom/ExecutionLogEntryRepository.java
index eaa99dc216..1a8d2f8ac6 100644
--- a/extensions/core/executionlog/applib/src/main/java/org/apache/causeway/extensions/executionlog/applib/dom/ExecutionLogEntryRepository.java
+++ b/extensions/core/executionlog/applib/src/main/java/org/apache/causeway/extensions/executionlog/applib/dom/ExecutionLogEntryRepository.java
@@ -37,7 +37,7 @@ import org.apache.causeway.applib.services.bookmark.Bookmark;
import org.apache.causeway.applib.services.factory.FactoryService;
import org.apache.causeway.applib.services.iactn.Execution;
import org.apache.causeway.applib.services.repository.RepositoryService;
-import org.apache.causeway.core.config.environment.IsisSystemEnvironment;
+import org.apache.causeway.core.config.environment.CausewaySystemEnvironment;
import lombok.Getter;
import lombok.val;
@@ -62,7 +62,7 @@ public abstract class ExecutionLogEntryRepository<E extends ExecutionLogEntry> {
@Inject Provider<RepositoryService> repositoryServiceProvider;
@Inject FactoryService factoryService;
- @Inject IsisSystemEnvironment isisSystemEnvironment;
+ @Inject CausewaySystemEnvironment isisSystemEnvironment;
protected ExecutionLogEntryRepository(final Class<E> executionLogEntryClass) {
this.executionLogEntryClass = executionLogEntryClass;
diff --git a/extensions/core/executionoutbox/applib/src/main/java/org/apache/causeway/extensions/executionoutbox/applib/dom/ExecutionOutboxEntryRepository.java b/extensions/core/executionoutbox/applib/src/main/java/org/apache/causeway/extensions/executionoutbox/applib/dom/ExecutionOutboxEntryRepository.java
index d61e40759d..4cb8cb3c32 100644
--- a/extensions/core/executionoutbox/applib/src/main/java/org/apache/causeway/extensions/executionoutbox/applib/dom/ExecutionOutboxEntryRepository.java
+++ b/extensions/core/executionoutbox/applib/src/main/java/org/apache/causeway/extensions/executionoutbox/applib/dom/ExecutionOutboxEntryRepository.java
@@ -34,7 +34,7 @@ import org.apache.causeway.applib.services.factory.FactoryService;
import org.apache.causeway.applib.services.iactn.Execution;
import org.apache.causeway.applib.services.repository.RepositoryService;
import org.apache.causeway.applib.util.schema.InteractionDtoUtils;
-import org.apache.causeway.core.config.environment.IsisSystemEnvironment;
+import org.apache.causeway.core.config.environment.CausewaySystemEnvironment;
import org.apache.causeway.extensions.executionoutbox.applib.CausewayModuleExtExecutionOutboxApplib;
import org.apache.causeway.schema.ixn.v2.InteractionDto;
@@ -62,7 +62,7 @@ public abstract class ExecutionOutboxEntryRepository<E extends ExecutionOutboxEn
@Inject Provider<RepositoryService> repositoryServiceProvider;
@Inject FactoryService factoryService;
- @Inject IsisSystemEnvironment isisSystemEnvironment;
+ @Inject CausewaySystemEnvironment isisSystemEnvironment;
protected ExecutionOutboxEntryRepository(Class<E> executionOutboxEntryClass) {
this.executionOutboxEntryClass = executionOutboxEntryClass;
diff --git a/extensions/core/quartz/adoc/modules/quartz/examples/DemoIsisInteractionTemplate.java b/extensions/core/quartz/adoc/modules/quartz/examples/DemoIsisInteractionTemplate.java
index a6cd6ab74f..b519ea96a3 100644
--- a/extensions/core/quartz/adoc/modules/quartz/examples/DemoIsisInteractionTemplate.java
+++ b/extensions/core/quartz/adoc/modules/quartz/examples/DemoIsisInteractionTemplate.java
@@ -27,7 +27,7 @@ import org.quartz.Job;
import org.quartz.JobExecutionContext;
import org.apache.causeway.applib.services.user.UserService;
-import org.apache.causeway.core.config.IsisConfiguration;
+import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.runtime.iactn.template.AbstractIsisInteractionTemplate;
import lombok.extern.log4j.Log4j2;
diff --git a/extensions/core/quartz/adoc/modules/quartz/examples/DemoJob.java b/extensions/core/quartz/adoc/modules/quartz/examples/DemoJob.java
index 94bd2b32b2..85b2e1d47c 100644
--- a/extensions/core/quartz/adoc/modules/quartz/examples/DemoJob.java
+++ b/extensions/core/quartz/adoc/modules/quartz/examples/DemoJob.java
@@ -28,7 +28,7 @@ import org.quartz.JobExecutionContext;
import org.apache.causeway.applib.services.user.UserMemento;
import org.apache.causeway.applib.services.user.UserService;
-import org.apache.causeway.core.config.IsisConfiguration;
+import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.runtime.iactn.template.AbstractIsisInteractionTemplate;
import org.apache.causeway.core.security.authentication.Authentication;
import org.apache.causeway.core.security.authentication.standard.SimpleAuthentication;
@@ -56,7 +56,7 @@ public class DemoJob implements Job {
return SimpleAuthentication.ofValid(user);
}
- @Inject IsisConfiguration isisConfiguration;
+ @Inject CausewayConfiguration isisConfiguration;
}
//end::class[]
diff --git a/extensions/security/audittrail/applib/src/main/java/org/apache/causeway/extensions/audittrail/applib/dom/AuditTrailEntryRepository.java b/extensions/security/audittrail/applib/src/main/java/org/apache/causeway/extensions/audittrail/applib/dom/AuditTrailEntryRepository.java
index f5126cd391..7267f8a02a 100644
--- a/extensions/security/audittrail/applib/src/main/java/org/apache/causeway/extensions/audittrail/applib/dom/AuditTrailEntryRepository.java
+++ b/extensions/security/audittrail/applib/src/main/java/org/apache/causeway/extensions/audittrail/applib/dom/AuditTrailEntryRepository.java
@@ -33,7 +33,7 @@ import org.apache.causeway.applib.services.bookmark.Bookmark;
import org.apache.causeway.applib.services.factory.FactoryService;
import org.apache.causeway.applib.services.publishing.spi.EntityPropertyChange;
import org.apache.causeway.applib.services.repository.RepositoryService;
-import org.apache.causeway.core.config.environment.IsisSystemEnvironment;
+import org.apache.causeway.core.config.environment.CausewaySystemEnvironment;
import lombok.AccessLevel;
import lombok.RequiredArgsConstructor;
@@ -50,7 +50,7 @@ public abstract class AuditTrailEntryRepository<E extends AuditTrailEntry> {
@Inject RepositoryService repositoryService;
@Inject FactoryService factoryService;
- @Inject IsisSystemEnvironment isisSystemEnvironment;
+ @Inject CausewaySystemEnvironment isisSystemEnvironment;
public Class<E> getEntityClass() {
return auditTrailEntryClass;
diff --git a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/dom/ApplicationRoleRepositoryAbstract.java b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/dom/ApplicationRoleRepositoryAbstract.java
index bc17a8351f..694c5aa192 100644
--- a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/dom/ApplicationRoleRepositoryAbstract.java
+++ b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/dom/ApplicationRoleRepositoryAbstract.java
@@ -35,7 +35,7 @@ import org.apache.causeway.applib.query.Query;
import org.apache.causeway.applib.services.factory.FactoryService;
import org.apache.causeway.applib.services.queryresultscache.QueryResultsCache;
import org.apache.causeway.applib.services.repository.RepositoryService;
-import org.apache.causeway.core.config.IsisConfiguration;
+import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.extensions.secman.applib.CausewayModuleExtSecmanApplib;
import org.apache.causeway.extensions.secman.applib.permission.dom.mixins.ApplicationPermission_delete;
import org.apache.causeway.extensions.secman.applib.user.dom.ApplicationUser;
@@ -50,7 +50,7 @@ implements ApplicationRoleRepository {
@Inject private FactoryService factoryService;
@Inject private RepositoryService repository;
- @Inject private IsisConfiguration config;
+ @Inject private CausewayConfiguration config;
@Inject private RegexReplacer regexReplacer;
@Inject private Provider<QueryResultsCache> queryResultsCacheProvider;
diff --git a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/dom/mixins/ApplicationRole_removePermissions.java b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/dom/mixins/ApplicationRole_removePermissions.java
index cfae874a71..0305b91e04 100644
--- a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/dom/mixins/ApplicationRole_removePermissions.java
+++ b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/dom/mixins/ApplicationRole_removePermissions.java
@@ -32,8 +32,8 @@ import org.apache.causeway.applib.annotation.PromptStyle;
import org.apache.causeway.applib.annotation.SemanticsOf;
import org.apache.causeway.applib.services.message.MessageService;
import org.apache.causeway.applib.services.repository.RepositoryService;
-import org.apache.causeway.core.config.IsisConfiguration;
-import org.apache.causeway.core.config.IsisConfiguration.Extensions.Secman;
+import org.apache.causeway.core.config.CausewayConfiguration;
+import org.apache.causeway.core.config.CausewayConfiguration.Extensions.Secman;
import org.apache.causeway.extensions.secman.applib.CausewayModuleExtSecmanApplib;
import org.apache.causeway.extensions.secman.applib.permission.dom.ApplicationPermission;
import org.apache.causeway.extensions.secman.applib.role.dom.ApplicationRole;
@@ -61,7 +61,7 @@ public class ApplicationRole_removePermissions {
extends CausewayModuleExtSecmanApplib.ActionDomainEvent<ApplicationRole_removePermissions> {}
@Inject private MessageService messageService;
- @Inject private IsisConfiguration config;
+ @Inject private CausewayConfiguration config;
@Inject private RepositoryService repository;
@Inject private ApplicationRoleRepository applicationRoleRepository;
diff --git a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/seed/IsisConfigurationRoleAndPermissions.java b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/seed/CausewayConfigurationRoleAndPermissions.java
similarity index 94%
rename from extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/seed/IsisConfigurationRoleAndPermissions.java
rename to extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/seed/CausewayConfigurationRoleAndPermissions.java
index ee0927e602..0a524642bd 100644
--- a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/seed/IsisConfigurationRoleAndPermissions.java
+++ b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/seed/CausewayConfigurationRoleAndPermissions.java
@@ -29,12 +29,12 @@ import org.apache.causeway.applib.services.confview.ConfigurationMenu;
/**
* @since 2.0 {@index}
*/
-public class IsisConfigurationRoleAndPermissions
+public class CausewayConfigurationRoleAndPermissions
extends AbstractRoleAndPermissionsFixtureScript {
public static final String ROLE_NAME = ConfigurationMenu.LOGICAL_TYPE_NAME.replace(".","-");
- public IsisConfigurationRoleAndPermissions() {
+ public CausewayConfigurationRoleAndPermissions() {
super(ROLE_NAME, "Access configuration properties");
}
diff --git a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/seed/IsisExtSecmanAdminRoleAndPermissions.java b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/seed/IsisExtSecmanAdminRoleAndPermissions.java
index e7f50387d1..fb49fbd252 100644
--- a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/seed/IsisExtSecmanAdminRoleAndPermissions.java
+++ b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/seed/IsisExtSecmanAdminRoleAndPermissions.java
@@ -27,9 +27,9 @@ import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.internal.base._NullSafe;
import org.apache.causeway.applib.services.appfeat.ApplicationFeatureId;
-import org.apache.causeway.core.config.IsisConfiguration.Extensions.Secman;
-import org.apache.causeway.core.config.IsisConfiguration.Extensions.Secman.Seed.Admin;
-import org.apache.causeway.core.config.IsisConfiguration.Extensions.Secman.Seed.Admin.NamespacePermissions;
+import org.apache.causeway.core.config.CausewayConfiguration.Extensions.Secman;
+import org.apache.causeway.core.config.CausewayConfiguration.Extensions.Secman.Seed.Admin;
+import org.apache.causeway.core.config.CausewayConfiguration.Extensions.Secman.Seed.Admin.NamespacePermissions;
import org.apache.causeway.extensions.secman.applib.CausewayModuleExtSecmanApplib;
import org.apache.causeway.extensions.secman.applib.permission.dom.ApplicationPermissionMode;
import org.apache.causeway.extensions.secman.applib.permission.dom.ApplicationPermissionRule;
diff --git a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/seed/IsisExtSecmanRegularUserRoleAndPermissions.java b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/seed/IsisExtSecmanRegularUserRoleAndPermissions.java
index 352662e97b..f7c5e28586 100644
--- a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/seed/IsisExtSecmanRegularUserRoleAndPermissions.java
+++ b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/seed/IsisExtSecmanRegularUserRoleAndPermissions.java
@@ -22,7 +22,7 @@ import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.applib.CausewayModuleApplib;
import org.apache.causeway.applib.services.appfeat.ApplicationFeatureId;
-import org.apache.causeway.core.config.IsisConfiguration.Extensions.Secman;
+import org.apache.causeway.core.config.CausewayConfiguration.Extensions.Secman;
import org.apache.causeway.core.security.CausewayModuleCoreSecurity;
import org.apache.causeway.core.security.authentication.logout.LogoutMenu;
import org.apache.causeway.extensions.secman.applib.permission.dom.ApplicationPermissionMode;
@@ -62,7 +62,7 @@ import lombok.val;
* </p>
*
* @see IsisSudoImpersonateRoleAndPermissions
- * @see IsisConfigurationRoleAndPermissions
+ * @see CausewayConfigurationRoleAndPermissions
*
* @since 2.0 {@index}
*/
diff --git a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/seed/scripts/SeedUsersAndRolesFixtureScript.java b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/seed/scripts/SeedUsersAndRolesFixtureScript.java
index 29a9495729..d67df9cb82 100644
--- a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/seed/scripts/SeedUsersAndRolesFixtureScript.java
+++ b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/seed/scripts/SeedUsersAndRolesFixtureScript.java
@@ -20,9 +20,9 @@ package org.apache.causeway.extensions.secman.applib.seed.scripts;
import javax.inject.Inject;
-import org.apache.causeway.core.config.IsisConfiguration;
+import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.extensions.secman.applib.role.seed.IsisAppFeatureRoleAndPermissions;
-import org.apache.causeway.extensions.secman.applib.role.seed.IsisConfigurationRoleAndPermissions;
+import org.apache.causeway.extensions.secman.applib.role.seed.CausewayConfigurationRoleAndPermissions;
import org.apache.causeway.extensions.secman.applib.role.seed.IsisExtAuditTrailRoleAndPermissions;
import org.apache.causeway.extensions.secman.applib.role.seed.IsisExtCommandLogRoleAndPermissions;
import org.apache.causeway.extensions.secman.applib.role.seed.IsisExtExecutionLogRoleAndPermissions;
@@ -56,7 +56,7 @@ import lombok.val;
*/
public class SeedUsersAndRolesFixtureScript extends FixtureScript {
- @Inject private IsisConfiguration config;
+ @Inject private CausewayConfiguration config;
@Override
protected void execute(final ExecutionContext executionContext) {
@@ -78,7 +78,7 @@ public class SeedUsersAndRolesFixtureScript extends FixtureScript {
new IsisExtH2ConsoleRoleAndPermissions(),
new IsisViewerRestfulObjectsSwaggerRoleAndPermissions(),
new IsisSudoImpersonateRoleAndPermissions(),
- new IsisConfigurationRoleAndPermissions()
+ new CausewayConfigurationRoleAndPermissions()
);
// secman module (admin and regular users role, and secman-admin superuser)
@@ -96,7 +96,7 @@ public class SeedUsersAndRolesFixtureScript extends FixtureScript {
IsisExtH2ConsoleRoleAndPermissions.ROLE_NAME,
IsisViewerRestfulObjectsSwaggerRoleAndPermissions.ROLE_NAME,
IsisSudoImpersonateRoleAndPermissions.ROLE_NAME,
- IsisConfigurationRoleAndPermissions.ROLE_NAME)
+ CausewayConfigurationRoleAndPermissions.ROLE_NAME)
);
}
diff --git a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/user/dom/ApplicationUser.java b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/user/dom/ApplicationUser.java
index a198b6afe9..d8679319a5 100644
--- a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/user/dom/ApplicationUser.java
+++ b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/user/dom/ApplicationUser.java
@@ -54,8 +54,8 @@ import org.apache.causeway.applib.services.user.RoleMemento;
import org.apache.causeway.applib.services.user.UserMemento;
import org.apache.causeway.applib.services.user.UserService;
import org.apache.causeway.applib.util.ObjectContracts;
-import org.apache.causeway.core.config.IsisConfiguration;
-import org.apache.causeway.core.config.IsisConfiguration.Extensions.Secman;
+import org.apache.causeway.core.config.CausewayConfiguration;
+import org.apache.causeway.core.config.CausewayConfiguration.Extensions.Secman;
import org.apache.causeway.extensions.secman.applib.CausewayModuleExtSecmanApplib;
import org.apache.causeway.extensions.secman.applib.permission.dom.ApplicationPermission;
import org.apache.causeway.extensions.secman.applib.permission.dom.ApplicationPermissionMode;
@@ -111,7 +111,7 @@ public abstract class ApplicationUser
@Inject private transient ApplicationPermissionRepository applicationPermissionRepository;
@Inject private transient UserService userService;
@Inject private transient PermissionsEvaluationService permissionsEvaluationService;
- @Inject private transient IsisConfiguration config;
+ @Inject private transient CausewayConfiguration config;
@Programmatic protected ApplicationUserRepository getApplicationUserRepository() {
return applicationUserRepository;
diff --git a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/user/dom/ApplicationUserRepositoryAbstract.java b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/user/dom/ApplicationUserRepositoryAbstract.java
index 5586abd865..c485285101 100644
--- a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/user/dom/ApplicationUserRepositoryAbstract.java
+++ b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/user/dom/ApplicationUserRepositoryAbstract.java
@@ -40,7 +40,7 @@ import org.apache.causeway.applib.services.eventbus.EventBusService;
import org.apache.causeway.applib.services.factory.FactoryService;
import org.apache.causeway.applib.services.queryresultscache.QueryResultsCache;
import org.apache.causeway.applib.services.repository.RepositoryService;
-import org.apache.causeway.core.config.IsisConfiguration;
+import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.extensions.secman.applib.role.dom.ApplicationRole;
import org.apache.causeway.extensions.secman.applib.tenancy.dom.ApplicationTenancy;
import org.apache.causeway.extensions.secman.applib.user.dom.mixins.ApplicationUser_lock;
@@ -56,7 +56,7 @@ implements ApplicationUserRepository {
@Inject private FactoryService factoryService;
@Inject private RepositoryService repository;
- @Inject protected IsisConfiguration config;
+ @Inject protected CausewayConfiguration config;
@Inject private EventBusService eventBusService;
@Inject private RegexReplacer regexReplacer;
@Inject private Provider<QueryResultsCache> queryResultsCacheProvider;
diff --git a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/user/dom/mixins/ApplicationUser_lock.java b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/user/dom/mixins/ApplicationUser_lock.java
index d98960e7b0..20c0905884 100644
--- a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/user/dom/mixins/ApplicationUser_lock.java
+++ b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/user/dom/mixins/ApplicationUser_lock.java
@@ -24,7 +24,7 @@ import org.apache.causeway.applib.annotation.Action;
import org.apache.causeway.applib.annotation.ActionLayout;
import org.apache.causeway.applib.annotation.MemberSupport;
import org.apache.causeway.applib.annotation.SemanticsOf;
-import org.apache.causeway.core.config.IsisConfiguration;
+import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.extensions.secman.applib.CausewayModuleExtSecmanApplib;
import org.apache.causeway.extensions.secman.applib.user.dom.ApplicationUser;
import org.apache.causeway.extensions.secman.applib.user.dom.ApplicationUserRepository;
@@ -49,7 +49,7 @@ public class ApplicationUser_lock {
extends CausewayModuleExtSecmanApplib.ActionDomainEvent<ApplicationUser_lock> {}
@Inject private ApplicationUserRepository applicationUserRepository;
- @Inject private IsisConfiguration config;
+ @Inject private CausewayConfiguration config;
private final ApplicationUser target;
diff --git a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/user/man/mixins/ApplicationUserManager_newDelegateUser.java b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/user/man/mixins/ApplicationUserManager_newDelegateUser.java
index 2a61a671c0..b000ae217b 100644
--- a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/user/man/mixins/ApplicationUserManager_newDelegateUser.java
+++ b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/user/man/mixins/ApplicationUserManager_newDelegateUser.java
@@ -27,7 +27,7 @@ import org.apache.causeway.applib.annotation.Optionality;
import org.apache.causeway.applib.annotation.Parameter;
import org.apache.causeway.applib.annotation.ParameterLayout;
import org.apache.causeway.applib.services.repository.RepositoryService;
-import org.apache.causeway.core.config.IsisConfiguration;
+import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.extensions.secman.applib.CausewayModuleExtSecmanApplib;
import org.apache.causeway.extensions.secman.applib.role.dom.ApplicationRole;
import org.apache.causeway.extensions.secman.applib.role.dom.ApplicationRoleRepository;
@@ -55,7 +55,7 @@ public class ApplicationUserManager_newDelegateUser {
@Inject private ApplicationRoleRepository applicationRoleRepository;
@Inject private ApplicationUserRepository applicationUserRepository;
- @Inject private IsisConfiguration config;
+ @Inject private CausewayConfiguration config;
@Inject private RepositoryService repository;
private final ApplicationUserManager target;
diff --git a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/user/man/mixins/ApplicationUserManager_newLocalUser.java b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/user/man/mixins/ApplicationUserManager_newLocalUser.java
index afd137a3ea..fc3d9ac562 100644
--- a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/user/man/mixins/ApplicationUserManager_newLocalUser.java
+++ b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/user/man/mixins/ApplicationUserManager_newLocalUser.java
@@ -31,7 +31,7 @@ import org.apache.causeway.applib.annotation.ParameterLayout;
import org.apache.causeway.applib.services.factory.FactoryService;
import org.apache.causeway.applib.services.repository.RepositoryService;
import org.apache.causeway.applib.value.Password;
-import org.apache.causeway.core.config.IsisConfiguration;
+import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.extensions.secman.applib.CausewayModuleExtSecmanApplib;
import org.apache.causeway.extensions.secman.applib.role.dom.ApplicationRole;
import org.apache.causeway.extensions.secman.applib.role.dom.ApplicationRoleRepository;
@@ -60,7 +60,7 @@ public class ApplicationUserManager_newLocalUser {
@Inject private ApplicationRoleRepository applicationRoleRepository;
@Inject private ApplicationUserRepository applicationUserRepository;
- @Inject private IsisConfiguration config;
+ @Inject private CausewayConfiguration config;
@Inject private FactoryService factory;
@Inject private RepositoryService repository;
diff --git a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/user/menu/MeService.java b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/user/menu/MeService.java
index 5297bfc9bb..8802b245f1 100644
--- a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/user/menu/MeService.java
+++ b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/user/menu/MeService.java
@@ -40,7 +40,7 @@ import org.apache.causeway.applib.annotation.SemanticsOf;
import org.apache.causeway.applib.services.queryresultscache.QueryResultsCache;
import org.apache.causeway.applib.services.user.UserService;
import org.apache.causeway.applib.services.userui.UserMenu;
-import org.apache.causeway.core.config.IsisConfiguration;
+import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.extensions.secman.applib.CausewayModuleExtSecmanApplib;
import org.apache.causeway.extensions.secman.applib.user.dom.ApplicationUser;
import org.apache.causeway.extensions.secman.applib.user.dom.ApplicationUserRepository;
@@ -112,7 +112,7 @@ public class MeService {
@RequiredArgsConstructor
public static class UserMenuMeActionAdvisor {
- final IsisConfiguration isisConfiguration;
+ final CausewayConfiguration isisConfiguration;
@EventListener(UserMenu.me.ActionDomainEvent.class)
public void on(final UserMenu.me.ActionDomainEvent event) {
diff --git a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/user/seed/IsisExtSecmanAdminUser.java b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/user/seed/IsisExtSecmanAdminUser.java
index bae71ccc75..32e6b228a1 100644
--- a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/user/seed/IsisExtSecmanAdminUser.java
+++ b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/user/seed/IsisExtSecmanAdminUser.java
@@ -22,7 +22,7 @@ import java.util.Collection;
import org.apache.causeway.commons.collections.Can;
-import org.apache.causeway.core.config.IsisConfiguration.Extensions.Secman;
+import org.apache.causeway.core.config.CausewayConfiguration.Extensions.Secman;
import org.apache.causeway.extensions.secman.applib.tenancy.seed.GlobalTenancy;
import org.apache.causeway.extensions.secman.applib.user.dom.AccountType;
import org.apache.causeway.extensions.secman.applib.user.fixtures.AbstractUserAndRolesFixtureScript;
diff --git a/extensions/security/secman/delegated-shiro/src/main/java/org/apache/causeway/extensions/secman/delegated/shiro/realm/CausewayModuleExtSecmanShiroRealm.java b/extensions/security/secman/delegated-shiro/src/main/java/org/apache/causeway/extensions/secman/delegated/shiro/realm/CausewayModuleExtSecmanShiroRealm.java
index 832d0756e8..a49183018e 100644
--- a/extensions/security/secman/delegated-shiro/src/main/java/org/apache/causeway/extensions/secman/delegated/shiro/realm/CausewayModuleExtSecmanShiroRealm.java
+++ b/extensions/security/secman/delegated-shiro/src/main/java/org/apache/causeway/extensions/secman/delegated/shiro/realm/CausewayModuleExtSecmanShiroRealm.java
@@ -46,8 +46,8 @@ import org.springframework.transaction.support.TransactionTemplate;
import org.apache.causeway.applib.services.iactnlayer.InteractionService;
import org.apache.causeway.applib.services.inject.ServiceInjector;
-import org.apache.causeway.core.config.IsisConfiguration;
-import org.apache.causeway.core.config.IsisConfiguration.Extensions.Secman.DelegatedUsers.AutoCreatePolicy;
+import org.apache.causeway.core.config.CausewayConfiguration;
+import org.apache.causeway.core.config.CausewayConfiguration.Extensions.Secman.DelegatedUsers.AutoCreatePolicy;
import org.apache.causeway.core.security.authorization.Authorizor;
import org.apache.causeway.extensions.secman.applib.user.dom.AccountType;
import org.apache.causeway.extensions.secman.applib.user.dom.ApplicationUserRepository;
@@ -66,7 +66,7 @@ public class CausewayModuleExtSecmanShiroRealm extends AuthorizingRealm {
@Inject protected ServiceInjector serviceInjector;
@Inject protected InteractionService interactionService;
@Inject protected PlatformTransactionManager txMan;
- @Inject protected IsisConfiguration config;
+ @Inject protected CausewayConfiguration config;
@Getter @Setter private AuthenticatingRealm delegateAuthenticationRealm;
@Getter @Setter private boolean autoCreateUser = true;
diff --git a/extensions/security/secman/delegated-springoauth2/src/main/java/org/apache/causeway/extensions/secman/delegated/springoauth2/dom/ApplicationUserAutoCreationService.java b/extensions/security/secman/delegated-springoauth2/src/main/java/org/apache/causeway/extensions/secman/delegated/springoauth2/dom/ApplicationUserAutoCreationService.java
index a23ff1b513..0559dcd229 100644
--- a/extensions/security/secman/delegated-springoauth2/src/main/java/org/apache/causeway/extensions/secman/delegated/springoauth2/dom/ApplicationUserAutoCreationService.java
+++ b/extensions/security/secman/delegated-springoauth2/src/main/java/org/apache/causeway/extensions/secman/delegated/springoauth2/dom/ApplicationUserAutoCreationService.java
@@ -34,7 +34,7 @@ import org.springframework.stereotype.Service;
import org.apache.causeway.applib.services.factory.FactoryService;
import org.apache.causeway.applib.services.iactnlayer.InteractionService;
-import org.apache.causeway.core.config.IsisConfiguration;
+import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.extensions.secman.applib.role.dom.ApplicationRoleRepository;
import org.apache.causeway.extensions.secman.applib.user.dom.ApplicationUser;
import org.apache.causeway.extensions.secman.applib.user.dom.ApplicationUserRepository;
@@ -53,7 +53,7 @@ public class ApplicationUserAutoCreationService
private final ApplicationUserRepository applicationUserRepository;
private final ApplicationRoleRepository applicationRoleRepository;
private final InteractionService interactionService;
- private final IsisConfiguration isisConfiguration;
+ private final CausewayConfiguration isisConfiguration;
private final FactoryService factoryService;
@Override
diff --git a/extensions/security/secman/integration/src/main/java/org/apache/causeway/extensions/secman/integration/permissions/PermissionsEvaluationServiceForSecman.java b/extensions/security/secman/integration/src/main/java/org/apache/causeway/extensions/secman/integration/permissions/PermissionsEvaluationServiceForSecman.java
index 039690a729..db02eb5f75 100644
--- a/extensions/security/secman/integration/src/main/java/org/apache/causeway/extensions/secman/integration/permissions/PermissionsEvaluationServiceForSecman.java
+++ b/extensions/security/secman/integration/src/main/java/org/apache/causeway/extensions/secman/integration/permissions/PermissionsEvaluationServiceForSecman.java
@@ -34,9 +34,9 @@ import org.springframework.stereotype.Service;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.applib.services.appfeat.ApplicationFeatureId;
-import org.apache.causeway.core.config.IsisConfiguration;
-import org.apache.causeway.core.config.IsisConfiguration.Extensions.Secman;
-import org.apache.causeway.core.config.IsisConfiguration.Extensions.Secman.PermissionsEvaluationPolicy;
+import org.apache.causeway.core.config.CausewayConfiguration;
+import org.apache.causeway.core.config.CausewayConfiguration.Extensions.Secman;
+import org.apache.causeway.core.config.CausewayConfiguration.Extensions.Secman.PermissionsEvaluationPolicy;
import org.apache.causeway.extensions.secman.applib.CausewayModuleExtSecmanApplib;
import org.apache.causeway.extensions.secman.applib.permission.dom.ApplicationPermissionMode;
import org.apache.causeway.extensions.secman.applib.permission.dom.ApplicationPermissionRule;
@@ -62,7 +62,7 @@ implements PermissionsEvaluationService {
private final @NonNull PermissionsEvaluationPolicy policy; // serializable
@Inject
- public PermissionsEvaluationServiceForSecman(final IsisConfiguration isisConfiguration) {
+ public PermissionsEvaluationServiceForSecman(final CausewayConfiguration isisConfiguration) {
this.policy = Optional.ofNullable(
isisConfiguration.getExtensions().getSecman().getPermissionsEvaluationPolicy())
.orElseGet(()->new Secman().getPermissionsEvaluationPolicy()); // use config defaults as fallback
diff --git a/extensions/security/secman/integration/src/main/java/org/apache/causeway/extensions/secman/integration/userreg/UserRegistrationServiceForSecman.java b/extensions/security/secman/integration/src/main/java/org/apache/causeway/extensions/secman/integration/userreg/UserRegistrationServiceForSecman.java
index 04a9abd0c7..836983d553 100644
--- a/extensions/security/secman/integration/src/main/java/org/apache/causeway/extensions/secman/integration/userreg/UserRegistrationServiceForSecman.java
+++ b/extensions/security/secman/integration/src/main/java/org/apache/causeway/extensions/secman/integration/userreg/UserRegistrationServiceForSecman.java
@@ -31,7 +31,7 @@ import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.applib.services.userreg.UserDetails;
import org.apache.causeway.applib.services.userreg.UserRegistrationService;
import org.apache.causeway.applib.value.Password;
-import org.apache.causeway.core.config.IsisConfiguration;
+import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.extensions.secman.applib.CausewayModuleExtSecmanApplib;
import org.apache.causeway.extensions.secman.applib.role.dom.ApplicationRoleRepository;
import org.apache.causeway.extensions.secman.applib.user.dom.ApplicationUser;
@@ -57,7 +57,7 @@ public class UserRegistrationServiceForSecman implements UserRegistrationService
private final ApplicationUserRepository applicationUserRepository;
private final ApplicationRoleRepository applicationRoleRepository;
- private final IsisConfiguration isisConfiguration;
+ private final CausewayConfiguration isisConfiguration;
@Override
public boolean usernameExists(final String username) {
diff --git a/extensions/security/sessionlog/applib/src/main/java/org/apache/causeway/extensions/sessionlog/applib/dom/SessionLogEntryRepository.java b/extensions/security/sessionlog/applib/src/main/java/org/apache/causeway/extensions/sessionlog/applib/dom/SessionLogEntryRepository.java
index 2f4e5cbc2d..72475c15a3 100644
--- a/extensions/security/sessionlog/applib/src/main/java/org/apache/causeway/extensions/sessionlog/applib/dom/SessionLogEntryRepository.java
+++ b/extensions/security/sessionlog/applib/src/main/java/org/apache/causeway/extensions/sessionlog/applib/dom/SessionLogEntryRepository.java
@@ -33,7 +33,7 @@ import org.apache.causeway.applib.services.factory.FactoryService;
import org.apache.causeway.applib.services.repository.RepositoryService;
import org.apache.causeway.applib.services.session.SessionSubscriber;
import org.apache.causeway.applib.services.xactn.TransactionService;
-import org.apache.causeway.core.config.environment.IsisSystemEnvironment;
+import org.apache.causeway.core.config.environment.CausewaySystemEnvironment;
import lombok.NonNull;
import lombok.val;
@@ -46,7 +46,7 @@ public abstract class SessionLogEntryRepository<E extends SessionLogEntry> {
@Inject RepositoryService repositoryService;
@Inject TransactionService transactionService;
@Inject FactoryService factoryService;
- @Inject IsisSystemEnvironment isisSystemEnvironment;
+ @Inject CausewaySystemEnvironment isisSystemEnvironment;
private final Class<E> sessionLogEntryClass;
diff --git a/extensions/security/sessionlog/applib/src/main/java/org/apache/causeway/extensions/sessionlog/applib/spiimpl/SessionLogServiceInitializer.java b/extensions/security/sessionlog/applib/src/main/java/org/apache/causeway/extensions/sessionlog/applib/spiimpl/SessionLogServiceInitializer.java
index f9d78620cc..5f36e0e6f6 100644
--- a/extensions/security/sessionlog/applib/src/main/java/org/apache/causeway/extensions/sessionlog/applib/spiimpl/SessionLogServiceInitializer.java
+++ b/extensions/security/sessionlog/applib/src/main/java/org/apache/causeway/extensions/sessionlog/applib/spiimpl/SessionLogServiceInitializer.java
@@ -27,7 +27,7 @@ import org.springframework.stereotype.Component;
import org.apache.causeway.applib.events.metamodel.MetamodelListener;
import org.apache.causeway.applib.services.clock.ClockService;
import org.apache.causeway.applib.services.iactnlayer.InteractionService;
-import org.apache.causeway.core.config.IsisConfiguration;
+import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.extensions.sessionlog.applib.dom.SessionLogEntry;
import org.apache.causeway.extensions.sessionlog.applib.dom.SessionLogEntryRepository;
@@ -41,7 +41,7 @@ public class SessionLogServiceInitializer implements MetamodelListener {
final SessionLogEntryRepository<? extends SessionLogEntry> sessionLogEntryRepository;
final InteractionService interactionService;
final ClockService clockService;
- final IsisConfiguration isisConfiguration;
+ final CausewayConfiguration isisConfiguration;
@Override
public void onMetamodelLoaded() {
diff --git a/extensions/vro/cors/impl/src/main/java/org/apache/causeway/extensions/cors/impl/CausewayModuleExtCors.java b/extensions/vro/cors/impl/src/main/java/org/apache/causeway/extensions/cors/impl/CausewayModuleExtCors.java
index 4dfdb1ba41..93874fee61 100644
--- a/extensions/vro/cors/impl/src/main/java/org/apache/causeway/extensions/cors/impl/CausewayModuleExtCors.java
+++ b/extensions/vro/cors/impl/src/main/java/org/apache/causeway/extensions/cors/impl/CausewayModuleExtCors.java
@@ -31,7 +31,7 @@ import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
import org.springframework.web.filter.CorsFilter;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
-import org.apache.causeway.core.config.IsisConfiguration;
+import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.config.RestEasyConfiguration;
import lombok.val;
@@ -47,7 +47,7 @@ public class CausewayModuleExtCors {
@Bean
public FilterRegistrationBean<Filter> createCorsFilterRegistration(
- final IsisConfiguration isisConfiguration,
+ final CausewayConfiguration isisConfiguration,
final RestEasyConfiguration restEasyConfiguration) {
String resteasyBase = restEasyConfiguration.getJaxrs().getDefaultPath();
@@ -66,7 +66,7 @@ public class CausewayModuleExtCors {
return filterRegistrationBean;
}
- private CorsFilter createCorsFilter(IsisConfiguration configuration) {
+ private CorsFilter createCorsFilter(CausewayConfiguration configuration) {
val isisCorsConfig = configuration.getExtensions().getCors();
diff --git a/extensions/vro/cors/impl/src/test/java/org/apache/causeway/extensions/cors/impl/IsisModuleExtCorsImplTest.java b/extensions/vro/cors/impl/src/test/java/org/apache/causeway/extensions/cors/impl/IsisModuleExtCorsImplTest.java
index 0814f7cd31..b0884b6146 100644
--- a/extensions/vro/cors/impl/src/test/java/org/apache/causeway/extensions/cors/impl/IsisModuleExtCorsImplTest.java
+++ b/extensions/vro/cors/impl/src/test/java/org/apache/causeway/extensions/cors/impl/IsisModuleExtCorsImplTest.java
@@ -23,7 +23,7 @@ import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertTrue;
-import org.apache.causeway.core.config.IsisConfiguration;
+import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.config.RestEasyConfiguration;
import org.apache.causeway.core.metamodel._testing.MetaModelContext_forTesting;
import org.apache.causeway.extensions.cors.impl.CausewayModuleExtCors;
@@ -32,7 +32,7 @@ import lombok.val;
class CausewayModuleExtCorsImplTest {
- private IsisConfiguration isisDefaultConfiguration;
+ private CausewayConfiguration isisDefaultConfiguration;
private RestEasyConfiguration restEasyConfiguration;
@BeforeEach
@@ -44,7 +44,7 @@ class CausewayModuleExtCorsImplTest {
}
@Test
- void defaultIsisConfiguration_shouldYieldCorsUrlPatternWithWildcard() {
+ void defaultCausewayConfiguration_shouldYieldCorsUrlPatternWithWildcard() {
// given
val isisModuleExtCors = new CausewayModuleExtCors();
diff --git a/incubator/extensions/core/commandreplay/primary/src/main/java/org/apache/causeway/extensions/commandreplay/primary/config/PrimaryConfig.java b/incubator/extensions/core/commandreplay/primary/src/main/java/org/apache/causeway/extensions/commandreplay/primary/config/PrimaryConfig.java
index 8b7cb14f4f..57fe6c619f 100644
--- a/incubator/extensions/core/commandreplay/primary/src/main/java/org/apache/causeway/extensions/commandreplay/primary/config/PrimaryConfig.java
+++ b/incubator/extensions/core/commandreplay/primary/src/main/java/org/apache/causeway/extensions/commandreplay/primary/config/PrimaryConfig.java
@@ -24,7 +24,7 @@ import javax.validation.constraints.NotNull;
import org.springframework.stereotype.Service;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
-import org.apache.causeway.core.config.IsisConfiguration;
+import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.extensions.commandreplay.primary.CausewayModuleExtCommandReplayPrimary;
import lombok.Getter;
@@ -41,7 +41,7 @@ public class PrimaryConfig {
@Getter final String secondaryBaseUrlWicket;
- public PrimaryConfig(@NotNull final IsisConfiguration isisConfiguration) {
+ public PrimaryConfig(@NotNull final CausewayConfiguration isisConfiguration) {
val config = isisConfiguration.getExtensions().getCommandReplay();
val secondaryAccess = config.getSecondaryAccess();
diff --git a/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/causeway/extensions/commandreplay/secondary/CausewayModuleExtCommandReplaySecondary.java b/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/causeway/extensions/commandreplay/secondary/CausewayModuleExtCommandReplaySecondary.java
index 28b24b4625..6ca2470655 100644
--- a/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/causeway/extensions/commandreplay/secondary/CausewayModuleExtCommandReplaySecondary.java
+++ b/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/causeway/extensions/commandreplay/secondary/CausewayModuleExtCommandReplaySecondary.java
@@ -37,7 +37,7 @@ import org.springframework.scheduling.quartz.SchedulerFactoryBean;
import org.springframework.scheduling.quartz.SimpleTriggerFactoryBean;
import org.springframework.scheduling.quartz.SpringBeanJobFactory;
-import org.apache.causeway.core.config.IsisConfiguration;
+import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.extensions.commandlog.applib.CausewayModuleExtCommandLogApplib;
import org.apache.causeway.extensions.commandreplay.secondary.analyser.CommandReplayAnalyserException;
import org.apache.causeway.extensions.commandreplay.secondary.analyser.CommandReplayAnalyserResult;
@@ -90,7 +90,7 @@ public class CausewayModuleExtCommandReplaySecondary {
extends org.apache.causeway.applib.events.domain.PropertyDomainEvent<S,T> { }
@Inject ApplicationContext applicationContext;
- @Inject IsisConfiguration isisConfiguration;
+ @Inject CausewayConfiguration isisConfiguration;
@Bean(name = "ReplicateAndReplayJob")
public JobDetailFactoryBean replicateAndReplayJobDetailFactory() {
diff --git a/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/causeway/extensions/commandreplay/secondary/analyser/CommandReplayAnalyserException.java b/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/causeway/extensions/commandreplay/secondary/analyser/CommandReplayAnalyserException.java
index 6184d82480..02a9625d5d 100644
--- a/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/causeway/extensions/commandreplay/secondary/analyser/CommandReplayAnalyserException.java
+++ b/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/causeway/extensions/commandreplay/secondary/analyser/CommandReplayAnalyserException.java
@@ -29,7 +29,7 @@ import org.springframework.stereotype.Service;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.applib.services.commanddto.conmap.UserDataKeys;
import org.apache.causeway.applib.util.schema.CommandDtoUtils;
-import org.apache.causeway.core.config.IsisConfiguration;
+import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.extensions.commandlog.applib.dom.CommandLogEntry;
import org.apache.causeway.extensions.commandreplay.secondary.CausewayModuleExtCommandReplaySecondary;
import org.apache.causeway.schema.common.v2.InteractionType;
@@ -46,7 +46,7 @@ import lombok.val;
@RequiredArgsConstructor
public class CommandReplayAnalyserException implements CommandReplayAnalyser {
- private final IsisConfiguration isisConfiguration;
+ private final CausewayConfiguration isisConfiguration;
private boolean enabled;
@PostConstruct
diff --git a/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/causeway/extensions/commandreplay/secondary/analyser/CommandReplayAnalyserResult.java b/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/causeway/extensions/commandreplay/secondary/analyser/CommandReplayAnalyserResult.java
index 69d159ed11..3609f3b454 100644
--- a/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/causeway/extensions/commandreplay/secondary/analyser/CommandReplayAnalyserResult.java
+++ b/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/causeway/extensions/commandreplay/secondary/analyser/CommandReplayAnalyserResult.java
@@ -28,7 +28,7 @@ import org.springframework.stereotype.Service;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.applib.services.commanddto.conmap.UserDataKeys;
import org.apache.causeway.applib.util.schema.CommandDtoUtils;
-import org.apache.causeway.core.config.IsisConfiguration;
+import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.extensions.commandlog.applib.dom.CommandLogEntry;
import org.apache.causeway.extensions.commandreplay.secondary.CausewayModuleExtCommandReplaySecondary;
import org.apache.causeway.schema.common.v2.InteractionType;
@@ -45,7 +45,7 @@ import lombok.val;
@RequiredArgsConstructor
public class CommandReplayAnalyserResult implements CommandReplayAnalyser {
- private final IsisConfiguration isisConfiguration;
+ private final CausewayConfiguration isisConfiguration;
private boolean enabled;
@PostConstruct
diff --git a/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/causeway/extensions/commandreplay/secondary/config/SecondaryConfig.java b/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/causeway/extensions/commandreplay/secondary/config/SecondaryConfig.java
index 12331b475f..cb5ebd3ab8 100644
--- a/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/causeway/extensions/commandreplay/secondary/config/SecondaryConfig.java
+++ b/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/causeway/extensions/commandreplay/secondary/config/SecondaryConfig.java
@@ -26,7 +26,7 @@ import javax.validation.constraints.NotNull;
import org.springframework.stereotype.Service;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
-import org.apache.causeway.core.config.IsisConfiguration;
+import org.apache.causeway.core.config.CausewayConfiguration;
import lombok.Getter;
import lombok.val;
@@ -49,7 +49,7 @@ public class SecondaryConfig {
@Getter final String quartzUser;
@Getter final List<String> quartzRoles;
- public SecondaryConfig(@NotNull final IsisConfiguration isisConfiguration) {
+ public SecondaryConfig(@NotNull final CausewayConfiguration isisConfiguration) {
val config = isisConfiguration.getExtensions().getCommandReplay();
val primaryAccess = config.getPrimaryAccess();
diff --git a/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/source/EndToEnd_IntegTest.java b/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/source/EndToEnd_IntegTest.java
index 3a54cbc652..5d465f5f29 100644
--- a/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/source/EndToEnd_IntegTest.java
+++ b/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/source/EndToEnd_IntegTest.java
@@ -54,7 +54,7 @@ import static org.apache.causeway.commons.internal.assertions._Assert.assertNotN
import static org.apache.causeway.commons.internal.assertions._Assert.assertTrue;
import org.apache.causeway.applib.services.xactn.TransactionService;
-import org.apache.causeway.core.config.environment.IsisSystemEnvironment;
+import org.apache.causeway.core.config.environment.CausewaySystemEnvironment;
import org.apache.causeway.core.metamodel.specloader.SpecificationLoader;
import org.apache.causeway.viewer.graphql.viewer.source.GraphQlSourceForIsis;
import org.apache.causeway.viewer.graphql.viewer.test.source.gqltestdomain.E1;
@@ -72,7 +72,7 @@ import lombok.val;
public class EndToEnd_IntegTest extends TestDomainModuleIntegTestAbstract {
@Inject TransactionService transactionService;
- @Inject IsisSystemEnvironment isisSystemEnvironment;
+ @Inject CausewaySystemEnvironment isisSystemEnvironment;
@Inject SpecificationLoader specificationLoader;
@Inject GraphQlSourceForIsis graphQlSourceForIsis;
diff --git a/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/source/GQLSchema_IntegTest.java b/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/source/GQLSchema_IntegTest.java
index 265a7bd04a..4cdf7d4eab 100644
--- a/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/source/GQLSchema_IntegTest.java
+++ b/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/source/GQLSchema_IntegTest.java
@@ -31,7 +31,7 @@ import static org.apache.causeway.commons.internal.assertions._Assert.assertEqua
import static org.apache.causeway.commons.internal.assertions._Assert.assertNotNull;
import static org.apache.causeway.commons.internal.assertions._Assert.assertTrue;
-import org.apache.causeway.core.config.environment.IsisSystemEnvironment;
+import org.apache.causeway.core.config.environment.CausewaySystemEnvironment;
import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
import org.apache.causeway.core.metamodel.specloader.SpecificationLoader;
import org.apache.causeway.viewer.graphql.viewer.source.GraphQlSourceForIsis;
@@ -59,7 +59,7 @@ import graphql.schema.GraphQLTypeReference;
public class GQLSchema_IntegTest extends TestDomainModuleIntegTestAbstract{
@Inject
- private IsisSystemEnvironment isisSystemEnvironment;
+ private CausewaySystemEnvironment isisSystemEnvironment;
@Inject
private SpecificationLoader specificationLoader;
diff --git a/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/GraphQlSourceForIsis.java b/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/GraphQlSourceForIsis.java
index 0092f08272..8b11c21836 100644
--- a/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/GraphQlSourceForIsis.java
+++ b/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/GraphQlSourceForIsis.java
@@ -28,8 +28,8 @@ import org.springframework.graphql.execution.GraphQlSource;
import org.springframework.stereotype.Service;
import org.apache.causeway.applib.services.registry.ServiceRegistry;
-import org.apache.causeway.core.config.IsisConfiguration;
-import org.apache.causeway.core.config.environment.IsisSystemEnvironment;
+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.metamodel.specloader.SpecificationLoader;
@@ -54,8 +54,8 @@ public class GraphQlSourceForIsis implements GraphQlSource {
private final ServiceRegistry serviceRegistry;
private final SpecificationLoader specificationLoader;
- private final IsisConfiguration isisConfiguration;
- private final IsisSystemEnvironment isisSystemEnvironment;
+ private final CausewayConfiguration isisConfiguration;
+ private final CausewaySystemEnvironment isisSystemEnvironment;
private final ExecutionStrategyResolvingWithinInteraction executionStrategy;
private final ObjectTypeFactory objectTypeFactory;
private final QueryFieldFactory queryFieldFactory;
diff --git a/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/components/UiComponentFactoryFx.java b/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/components/UiComponentFactoryFx.java
index caaa5b252a..d4e4dee9ae 100644
--- a/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/components/UiComponentFactoryFx.java
+++ b/incubator/viewers/javafx/ui/src/main/java/org/apache/causeway/incubator/viewer/javafx/ui/components/UiComponentFactoryFx.java
@@ -27,7 +27,7 @@ import org.apache.causeway.commons.handler.ChainOfResponsibility;
import org.springframework.stereotype.Service;
import org.apache.causeway.applib.annotation.LabelPosition;
-import org.apache.causeway.core.config.environment.IsisSystemEnvironment;
+import org.apache.causeway.core.config.environment.CausewaySystemEnvironment;
import org.apache.causeway.core.metamodel.interactions.managed.ManagedMember;
import org.apache.causeway.core.metamodel.util.Facets;
import org.apache.causeway.incubator.viewer.javafx.model.context.UiContextFx;
@@ -54,7 +54,7 @@ public class UiComponentFactoryFx implements UiComponentFactory<Node, Node> {
@Inject
private UiComponentFactoryFx(
- final IsisSystemEnvironment isisSystemEnvironment,
+ final CausewaySystemEnvironment isisSystemEnvironment,
final UiContextFx uiContext,
final List<UiComponentHandlerFx> handlers) {
diff --git a/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/pages/login/VaadinLoginView.java b/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/pages/login/VaadinLoginView.java
index b1186c44e0..4b3b6b1d4b 100644
--- a/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/pages/login/VaadinLoginView.java
+++ b/incubator/viewers/vaadin/ui/src/main/java/org/apache/causeway/incubator/viewer/vaadin/ui/pages/login/VaadinLoginView.java
@@ -32,7 +32,7 @@ import com.vaadin.flow.component.textfield.PasswordField;
import com.vaadin.flow.component.textfield.TextField;
import com.vaadin.flow.router.Route;
-import org.apache.causeway.core.config.IsisConfiguration;
+import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.config.viewer.web.WebAppContextPath;
import org.apache.causeway.core.security.authentication.AuthenticationRequestPassword;
import org.apache.causeway.incubator.viewer.vaadin.ui.auth.VaadinAuthenticationHandler;
@@ -53,7 +53,7 @@ public class VaadinLoginView extends VerticalLayout {
@Inject
public VaadinLoginView(
- final IsisConfiguration isisConfiguration,
+ final CausewayConfiguration isisConfiguration,
final WebAppContextPath webAppContextPath,
final VaadinAuthenticationHandler vaadinAuthenticationHandler) {
@@ -102,7 +102,7 @@ public class VaadinLoginView extends VerticalLayout {
doLogin("sven", "pass");
}
- private void addTitleAndLogo(IsisConfiguration isisConfiguration, WebAppContextPath webAppContextPath) {
+ private void addTitleAndLogo(CausewayConfiguration isisConfiguration, WebAppContextPath webAppContextPath) {
//TODO application name/logo borrowed from Wicket's configuration
val applicationName = isisConfiguration.getViewer().getWicket().getApplication().getName();
val applicationLogo = isisConfiguration.getViewer().getWicket().getApplication().getBrandLogoSignin();
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 dfcede8596..4654151fa0 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
@@ -38,7 +38,7 @@ import org.springframework.context.annotation.Primary;
import org.springframework.dao.support.PersistenceExceptionTranslator;
import org.springframework.transaction.interceptor.TransactionInterceptor;
-import org.apache.causeway.core.config.IsisConfiguration;
+import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.config.beans.IsisBeanTypeRegistry;
import org.apache.causeway.core.config.beans.aoppatch.TransactionInterceptorFactory;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
@@ -127,7 +127,7 @@ public class CausewayModulePersistenceJdoDatanucleus {
@Qualifier("local-pmf-proxy")
@Bean
public LocalPersistenceManagerFactoryBean getLocalPersistenceManagerFactoryBean(
- final IsisConfiguration isisConfiguration,
+ final CausewayConfiguration isisConfiguration,
final DataSource dataSource,
final MetaModelContext metaModelContext,
final ObjectLifecyclePublisher objectLifecyclePublisher,
@@ -259,7 +259,7 @@ public class CausewayModulePersistenceJdoDatanucleus {
@SneakyThrows
private static DataSource autoCreateSchemas(
final DataSource dataSource,
- final IsisConfiguration isisConfiguration) {
+ final CausewayConfiguration isisConfiguration) {
val persistenceSchemaConf = isisConfiguration.getPersistence().getSchema();
diff --git a/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/JdoProgrammingModel.java b/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/JdoProgrammingModel.java
index 8dd43e94c1..115ce29f5f 100644
--- a/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/JdoProgrammingModel.java
+++ b/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/JdoProgrammingModel.java
@@ -50,7 +50,7 @@ import lombok.val;
@Component
public class JdoProgrammingModel implements MetaModelRefiner {
- //@Inject private IsisConfiguration config;
+ //@Inject private CausewayConfiguration config;
@Override
public void refineProgrammingModel(final ProgrammingModel pm) {
diff --git a/persistence/jdo/metamodel/src/test/java/org/apache/causeway/persistence/jdo/metamodel/facets/object/version/JdoVersionAnnotationFacetFactoryTest_validate.java b/persistence/jdo/metamodel/src/test/java/org/apache/causeway/persistence/jdo/metamodel/facets/object/version/JdoVersionAnnotationFacetFactoryTest_validate.java
index 0969d1b9b5..b64fcad300 100644
--- a/persistence/jdo/metamodel/src/test/java/org/apache/causeway/persistence/jdo/metamodel/facets/object/version/JdoVersionAnnotationFacetFactoryTest_validate.java
+++ b/persistence/jdo/metamodel/src/test/java/org/apache/causeway/persistence/jdo/metamodel/facets/object/version/JdoVersionAnnotationFacetFactoryTest_validate.java
@@ -28,7 +28,7 @@ import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertTrue;
-import org.apache.causeway.core.config.IsisConfiguration;
+import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.metamodel._testing.MetaModelContext_forTesting;
import org.apache.causeway.core.metamodel.progmodel.ProgrammingModel.FacetProcessingOrder;
import org.apache.causeway.core.metamodel.progmodel.ProgrammingModelAbstract;
@@ -44,7 +44,7 @@ public class JdoVersionAnnotationFacetFactoryTest_validate {
@Before
public void setUp() throws Exception {
- val configuration = new IsisConfiguration(null);
+ val configuration = new CausewayConfiguration(null);
metaModelContext = MetaModelContext_forTesting
.builder()
diff --git a/persistence/jpa/eclipselink/src/main/java/org/apache/causeway/persistence/jpa/eclipselink/CausewayModulePersistenceJpaEclipselink.java b/persistence/jpa/eclipselink/src/main/java/org/apache/causeway/persistence/jpa/eclipselink/CausewayModulePersistenceJpaEclipselink.java
index 9d2bb0dde1..a8eec3086e 100644
--- a/persistence/jpa/eclipselink/src/main/java/org/apache/causeway/persistence/jpa/eclipselink/CausewayModulePersistenceJpaEclipselink.java
+++ b/persistence/jpa/eclipselink/src/main/java/org/apache/causeway/persistence/jpa/eclipselink/CausewayModulePersistenceJpaEclipselink.java
@@ -41,7 +41,7 @@ import org.springframework.orm.jpa.vendor.EclipseLinkJpaDialect;
import org.springframework.orm.jpa.vendor.EclipseLinkJpaVendorAdapter;
import org.springframework.transaction.jta.JtaTransactionManager;
-import org.apache.causeway.core.config.IsisConfiguration;
+import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.persistence.jpa.eclipselink.config.ElSettings;
import org.apache.causeway.persistence.jpa.integration.CausewayModulePersistenceJpaIntegration;
@@ -70,7 +70,7 @@ public class CausewayModulePersistenceJpaEclipselink extends JpaBaseConfiguratio
@Inject private ElSettings elSettings;
protected CausewayModulePersistenceJpaEclipselink(
- IsisConfiguration isisConfiguration,
+ CausewayConfiguration isisConfiguration,
DataSource dataSource,
JpaProperties properties,
ObjectProvider<JtaTransactionManager> jtaTransactionManager) {
@@ -105,7 +105,7 @@ public class CausewayModulePersistenceJpaEclipselink extends JpaBaseConfiguratio
@SneakyThrows
protected static DataSource autoCreateSchemas(
final DataSource dataSource,
- final IsisConfiguration isisConfiguration) {
+ final CausewayConfiguration isisConfiguration) {
val persistenceSchemaConf = isisConfiguration.getPersistence().getSchema();
@@ -132,7 +132,7 @@ public class CausewayModulePersistenceJpaEclipselink extends JpaBaseConfiguratio
*/
protected static JpaProperties addAdditionalOrmFiles(
JpaProperties properties,
- IsisConfiguration isisConfiguration) {
+ CausewayConfiguration isisConfiguration) {
val persistenceSchemaConf = isisConfiguration.getPersistence().getSchema();
diff --git a/persistence/jpa/metamodel/src/main/java/org/apache/causeway/persistence/jpa/metamodel/JpaProgrammingModel.java b/persistence/jpa/metamodel/src/main/java/org/apache/causeway/persistence/jpa/metamodel/JpaProgrammingModel.java
index c1718d8653..138b6f190a 100644
--- a/persistence/jpa/metamodel/src/main/java/org/apache/causeway/persistence/jpa/metamodel/JpaProgrammingModel.java
+++ b/persistence/jpa/metamodel/src/main/java/org/apache/causeway/persistence/jpa/metamodel/JpaProgrammingModel.java
@@ -33,7 +33,7 @@ import lombok.val;
@Component
public class JpaProgrammingModel implements MetaModelRefiner {
- //@Inject private IsisConfiguration config;
+ //@Inject private CausewayConfiguration config;
@Override
public void refineProgrammingModel(final ProgrammingModel pm) {
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 a494127c30..995b4566b9 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
@@ -36,7 +36,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.IsisConfiguration;
+import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.config.presets.IsisPresets;
import org.apache.causeway.core.metamodel.specloader.SpecificationLoader;
import org.apache.causeway.testdomain.conf.Configuration_headless;
@@ -63,7 +63,7 @@ import lombok.extern.log4j.Log4j2;
@Log4j2
class SpecloaderPerformanceTest {
- @Inject private IsisConfiguration config;
+ @Inject private CausewayConfiguration config;
@Inject private SpecificationLoader specificationLoader;
//@Inject private MetaModelServiceMenu metaModelServiceMenu; //XXX could use ascii diff utilizing metaModelServiceMenu
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 39fced1cb2..3411082db5 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
@@ -36,7 +36,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.IsisConfiguration;
+import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.config.presets.IsisPresets;
import org.apache.causeway.testdomain.conf.Configuration_usingJdoAndShiro;
@@ -61,7 +61,7 @@ import lombok.val;
@TestPropertySource(IsisPresets.UseLog4j2Test)
class ShiroSecmanTest extends AbstractShiroTest {
- @Inject IsisConfiguration isisConfig;
+ @Inject CausewayConfiguration isisConfig;
@Inject ServiceInjector serviceInjector;
@BeforeEach
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 e3622abd7d..f1ea15cc72 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
@@ -37,7 +37,7 @@ 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.IsisBeanTypeRegistryDefault;
-import org.apache.causeway.core.config.environment.IsisSystemEnvironment;
+import org.apache.causeway.core.config.environment.CausewaySystemEnvironment;
import org.apache.causeway.core.config.presets.IsisPresets;
import org.apache.causeway.core.metamodel.context.MetaModelContexts;
import org.apache.causeway.core.metamodel.services.registry.ServiceRegistryDefault;
@@ -51,7 +51,7 @@ import lombok.val;
@SpringBootTest(
classes = {
- IsisSystemEnvironment.class,
+ CausewaySystemEnvironment.class,
MetaModelContexts.class,
IsisBeanFactoryPostProcessorForSpring.class,
IsisBeanTypeRegistryDefault.class,
@@ -70,7 +70,7 @@ import lombok.val;
class AutoConfigurationTest {
@Inject private ApplicationContext applicationContext;
- @Inject private IsisSystemEnvironment isisSystemEnvironment;
+ @Inject private CausewaySystemEnvironment isisSystemEnvironment;
@Inject private IsisBeanTypeRegistry isisBeanTypeRegistry;
@Inject private ServiceRegistry serviceRegistry;
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 9d4a73fbb7..c414832781 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
@@ -40,7 +40,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import org.apache.causeway.applib.services.registry.ServiceRegistry;
-import org.apache.causeway.core.config.environment.IsisSystemEnvironment;
+import org.apache.causeway.core.config.environment.CausewaySystemEnvironment;
import org.apache.causeway.core.config.presets.IsisPresets;
import org.apache.causeway.testdomain.conf.Configuration_headless;
@@ -66,7 +66,7 @@ import lombok.val;
class SpringServiceProvisioningTest {
@Inject private ServiceRegistry serviceRegistry;
- @Inject private IsisSystemEnvironment isisSystemEnvironment;
+ @Inject private CausewaySystemEnvironment isisSystemEnvironment;
@BeforeEach
void beforeEach() {
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 3a8e479265..cfdab3ac20 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
@@ -27,7 +27,7 @@ import org.springframework.test.context.TestPropertySource;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
-import org.apache.causeway.core.config.IsisConfiguration;
+import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.config.CausewayModuleCoreConfig;
import org.apache.causeway.core.config.presets.IsisPresets;
@@ -42,7 +42,7 @@ import org.apache.causeway.core.config.presets.IsisPresets;
class IsisConfigBeanTest {
- @Inject private IsisConfiguration isisConfiguration;
+ @Inject private CausewayConfiguration isisConfiguration;
@Test
void configurationBean_shouldBePickedUpBySpring() {
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 925761670d..3cf79673a8 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
@@ -27,7 +27,7 @@ import org.springframework.test.context.TestPropertySource;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
-import org.apache.causeway.core.config.IsisConfiguration;
+import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.config.presets.IsisPresets;
import org.apache.causeway.testdomain.conf.Configuration_headless;
@@ -42,7 +42,7 @@ import org.apache.causeway.testdomain.conf.Configuration_headless;
})
class IsisConfigBeanTest_usingHeadless {
- @Inject private IsisConfiguration isisConfiguration;
+ @Inject private CausewayConfiguration isisConfiguration;
@Test
void configurationBean_shouldBePickedUpBySpring() {
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 91c2dfca0c..d33749ed9e 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
@@ -43,8 +43,8 @@ import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.exceptions.unrecoverable.DomainModelException;
import org.apache.causeway.applib.id.LogicalType;
import org.apache.causeway.applib.services.iactnlayer.InteractionService;
-import org.apache.causeway.core.config.IsisConfiguration;
-import org.apache.causeway.core.config.environment.IsisSystemEnvironment;
+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.progmodel.ProgrammingModelConstants;
@@ -89,9 +89,9 @@ import lombok.val;
})
class DomainModelTest_usingBadDomain {
- @Inject private IsisConfiguration configuration;
+ @Inject private CausewayConfiguration configuration;
@Inject private InteractionService interactionService;
- @Inject private IsisSystemEnvironment isisSystemEnvironment;
+ @Inject private CausewaySystemEnvironment isisSystemEnvironment;
@Inject private SpecificationLoader specificationLoader;
@Inject private DomainObjectTesterFactory testerFactory;
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 7c10ead1d6..528522e3d5 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
@@ -27,8 +27,8 @@ import org.springframework.test.context.TestPropertySource;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
-import org.apache.causeway.core.config.IsisConfiguration;
-import org.apache.causeway.core.config.environment.IsisSystemEnvironment;
+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.progmodel.ProgrammingModelConstants;
@@ -56,8 +56,8 @@ import lombok.val;
})
class DomainModelTest_usingBadDomain_noAnnotationEnforced {
- @Inject private IsisConfiguration configuration;
- @Inject private IsisSystemEnvironment isisSystemEnvironment;
+ @Inject private CausewayConfiguration configuration;
+ @Inject private CausewaySystemEnvironment isisSystemEnvironment;
@Inject private DomainObjectTesterFactory testerFactory;
@Test
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 9ce0523ae2..976b304e84 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
@@ -49,7 +49,7 @@ import org.apache.causeway.applib.services.metamodel.Config;
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.IsisConfiguration;
+import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.config.presets.IsisPresets;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.all.named.MemberNamedFacet;
@@ -122,7 +122,7 @@ class DomainModelTest_usingGoodDomain {
@Inject private ServiceRegistry serviceRegistry;
@Inject private SpecificationLoader specificationLoader;
@Inject private TitleService titleService;
- @Inject private IsisConfiguration isisConfig;
+ @Inject private CausewayConfiguration isisConfig;
@Inject private DomainObjectTesterFactory testerFactory;
void debug() {
diff --git a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/jdo/JdoTestDomainPersona.java b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/jdo/JdoTestDomainPersona.java
index 5fea471b00..c24fef20d1 100644
--- a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/jdo/JdoTestDomainPersona.java
+++ b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/jdo/JdoTestDomainPersona.java
@@ -20,7 +20,7 @@ package org.apache.causeway.testdomain.jdo;
import javax.inject.Inject;
-import org.apache.causeway.core.config.IsisConfiguration;
+import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.extensions.secman.applib.role.dom.ApplicationRoleRepository;
import org.apache.causeway.extensions.secman.applib.user.dom.ApplicationUser;
import org.apache.causeway.extensions.secman.applib.user.dom.ApplicationUserRepository;
@@ -110,7 +110,7 @@ implements PersonaWithBuilderScript<Object, BuilderScriptAbstract<Object>> {
@Inject private ApplicationUserRepository applicationUserRepository;
@Inject private ApplicationRoleRepository applicationRoleRepository;
- @Inject private IsisConfiguration isisConfig;
+ @Inject private CausewayConfiguration isisConfig;
};
}
diff --git a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/jpa/JpaTestDomainPersona.java b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/jpa/JpaTestDomainPersona.java
index cbf68bc7da..73cb76b724 100644
--- a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/jpa/JpaTestDomainPersona.java
+++ b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/jpa/JpaTestDomainPersona.java
@@ -23,7 +23,7 @@ import java.util.TreeSet;
import javax.inject.Inject;
import org.apache.causeway.applib.services.repository.RepositoryService;
-import org.apache.causeway.core.config.IsisConfiguration;
+import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.extensions.secman.applib.role.dom.ApplicationRoleRepository;
import org.apache.causeway.extensions.secman.applib.user.dom.ApplicationUser;
import org.apache.causeway.extensions.secman.applib.user.dom.ApplicationUserRepository;
@@ -118,7 +118,7 @@ public enum JpaTestDomainPersona
@Inject private ApplicationUserRepository applicationUserRepository;
@Inject private ApplicationRoleRepository applicationRoleRepository;
- @Inject private IsisConfiguration isisConfig;
+ @Inject private CausewayConfiguration isisConfig;
};
}
diff --git a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/util/interaction/DomainObjectTesterFactory.java b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/util/interaction/DomainObjectTesterFactory.java
index 9f7a4ab3e5..ff83024665 100644
--- a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/util/interaction/DomainObjectTesterFactory.java
+++ b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/util/interaction/DomainObjectTesterFactory.java
@@ -50,8 +50,8 @@ import org.apache.causeway.applib.services.command.Command;
import org.apache.causeway.applib.services.factory.FactoryService;
import org.apache.causeway.applib.services.iactnlayer.InteractionService;
import org.apache.causeway.applib.services.inject.ServiceInjector;
-import org.apache.causeway.core.config.IsisConfiguration;
-import org.apache.causeway.core.config.environment.IsisSystemEnvironment;
+import org.apache.causeway.core.config.CausewayConfiguration;
+import org.apache.causeway.core.config.environment.CausewaySystemEnvironment;
import org.apache.causeway.core.config.progmodel.ProgrammingModelConstants;
import org.apache.causeway.core.metamodel.facetapi.Facet;
import org.apache.causeway.core.metamodel.facets.members.cssclass.CssClassFacet;
@@ -1112,8 +1112,8 @@ public class DomainObjectTesterFactory {
private static abstract class Tester<T> {
- @Inject protected IsisConfiguration configuration;
- @Inject protected IsisSystemEnvironment isisSystemEnvironment;
+ @Inject protected CausewayConfiguration configuration;
+ @Inject protected CausewaySystemEnvironment isisSystemEnvironment;
@Inject protected SpecificationLoader specificationLoader;
@Inject protected InteractionService interactionService;
@Inject protected FactoryService factoryService;
diff --git a/security/keycloak/src/main/java/org/apache/causeway/security/keycloak/CausewayModuleSecurityKeycloak.java b/security/keycloak/src/main/java/org/apache/causeway/security/keycloak/CausewayModuleSecurityKeycloak.java
index 206faef131..5f3c17f140 100644
--- a/security/keycloak/src/main/java/org/apache/causeway/security/keycloak/CausewayModuleSecurityKeycloak.java
+++ b/security/keycloak/src/main/java/org/apache/causeway/security/keycloak/CausewayModuleSecurityKeycloak.java
@@ -45,7 +45,7 @@ import org.springframework.security.web.authentication.logout.LogoutHandler;
import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
import org.springframework.util.Assert;
-import org.apache.causeway.core.config.IsisConfiguration;
+import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.runtimeservices.CausewayModuleCoreRuntimeServices;
import org.apache.causeway.core.security.authentication.login.LoginSuccessHandlerUNUSED;
import org.apache.causeway.core.webapp.CausewayModuleCoreWebapp;
@@ -79,7 +79,7 @@ public class CausewayModuleSecurityKeycloak {
@Bean
public WebSecurityConfigurerAdapter webSecurityConfigurer(
- final IsisConfiguration isisConfiguration,
+ final CausewayConfiguration isisConfiguration,
final KeycloakOauth2UserService keycloakOidcUserService,
final List<LoginSuccessHandlerUNUSED> loginSuccessHandlersUNUSED,
final List<LogoutHandler> logoutHandlers
@@ -91,7 +91,7 @@ public class CausewayModuleSecurityKeycloak {
@Bean
- KeycloakOauth2UserService keycloakOidcUserService(final OAuth2ClientProperties oauth2ClientProperties, final IsisConfiguration isisConfiguration) {
+ KeycloakOauth2UserService keycloakOidcUserService(final OAuth2ClientProperties oauth2ClientProperties, final CausewayConfiguration isisConfiguration) {
val jwtDecoder = createNimbusJwtDecoder(
oauth2ClientProperties.getProvider().get("keycloak").getJwkSetUri(),
@@ -108,7 +108,7 @@ public class CausewayModuleSecurityKeycloak {
private final KeycloakOauth2UserService keycloakOidcUserService;
private final List<LogoutHandler> logoutHandlers;
- private final IsisConfiguration isisConfiguration;
+ private final CausewayConfiguration isisConfiguration;
@Override
public void configure(final HttpSecurity http) throws Exception {
diff --git a/security/keycloak/src/main/java/org/apache/causeway/security/keycloak/services/KeycloakOauth2UserService.java b/security/keycloak/src/main/java/org/apache/causeway/security/keycloak/services/KeycloakOauth2UserService.java
index f63a24f817..950acf6c5e 100644
--- a/security/keycloak/src/main/java/org/apache/causeway/security/keycloak/services/KeycloakOauth2UserService.java
+++ b/security/keycloak/src/main/java/org/apache/causeway/security/keycloak/services/KeycloakOauth2UserService.java
@@ -44,7 +44,7 @@ import org.springframework.security.oauth2.jwt.JwtDecoder;
import org.springframework.security.oauth2.jwt.JwtException;
import org.springframework.util.CollectionUtils;
-import org.apache.causeway.core.config.IsisConfiguration;
+import org.apache.causeway.core.config.CausewayConfiguration;
import lombok.RequiredArgsConstructor;
import lombok.val;
@@ -56,7 +56,7 @@ public class KeycloakOauth2UserService extends OidcUserService {
final JwtDecoder jwtDecoder;
final GrantedAuthoritiesMapper authoritiesMapper;
- final IsisConfiguration isisConfiguration;
+ final CausewayConfiguration isisConfiguration;
/**
* Augments {@link OidcUserService#loadUser(OidcUserRequest)} to add authorities
diff --git a/security/shiro/src/main/java/org/apache/causeway/security/shiro/authentication/AuthenticatorShiro.java b/security/shiro/src/main/java/org/apache/causeway/security/shiro/authentication/AuthenticatorShiro.java
index f68b92b044..f83a8dcdfc 100644
--- a/security/shiro/src/main/java/org/apache/causeway/security/shiro/authentication/AuthenticatorShiro.java
+++ b/security/shiro/src/main/java/org/apache/causeway/security/shiro/authentication/AuthenticatorShiro.java
@@ -49,7 +49,7 @@ import org.springframework.stereotype.Service;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
import org.apache.causeway.applib.services.user.UserMemento;
-import org.apache.causeway.core.config.IsisConfiguration;
+import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.security.authentication.AuthenticationRequest;
import org.apache.causeway.core.security.authentication.AuthenticationRequestPassword;
import org.apache.causeway.core.security.authentication.Authenticator;
@@ -77,12 +77,12 @@ import lombok.extern.log4j.Log4j2;
@Log4j2
public class AuthenticatorShiro implements Authenticator {
- private final IsisConfiguration configuration;
+ private final CausewayConfiguration configuration;
private final boolean autoLogout;
@Inject
public AuthenticatorShiro(
- final IsisConfiguration configuration) {
+ final CausewayConfiguration configuration) {
super();
this.configuration = configuration;
this.autoLogout = this.configuration.getSecurity().getShiro().isAutoLogoutIfAlreadyAuthenticated();
diff --git a/security/shiro/src/test/java/org/apache/causeway/security/shiro/ShiroAuthenticatorOrAuthorizorTest_authenticate.java b/security/shiro/src/test/java/org/apache/causeway/security/shiro/ShiroAuthenticatorOrAuthorizorTest_authenticate.java
index 83c2b22377..0ad28d9c82 100644
--- a/security/shiro/src/test/java/org/apache/causeway/security/shiro/ShiroAuthenticatorOrAuthorizorTest_authenticate.java
+++ b/security/shiro/src/test/java/org/apache/causeway/security/shiro/ShiroAuthenticatorOrAuthorizorTest_authenticate.java
@@ -34,7 +34,7 @@ import static org.hamcrest.CoreMatchers.nullValue;
import static org.hamcrest.MatcherAssert.assertThat;
import org.apache.causeway.applib.Identifier;
-import org.apache.causeway.core.config.IsisConfiguration;
+import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.security.authentication.AuthenticationRequest;
import org.apache.causeway.core.security.authentication.AuthenticationRequestPassword;
import org.apache.causeway.security.shiro.authentication.AuthenticatorShiro;
@@ -52,7 +52,7 @@ class ShiroAuthenticatorOrAuthorizorTest_authenticate {
// PRODUCTION
- val configuration = new IsisConfiguration(null);
+ val configuration = new CausewayConfiguration(null);
configuration.getSecurity().getShiro().setAutoLogoutIfAlreadyAuthenticated(false);
authenticator = new AuthenticatorShiro(configuration);
diff --git a/security/shiro/src/test/java/org/apache/causeway/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java b/security/shiro/src/test/java/org/apache/causeway/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java
index efb6d56a27..52bd0dc76d 100644
--- a/security/shiro/src/test/java/org/apache/causeway/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java
+++ b/security/shiro/src/test/java/org/apache/causeway/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java
@@ -32,7 +32,7 @@ import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import org.apache.causeway.applib.Identifier;
-import org.apache.causeway.core.config.IsisConfiguration;
+import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.security.authentication.AuthenticationRequest;
import org.apache.causeway.core.security.authentication.AuthenticationRequestPassword;
import org.apache.causeway.security.shiro.authentication.AuthenticatorShiro;
@@ -50,7 +50,7 @@ class ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole {
// PRODUCTION
- val configuration = new IsisConfiguration(null);
+ val configuration = new CausewayConfiguration(null);
configuration.getSecurity().getShiro().setAutoLogoutIfAlreadyAuthenticated(false);
authenticator = new AuthenticatorShiro(configuration);
diff --git a/security/spring/src/main/java/org/apache/causeway/security/spring/CausewayModuleSecuritySpring.java b/security/spring/src/main/java/org/apache/causeway/security/spring/CausewayModuleSecuritySpring.java
index bd2c2cc024..edb9dcbae0 100644
--- a/security/spring/src/main/java/org/apache/causeway/security/spring/CausewayModuleSecuritySpring.java
+++ b/security/spring/src/main/java/org/apache/causeway/security/spring/CausewayModuleSecuritySpring.java
@@ -31,7 +31,7 @@ import org.springframework.security.web.FilterChainProxy;
import org.springframework.security.web.SecurityFilterChain;
import org.springframework.security.web.csrf.CsrfFilter;
-import org.apache.causeway.core.config.IsisConfiguration;
+import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.runtimeservices.CausewayModuleCoreRuntimeServices;
import org.apache.causeway.security.spring.authconverters.AuthenticationConverterOfAuthenticatedPrincipal;
import org.apache.causeway.security.spring.authconverters.AuthenticationConverterOfStringPrincipal;
@@ -66,7 +66,7 @@ public class CausewayModuleSecuritySpring {
@Qualifier("springSecurityFilterChain")
@Inject private Filter springSecurityFilterChain;
- @Inject private IsisConfiguration isisConfiguration;
+ @Inject private CausewayConfiguration isisConfiguration;
@PostConstruct
public void disableCsrf() {
diff --git a/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/fixturescripts/FixtureScriptsSpecificationProvider.java b/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/fixturescripts/FixtureScriptsSpecificationProvider.java
index 44fba604f8..7c1437f72c 100644
--- a/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/fixturescripts/FixtureScriptsSpecificationProvider.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/fixturescripts/FixtureScriptsSpecificationProvider.java
@@ -22,7 +22,7 @@ import org.apache.causeway.applib.annotation.Programmatic;
/**
* SPI to provide an implementation of
- * {@link org.apache.causeway.core.config.IsisConfiguration.Testing.Fixtures.FixtureScriptsSpecification}.
+ * {@link org.apache.causeway.core.config.CausewayConfiguration.Testing.Fixtures.FixtureScriptsSpecification}.
*
* <p>
* Generally it is easy to just use the <code>isis.testing.fixture.fixture-scripts-specification</code>
diff --git a/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/fixturescripts/FixtureScriptsSpecificationProviderAutoConfiguration.java b/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/fixturescripts/FixtureScriptsSpecificationProviderAutoConfiguration.java
index 36fe22438b..c6bc0290f0 100644
--- a/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/fixturescripts/FixtureScriptsSpecificationProviderAutoConfiguration.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/fixturescripts/FixtureScriptsSpecificationProviderAutoConfiguration.java
@@ -25,7 +25,7 @@ import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
-import org.apache.causeway.core.config.IsisConfiguration;
+import org.apache.causeway.core.config.CausewayConfiguration;
import lombok.val;
@@ -47,7 +47,7 @@ public class FixtureScriptsSpecificationProviderAutoConfiguration {
@Bean("isis.testing.fixtures.FixtureScriptsSpecificationProviderDefault")
@ConditionalOnMissingBean(FixtureScriptsSpecificationProvider.class)
@Qualifier("Default")
- FixtureScriptsSpecificationProvider fixtureScriptsSpecificationProvider(final IsisConfiguration isisConfiguration) {
+ FixtureScriptsSpecificationProvider fixtureScriptsSpecificationProvider(final CausewayConfiguration isisConfiguration) {
val fixturesConfig = isisConfiguration.getTesting().getFixtures().getFixtureScriptsSpecification();
val builder = builderFrom(fixturesConfig);
@@ -60,7 +60,7 @@ public class FixtureScriptsSpecificationProviderAutoConfiguration {
return builder::build;
}
- private static FixtureScriptsSpecification.Builder builderFrom(IsisConfiguration.Testing.Fixtures.FixtureScriptsSpecification fixturesConfig) {
+ private static FixtureScriptsSpecification.Builder builderFrom(CausewayConfiguration.Testing.Fixtures.FixtureScriptsSpecification fixturesConfig) {
val contextClass = fixturesConfig.getContextClass();
if(contextClass != null) {
return FixtureScriptsSpecification.builder(contextClass);
diff --git a/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/services/InitialFixtureScriptsInstaller.java b/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/services/InitialFixtureScriptsInstaller.java
index 70b9c86fb3..9f49606c74 100644
--- a/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/services/InitialFixtureScriptsInstaller.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/services/InitialFixtureScriptsInstaller.java
@@ -31,7 +31,7 @@ import org.springframework.stereotype.Service;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.applib.events.metamodel.MetamodelEvent;
-import org.apache.causeway.core.config.IsisConfiguration;
+import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScript;
import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScripts;
@@ -53,7 +53,7 @@ public class InitialFixtureScriptsInstaller {
@Inject
public InitialFixtureScriptsInstaller(
- final IsisConfiguration isisConfiguration,
+ final CausewayConfiguration isisConfiguration,
final FixtureScripts fixtureScripts) {
this.fixtureScripts = fixtureScripts;
diff --git a/testing/h2console/ui/src/main/java/org/apache/causeway/testing/h2console/ui/webmodule/WebModuleH2Console.java b/testing/h2console/ui/src/main/java/org/apache/causeway/testing/h2console/ui/webmodule/WebModuleH2Console.java
index 14ccfc748f..cd73819dae 100644
--- a/testing/h2console/ui/src/main/java/org/apache/causeway/testing/h2console/ui/webmodule/WebModuleH2Console.java
+++ b/testing/h2console/ui/src/main/java/org/apache/causeway/testing/h2console/ui/webmodule/WebModuleH2Console.java
@@ -35,10 +35,10 @@ import org.springframework.stereotype.Service;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.applib.services.inject.ServiceInjector;
import org.apache.causeway.applib.value.LocalResourcePath;
-import org.apache.causeway.core.config.IsisConfiguration;
+import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.config.datasources.DataSourceIntrospectionService;
import org.apache.causeway.core.config.datasources.DataSourceIntrospectionService.DataSourceInfo;
-import org.apache.causeway.core.config.environment.IsisSystemEnvironment;
+import org.apache.causeway.core.config.environment.CausewaySystemEnvironment;
import org.apache.causeway.core.security.authentication.standard.RandomCodeGenerator;
import org.apache.causeway.core.webapp.modules.WebModuleAbstract;
import org.apache.causeway.core.webapp.modules.WebModuleContext;
@@ -63,14 +63,14 @@ public class WebModuleH2Console extends WebModuleAbstract {
@Getter
private final LocalResourcePath localResourcePathIfEnabled;
- private final IsisSystemEnvironment isisSystemEnvironment;
+ private final CausewaySystemEnvironment isisSystemEnvironment;
private final boolean applicable;
@Inject
public WebModuleH2Console(
final DataSourceIntrospectionService datasourceIntrospector,
- final IsisSystemEnvironment isisSystemEnvironment,
+ final CausewaySystemEnvironment isisSystemEnvironment,
final ServiceInjector serviceInjector) {
super(serviceInjector);
@@ -115,7 +115,7 @@ public class WebModuleH2Console extends WebModuleAbstract {
private static String jdbcUrl;
- @Inject private IsisConfiguration isisConfiguration;
+ @Inject private CausewayConfiguration isisConfiguration;
@Inject private RandomCodeGenerator randomCodeGenerator;
@Override
diff --git a/testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/validate/DomainModelValidator.java b/testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/validate/DomainModelValidator.java
index 861a77e232..923f760ed2 100644
--- a/testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/validate/DomainModelValidator.java
+++ b/testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/validate/DomainModelValidator.java
@@ -36,8 +36,8 @@ import org.springframework.lang.Nullable;
import org.apache.causeway.applib.Identifier;
import org.apache.causeway.applib.exceptions.unrecoverable.DomainModelException;
import org.apache.causeway.applib.services.registry.ServiceRegistry;
-import org.apache.causeway.core.config.IsisConfiguration;
-import org.apache.causeway.core.config.environment.IsisSystemEnvironment;
+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.metamodel.specloader.SpecificationLoader;
import org.apache.causeway.core.metamodel.specloader.validator.ValidationFailure;
@@ -58,14 +58,14 @@ public class DomainModelValidator {
@Inject
public DomainModelValidator(final ServiceRegistry registry) {
this( registry.lookupServiceElseFail(SpecificationLoader.class),
- registry.lookupServiceElseFail(IsisConfiguration.class),
- registry.lookupServiceElseFail(IsisSystemEnvironment.class));
+ registry.lookupServiceElseFail(CausewayConfiguration.class),
+ registry.lookupServiceElseFail(CausewaySystemEnvironment.class));
}
public DomainModelValidator(
final SpecificationLoader specificationLoader,
- final IsisConfiguration configuration,
- final IsisSystemEnvironment isisSystemEnvironment) {
+ final CausewayConfiguration configuration,
+ final CausewaySystemEnvironment isisSystemEnvironment) {
val recreateRequired = isRecreateRequired(configuration, isisSystemEnvironment);
if(recreateRequired) {
@@ -81,7 +81,7 @@ public class DomainModelValidator {
}
- private static boolean isRecreateRequired(final IsisConfiguration configuration, final IsisSystemEnvironment isisSystemEnvironment) {
+ private static boolean isRecreateRequired(final CausewayConfiguration configuration, final CausewaySystemEnvironment isisSystemEnvironment) {
final IntrospectionMode mode = configuration.getCore().getMetaModel().getIntrospector().getMode();
switch (mode) {
case FULL:
diff --git a/viewers/commons/services/src/main/java/org/apache/causeway/viewer/commons/services/branding/BrandingUiServiceDefault.java b/viewers/commons/services/src/main/java/org/apache/causeway/viewer/commons/services/branding/BrandingUiServiceDefault.java
index b6682ad13a..422bec3e67 100644
--- a/viewers/commons/services/src/main/java/org/apache/causeway/viewer/commons/services/branding/BrandingUiServiceDefault.java
+++ b/viewers/commons/services/src/main/java/org/apache/causeway/viewer/commons/services/branding/BrandingUiServiceDefault.java
@@ -26,8 +26,8 @@ import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
-import org.apache.causeway.core.config.IsisConfiguration;
-import org.apache.causeway.core.config.IsisConfiguration.Viewer.Wicket.Application;
+import org.apache.causeway.core.config.CausewayConfiguration;
+import org.apache.causeway.core.config.CausewayConfiguration.Viewer.Wicket.Application;
import org.apache.causeway.viewer.commons.applib.services.branding.BrandingUiModel;
import org.apache.causeway.viewer.commons.applib.services.branding.BrandingUiService;
import org.apache.causeway.viewer.commons.services.CausewayModuleViewerCommonsServices;
@@ -42,7 +42,7 @@ implements BrandingUiService {
private final Application appConfig;
@Inject
- public BrandingUiServiceDefault(final IsisConfiguration isisConfiguration) {
+ public BrandingUiServiceDefault(final CausewayConfiguration isisConfiguration) {
//TODO application name/logo borrowed from Wicket's configuration,
// we might generalize this config option to all viewers
this.appConfig = isisConfiguration.getViewer().getWicket().getApplication();
diff --git a/viewers/restfulobjects/jaxrs-resteasy-4/src/main/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy4/webmodule/WebModuleJaxrsResteasy4.java b/viewers/restfulobjects/jaxrs-resteasy-4/src/main/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy4/webmodule/WebModuleJaxrsResteasy4.java
index 83613d8c0b..fccdf752e2 100644
--- a/viewers/restfulobjects/jaxrs-resteasy-4/src/main/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy4/webmodule/WebModuleJaxrsResteasy4.java
+++ b/viewers/restfulobjects/jaxrs-resteasy-4/src/main/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy4/webmodule/WebModuleJaxrsResteasy4.java
@@ -32,7 +32,7 @@ import org.springframework.stereotype.Service;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.applib.services.inject.ServiceInjector;
-import org.apache.causeway.core.config.IsisConfiguration;
+import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.config.RestEasyConfiguration;
import org.apache.causeway.viewer.restfulobjects.applib.CausewayModuleViewerRestfulObjectsApplib;
import org.apache.causeway.viewer.restfulobjects.viewer.webmodule.IsisRestfulObjectsInteractionFilter;
@@ -64,7 +64,7 @@ public final class WebModuleJaxrsResteasy4 extends WebModuleAbstract {
private static final String INTERACTION_FILTER_NAME = "IsisRestfulObjectsInteractionFilter";
- private final IsisConfiguration isisConfiguration;
+ private final CausewayConfiguration isisConfiguration;
private final RestEasyConfiguration restEasyConfiguration;
private final String restfulPath;
@@ -72,7 +72,7 @@ public final class WebModuleJaxrsResteasy4 extends WebModuleAbstract {
@Inject
public WebModuleJaxrsResteasy4(
- final IsisConfiguration isisConfiguration,
+ final CausewayConfiguration isisConfiguration,
final RestEasyConfiguration restEasyConfiguration,
final ServiceInjector serviceInjector) {
super(serviceInjector);
diff --git a/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/IResourceContext.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/IResourceContext.java
index b4ec3c6c23..d83e693f77 100644
--- a/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/IResourceContext.java
+++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/IResourceContext.java
@@ -26,7 +26,7 @@ import javax.ws.rs.core.MediaType;
import org.apache.causeway.applib.annotation.Where;
import org.apache.causeway.applib.services.bookmark.Bookmark;
-import org.apache.causeway.core.config.IsisConfiguration.Viewer.Restfulobjects;
+import org.apache.causeway.core.config.CausewayConfiguration.Viewer.Restfulobjects;
import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.causeway.core.metamodel.context.HasMetaModelContext;
import org.apache.causeway.core.metamodel.object.ManagedObject;
diff --git a/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceForRestfulObjectsV1_0.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceForRestfulObjectsV1_0.java
index 3c53b5d313..de54bcc1f1 100644
--- a/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceForRestfulObjectsV1_0.java
+++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceForRestfulObjectsV1_0.java
@@ -36,7 +36,7 @@ import org.springframework.stereotype.Service;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.applib.domain.DomainObjectList;
-import org.apache.causeway.core.config.IsisConfiguration;
+import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.metamodel.interactions.managed.ManagedAction;
import org.apache.causeway.core.metamodel.interactions.managed.ManagedCollection;
import org.apache.causeway.core.metamodel.interactions.managed.ManagedProperty;
@@ -77,14 +77,14 @@ public class ContentNegotiationServiceForRestfulObjectsV1_0
implements ContentNegotiationService {
- protected final IsisConfiguration configuration;
+ protected final CausewayConfiguration configuration;
protected final SpecificationLoader specificationLoader;
private final AcceptChecking acceptChecking;
@Inject
public ContentNegotiationServiceForRestfulObjectsV1_0(
- final IsisConfiguration configuration,
+ final CausewayConfiguration configuration,
final SpecificationLoader specificationLoader) {
this.configuration = configuration;
this.specificationLoader = specificationLoader;
@@ -373,7 +373,7 @@ implements ContentNegotiationService {
* Any unrecognized Accept headers will result in an HTTP Not Acceptable Response code (406).
*/
STRICT;
- static AcceptChecking fromConfig(final IsisConfiguration configuration) {
+ static AcceptChecking fromConfig(final CausewayConfiguration configuration) {
return configuration.getViewer().getRestfulobjects().isStrictAcceptChecking()
? AcceptChecking.STRICT
: AcceptChecking.RELAXED;
diff --git a/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/util/JsonWriterUtil.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/util/JsonWriterUtil.java
index da76c04860..8fdbacbfbf 100644
--- a/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/util/JsonWriterUtil.java
+++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/util/JsonWriterUtil.java
@@ -22,7 +22,7 @@ import java.io.IOException;
import org.springframework.lang.Nullable;
-import org.apache.causeway.core.config.environment.IsisSystemEnvironment;
+import org.apache.causeway.core.config.environment.CausewaySystemEnvironment;
import org.apache.causeway.viewer.restfulobjects.applib.util.JsonMapper;
import lombok.val;
@@ -39,7 +39,7 @@ public final class JsonWriterUtil {
}
}
- public static String jsonFor(Object object, @Nullable IsisSystemEnvironment systemEnvironment) {
+ public static String jsonFor(Object object, @Nullable CausewaySystemEnvironment systemEnvironment) {
val prettyPrinting = (systemEnvironment!=null && systemEnvironment.isPrototyping())
? JsonMapper.PrettyPrinting.ENABLE
: JsonMapper.PrettyPrinting.DISABLE;
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/DomainObjectResourceServerside.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/DomainObjectResourceServerside.java
index abbc44da0f..bb17c53969 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/DomainObjectResourceServerside.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/DomainObjectResourceServerside.java
@@ -46,7 +46,7 @@ import org.apache.causeway.applib.layout.component.PropertyLayoutData;
import org.apache.causeway.applib.layout.grid.Grid;
import org.apache.causeway.applib.layout.links.Link;
import org.apache.causeway.applib.services.iactnlayer.InteractionLayerTracker;
-import org.apache.causeway.core.config.IsisConfiguration;
+import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.metamodel.consent.Consent;
import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
@@ -84,7 +84,7 @@ implements DomainObjectResource {
@Inject
public DomainObjectResourceServerside(
final MetaModelContext metaModelContext,
- final IsisConfiguration isisConfiguration,
+ final CausewayConfiguration isisConfiguration,
final InteractionLayerTracker iInteractionLayerTracker) {
super(metaModelContext, isisConfiguration, iInteractionLayerTracker);
log.debug("<init>");
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/DomainServiceResourceServerside.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/DomainServiceResourceServerside.java
index f989adc03c..1201558459 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/DomainServiceResourceServerside.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/DomainServiceResourceServerside.java
@@ -40,7 +40,7 @@ import org.springframework.stereotype.Component;
import org.apache.causeway.applib.annotation.Where;
import org.apache.causeway.applib.services.iactnlayer.InteractionLayerTracker;
-import org.apache.causeway.core.config.IsisConfiguration;
+import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.core.metamodel.facets.object.domainservice.DomainServiceFacet;
import org.apache.causeway.core.metamodel.object.ManagedObject;
@@ -73,7 +73,7 @@ implements DomainServiceResource {
@Inject
public DomainServiceResourceServerside(
final MetaModelContext metaModelContext,
- final IsisConfiguration isisConfiguration,
+ final CausewayConfiguration isisConfiguration,
final InteractionLayerTracker iInteractionLayerTracker) {
super(metaModelContext, isisConfiguration, iInteractionLayerTracker);
log.debug("<init>");
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/DomainTypeResourceServerside.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/DomainTypeResourceServerside.java
index b75dacf78f..ef0d3d638b 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/DomainTypeResourceServerside.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/DomainTypeResourceServerside.java
@@ -34,7 +34,7 @@ import org.springframework.stereotype.Component;
import org.apache.causeway.applib.annotation.Where;
import org.apache.causeway.applib.services.iactnlayer.InteractionLayerTracker;
-import org.apache.causeway.core.config.IsisConfiguration;
+import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.core.metamodel.spec.feature.ObjectActionParameter;
import org.apache.causeway.core.metamodel.spec.feature.OneToManyAssociation;
@@ -85,7 +85,7 @@ implements DomainTypeResource {
@Inject
public DomainTypeResourceServerside(
final MetaModelContext metaModelContext,
- final IsisConfiguration isisConfiguration,
+ final CausewayConfiguration isisConfiguration,
final InteractionLayerTracker iInteractionLayerTracker) {
super(metaModelContext, isisConfiguration, iInteractionLayerTracker);
log.debug("<init>");
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/HomePageResourceServerside.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/HomePageResourceServerside.java
index cc9fda6e59..9b4c34ce8a 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/HomePageResourceServerside.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/HomePageResourceServerside.java
@@ -29,7 +29,7 @@ import org.springframework.stereotype.Component;
import org.apache.causeway.applib.annotation.Where;
import org.apache.causeway.applib.services.iactnlayer.InteractionLayerTracker;
-import org.apache.causeway.core.config.IsisConfiguration;
+import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.viewer.restfulobjects.applib.JsonRepresentation;
import org.apache.causeway.viewer.restfulobjects.applib.RepresentationType;
@@ -54,7 +54,7 @@ implements HomePageResource {
@Inject
public HomePageResourceServerside(
final MetaModelContext metaModelContext,
- final IsisConfiguration isisConfiguration,
+ final CausewayConfiguration isisConfiguration,
final InteractionLayerTracker iInteractionLayerTracker) {
super(metaModelContext, isisConfiguration, iInteractionLayerTracker);
log.debug("<init>");
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/ImageResourceServerside.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/ImageResourceServerside.java
index 79193c0066..0d2e1864e6 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/ImageResourceServerside.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/ImageResourceServerside.java
@@ -32,7 +32,7 @@ import org.apache.causeway.commons.internal.resources._Resources;
import org.springframework.stereotype.Component;
import org.apache.causeway.applib.services.iactnlayer.InteractionLayerTracker;
-import org.apache.causeway.core.config.IsisConfiguration;
+import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import lombok.extern.log4j.Log4j2;
@@ -45,7 +45,7 @@ public class ImageResourceServerside extends ResourceAbstract {
@Inject
public ImageResourceServerside(
final MetaModelContext metaModelContext,
- final IsisConfiguration isisConfiguration,
+ final CausewayConfiguration isisConfiguration,
final InteractionLayerTracker iInteractionLayerTracker) {
super(metaModelContext, isisConfiguration, iInteractionLayerTracker);
log.debug("<init>");
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/MenuBarsResourceServerside.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/MenuBarsResourceServerside.java
index de452b24e4..9f570692f8 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/MenuBarsResourceServerside.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/MenuBarsResourceServerside.java
@@ -34,7 +34,7 @@ import org.apache.causeway.applib.layout.links.Link;
import org.apache.causeway.applib.layout.menubars.MenuBars;
import org.apache.causeway.applib.services.iactnlayer.InteractionLayerTracker;
import org.apache.causeway.applib.services.menu.MenuBarsService;
-import org.apache.causeway.core.config.IsisConfiguration;
+import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.viewer.restfulobjects.applib.Rel;
import org.apache.causeway.viewer.restfulobjects.applib.RepresentationType;
@@ -55,7 +55,7 @@ public class MenuBarsResourceServerside extends ResourceAbstract implements Menu
@Inject
public MenuBarsResourceServerside(
final MetaModelContext metaModelContext,
- final IsisConfiguration isisConfiguration,
+ final CausewayConfiguration isisConfiguration,
final InteractionLayerTracker iInteractionLayerTracker) {
super(metaModelContext, isisConfiguration, iInteractionLayerTracker);
}
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/ResourceAbstract.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/ResourceAbstract.java
index 10e5244fee..fb2cdf51c8 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/ResourceAbstract.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/ResourceAbstract.java
@@ -39,7 +39,7 @@ import org.apache.causeway.commons.internal.codec._UrlDecoderUtil;
import org.apache.causeway.applib.annotation.Where;
import org.apache.causeway.applib.services.bookmark.Bookmark;
import org.apache.causeway.applib.services.iactnlayer.InteractionLayerTracker;
-import org.apache.causeway.core.config.IsisConfiguration;
+import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.config.viewer.web.WebAppContextPath;
import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
@@ -59,7 +59,7 @@ import lombok.val;
public abstract class ResourceAbstract {
protected final MetaModelContext metaModelContext;
- protected final IsisConfiguration isisConfiguration;
+ protected final CausewayConfiguration isisConfiguration;
protected final InteractionLayerTracker iInteractionLayerTracker;
@Context HttpHeaders httpHeaders;
@@ -75,7 +75,7 @@ public abstract class ResourceAbstract {
@Inject
protected ResourceAbstract(
final MetaModelContext metaModelContext,
- final IsisConfiguration isisConfiguration,
+ final CausewayConfiguration isisConfiguration,
final InteractionLayerTracker iInteractionLayerTracker) {
this.metaModelContext = metaModelContext;
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/UserResourceServerside.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/UserResourceServerside.java
index 1fd6303ddc..03dc9044d5 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/UserResourceServerside.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/UserResourceServerside.java
@@ -30,7 +30,7 @@ import org.springframework.stereotype.Component;
import org.apache.causeway.applib.annotation.Where;
import org.apache.causeway.applib.services.iactnlayer.InteractionLayerTracker;
-import org.apache.causeway.core.config.IsisConfiguration;
+import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.viewer.restfulobjects.applib.JsonRepresentation;
import org.apache.causeway.viewer.restfulobjects.applib.RepresentationType;
@@ -52,7 +52,7 @@ public class UserResourceServerside extends ResourceAbstract implements UserReso
@Inject
public UserResourceServerside(
final MetaModelContext metaModelContext,
- final IsisConfiguration isisConfiguration,
+ final CausewayConfiguration isisConfiguration,
final InteractionLayerTracker iInteractionLayerTracker) {
super(metaModelContext, isisConfiguration, iInteractionLayerTracker);
}
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/VersionResourceServerside.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/VersionResourceServerside.java
index 213c0fd076..5ffc621e0c 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/VersionResourceServerside.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/VersionResourceServerside.java
@@ -32,7 +32,7 @@ import org.springframework.stereotype.Component;
import org.apache.causeway.applib.annotation.Where;
import org.apache.causeway.applib.services.iactnlayer.InteractionLayerTracker;
-import org.apache.causeway.core.config.IsisConfiguration;
+import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.viewer.restfulobjects.applib.JsonRepresentation;
import org.apache.causeway.viewer.restfulobjects.applib.RepresentationType;
@@ -64,7 +64,7 @@ implements VersionResource {
@Inject
public VersionResourceServerside(
final MetaModelContext metaModelContext,
- final IsisConfiguration isisConfiguration,
+ final CausewayConfiguration isisConfiguration,
final InteractionLayerTracker iInteractionLayerTracker) {
super(metaModelContext, isisConfiguration, iInteractionLayerTracker);
log.debug("<init>");
diff --git a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/AboutModel.java b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/AboutModel.java
index a8f7f54bcc..ea6e00d87c 100644
--- a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/AboutModel.java
+++ b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/AboutModel.java
@@ -18,7 +18,7 @@
*/
package org.apache.causeway.viewer.wicket.model.models;
-import org.apache.causeway.core.config.IsisConfiguration;
+import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
@@ -26,7 +26,7 @@ import org.apache.causeway.core.metamodel.context.MetaModelContext;
* Model providing welcome text.
*/
public final class AboutModel
-extends ModelAbstract<IsisConfiguration.Viewer.Wicket.Application> {
+extends ModelAbstract<CausewayConfiguration.Viewer.Wicket.Application> {
private static final long serialVersionUID = 1L;
@@ -35,7 +35,7 @@ extends ModelAbstract<IsisConfiguration.Viewer.Wicket.Application> {
}
@Override
- protected IsisConfiguration.Viewer.Wicket.Application load() {
+ protected CausewayConfiguration.Viewer.Wicket.Application load() {
return getWicketViewerSettings().getApplication();
}
diff --git a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/HasCommonContext.java b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/HasCommonContext.java
index ad9246d1c6..923d704cd4 100644
--- a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/HasCommonContext.java
+++ b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/HasCommonContext.java
@@ -19,7 +19,7 @@
package org.apache.causeway.viewer.wicket.model.models;
import org.apache.causeway.applib.services.i18n.TranslationContext;
-import org.apache.causeway.core.config.IsisConfiguration.Viewer.Wicket;
+import org.apache.causeway.core.config.CausewayConfiguration.Viewer.Wicket;
import org.apache.causeway.core.metamodel.context.HasMetaModelContext;
public interface HasCommonContext extends HasMetaModelContext {
diff --git a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/WelcomeModel.java b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/WelcomeModel.java
index f1dbdc4f75..8ebbc4fe51 100644
--- a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/WelcomeModel.java
+++ b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/WelcomeModel.java
@@ -18,7 +18,7 @@
*/
package org.apache.causeway.viewer.wicket.model.models;
-import org.apache.causeway.core.config.IsisConfiguration;
+import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
@@ -26,7 +26,7 @@ import org.apache.causeway.core.metamodel.context.MetaModelContext;
* Model providing welcome text.
*/
public class WelcomeModel
-extends ModelAbstract<IsisConfiguration.Viewer.Wicket.Welcome> {
+extends ModelAbstract<CausewayConfiguration.Viewer.Wicket.Welcome> {
private static final long serialVersionUID = 1L;
@@ -35,7 +35,7 @@ extends ModelAbstract<IsisConfiguration.Viewer.Wicket.Welcome> {
}
@Override
- protected IsisConfiguration.Viewer.Wicket.Welcome load() {
+ protected CausewayConfiguration.Viewer.Wicket.Welcome load() {
return getWicketViewerSettings().getWelcome();
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/LabelBase.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/LabelBase.java
index 91a51fe0de..19216fb0a1 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/LabelBase.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/LabelBase.java
@@ -21,7 +21,7 @@ package org.apache.causeway.viewer.wicket.ui.components;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.model.IModel;
-import org.apache.causeway.core.config.IsisConfiguration;
+import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.config.viewer.web.WebAppContextPath;
import org.apache.causeway.core.metamodel.context.HasMetaModelContext;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
@@ -45,7 +45,7 @@ implements HasMetaModelContext {
super(id, model);
}
- private transient IsisConfiguration isisConfiguration;
+ private transient CausewayConfiguration isisConfiguration;
private transient WebAppContextPath webAppContextPath;
private transient MetaModelContext commonContext;
@@ -54,8 +54,8 @@ implements HasMetaModelContext {
return commonContext = WktContext.computeIfAbsent(commonContext);
}
- public IsisConfiguration getIsisConfiguration() {
- return isisConfiguration = computeIfAbsent(IsisConfiguration.class, isisConfiguration);
+ public CausewayConfiguration getCausewayConfiguration() {
+ return isisConfiguration = computeIfAbsent(CausewayConfiguration.class, isisConfiguration);
}
public WebAppContextPath getWebAppContextPath() {
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/about/AboutPanel.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/about/AboutPanel.java
index 26c5cc967d..3549d1e148 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/about/AboutPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/about/AboutPanel.java
@@ -29,7 +29,7 @@ import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LambdaModel;
-import org.apache.causeway.core.config.IsisConfiguration;
+import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.viewer.wicket.model.models.AboutModel;
import org.apache.causeway.viewer.wicket.ui.pages.home.HomePage;
import org.apache.causeway.viewer.wicket.ui.panels.PanelAbstract;
@@ -39,7 +39,7 @@ import org.apache.causeway.viewer.wicket.ui.panels.PanelAbstract;
* {@link HomePage}).
*/
public class AboutPanel
-extends PanelAbstract<IsisConfiguration.Viewer.Wicket.Application, AboutModel> {
+extends PanelAbstract<CausewayConfiguration.Viewer.Wicket.Application, AboutModel> {
private static final long serialVersionUID = 1L;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/footer/FooterPanel.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/footer/FooterPanel.java
index c5cbcb5f34..a5796688f7 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/footer/FooterPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/footer/FooterPanel.java
@@ -33,7 +33,7 @@ import org.apache.wicket.model.Model;
import org.apache.wicket.model.ResourceModel;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.apache.causeway.core.config.IsisConfiguration.Viewer.Wicket.Credit;
+import org.apache.causeway.core.config.CausewayConfiguration.Viewer.Wicket.Credit;
import org.apache.causeway.viewer.wicket.model.util.PageParameterUtils;
import org.apache.causeway.viewer.wicket.ui.components.widgets.breadcrumbs.BreadcrumbPanel;
import org.apache.causeway.viewer.wicket.ui.components.widgets.themepicker.ThemeChooser;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/welcome/WelcomePanel.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/welcome/WelcomePanel.java
index 4cd46f4e4d..f36fe3b9c9 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/welcome/WelcomePanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/welcome/WelcomePanel.java
@@ -20,7 +20,7 @@ package org.apache.causeway.viewer.wicket.ui.components.welcome;
import org.apache.wicket.model.LambdaModel;
-import org.apache.causeway.core.config.IsisConfiguration;
+import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.viewer.wicket.model.models.WelcomeModel;
import org.apache.causeway.viewer.wicket.ui.pages.home.HomePage;
import org.apache.causeway.viewer.wicket.ui.panels.PanelAbstract;
@@ -31,7 +31,7 @@ import org.apache.causeway.viewer.wicket.ui.util.Wkt;
* {@link HomePage}).
*/
public class WelcomePanel
-extends PanelAbstract<IsisConfiguration.Viewer.Wicket.Welcome, WelcomeModel> {
+extends PanelAbstract<CausewayConfiguration.Viewer.Wicket.Welcome, WelcomeModel> {
private static final long serialVersionUID = 1L;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/linkandlabel/ActionLink.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/linkandlabel/ActionLink.java
index e69b12af06..e4a88337c0 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/linkandlabel/ActionLink.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/linkandlabel/ActionLink.java
@@ -30,7 +30,7 @@ import org.apache.wicket.request.cycle.RequestCycle;
import static org.apache.causeway.commons.internal.base._Casts.castTo;
-import org.apache.causeway.core.config.IsisConfiguration.Viewer.Wicket;
+import org.apache.causeway.core.config.CausewayConfiguration.Viewer.Wicket;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.core.metamodel.spec.feature.ObjectAction;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/themepicker/IsisWicketThemeSupportDefault.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/themepicker/IsisWicketThemeSupportDefault.java
index d8b1354caf..01ab8f57a2 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/themepicker/IsisWicketThemeSupportDefault.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/themepicker/IsisWicketThemeSupportDefault.java
@@ -34,7 +34,7 @@ import org.springframework.stereotype.Service;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.applib.services.registry.ServiceRegistry;
-import org.apache.causeway.core.config.IsisConfiguration;
+import org.apache.causeway.core.config.CausewayConfiguration;
import lombok.val;
import lombok.extern.log4j.Log4j2;
@@ -55,7 +55,7 @@ public class IsisWicketThemeSupportDefault implements IsisWicketThemeSupport {
private final _Lazy<ThemeProviderComposite> themeProvider = _Lazy.of(this::createThemeProvider);
- @Inject private IsisConfiguration configuration;
+ @Inject private CausewayConfiguration configuration;
@Inject private ServiceRegistry serviceRegistry;
@Override
@@ -106,7 +106,7 @@ public class IsisWicketThemeSupportDefault implements IsisWicketThemeSupport {
/**
* Filters which themes to show in the drop up by using the provided values
- * in {@link IsisConfiguration.Viewer.Wicket.Themes#getEnabled()}
+ * in {@link CausewayConfiguration.Viewer.Wicket.Themes#getEnabled()}
*
* @param allThemes All available themes
* @return A list of all enabled themes
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/errors/JGrowlUtil.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/errors/JGrowlUtil.java
index 3b4186f139..21e73abd55 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/errors/JGrowlUtil.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/errors/JGrowlUtil.java
@@ -21,7 +21,7 @@ package org.apache.causeway.viewer.wicket.ui.errors;
import org.apache.causeway.commons.internal.base._Text;
import org.apache.wicket.util.string.Strings;
-import org.apache.causeway.core.config.IsisConfiguration;
+import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.metamodel.services.message.MessageBroker;
import lombok.val;
@@ -32,17 +32,17 @@ public class JGrowlUtil {
static enum MessageSeverity {
INFO {
- @Override long delayMillis(final IsisConfiguration.Viewer.Wicket.MessagePopups messagePopups) {
+ @Override long delayMillis(final CausewayConfiguration.Viewer.Wicket.MessagePopups messagePopups) {
return messagePopups.getInfoDelay().toMillis();
}
},
WARNING {
- @Override long delayMillis(final IsisConfiguration.Viewer.Wicket.MessagePopups messagePopups) {
+ @Override long delayMillis(final CausewayConfiguration.Viewer.Wicket.MessagePopups messagePopups) {
return messagePopups.getWarningDelay().toMillis();
}
}, // sticky
DANGER{
- @Override long delayMillis(final IsisConfiguration.Viewer.Wicket.MessagePopups messagePopups) {
+ @Override long delayMillis(final CausewayConfiguration.Viewer.Wicket.MessagePopups messagePopups) {
return messagePopups.getErrorDelay().toMillis();
}
} // sticky
@@ -52,10 +52,10 @@ public class JGrowlUtil {
return name().toLowerCase();
}
- abstract long delayMillis(IsisConfiguration.Viewer.Wicket.MessagePopups messagePopups);
+ abstract long delayMillis(CausewayConfiguration.Viewer.Wicket.MessagePopups messagePopups);
}
- public String asJGrowlCalls(final MessageBroker messageBroker, final IsisConfiguration configuration) {
+ public String asJGrowlCalls(final MessageBroker messageBroker, final CausewayConfiguration configuration) {
val buf = new StringBuilder();
val messagePopupConfig = configuration.getViewer().getWicket().getMessagePopups();
@@ -79,7 +79,7 @@ public class JGrowlUtil {
private void addJGrowlCall(
final String origMsg,
final MessageSeverity severity,
- final IsisConfiguration.Viewer.Wicket.MessagePopups messagePopups,
+ final CausewayConfiguration.Viewer.Wicket.MessagePopups messagePopups,
final StringBuilder buf) {
final CharSequence escapedMsg = escape(origMsg);
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/common/datatables/DatatablesJavaScriptResourceReferenceInit.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/common/datatables/DatatablesJavaScriptResourceReferenceInit.java
index 7e581f9e8d..6f7df45e9c 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/common/datatables/DatatablesJavaScriptResourceReferenceInit.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/common/datatables/DatatablesJavaScriptResourceReferenceInit.java
@@ -29,7 +29,7 @@ import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.Resource;
import org.springframework.util.FileCopyUtils;
-import org.apache.causeway.core.config.IsisConfiguration;
+import org.apache.causeway.core.config.CausewayConfiguration;
/**
* Javascript (client-side) extensions and fixes.
@@ -43,7 +43,7 @@ public class DatatablesJavaScriptResourceReferenceInit extends JavaScriptContent
private static DatatablesJavaScriptResourceReferenceInit instance = null;
public static final DatatablesJavaScriptResourceReferenceInit instance(
- final IsisConfiguration configuration) {
+ final CausewayConfiguration configuration) {
if (instance == null) {
String javascript = readResource(configuration);
instance = new DatatablesJavaScriptResourceReferenceInit(javascript, ID);
@@ -55,7 +55,7 @@ public class DatatablesJavaScriptResourceReferenceInit extends JavaScriptContent
super(javaScript, id);
}
- private static String readResource(final IsisConfiguration configuration) {
+ private static String readResource(final CausewayConfiguration configuration) {
String options = configuration.getViewer().getWicket().getTable().getDecoration()
.getDataTablesNet().getOptions().orElse("");
return readScript().replace("$PLACEHOLDER$", options);
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/util/Wkt.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/util/Wkt.java
index ddc532754d..3c3614fd43 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/util/Wkt.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/util/Wkt.java
@@ -85,7 +85,7 @@ import org.danekja.java.util.function.serializable.SerializableConsumer;
import org.springframework.lang.Nullable;
import org.apache.causeway.applib.Identifier;
-import org.apache.causeway.core.config.IsisConfiguration.Viewer.Wicket;
+import org.apache.causeway.core.config.CausewayConfiguration.Viewer.Wicket;
import org.apache.causeway.core.metamodel.interactions.managed.nonscalar.DataTableModel;
import org.apache.causeway.viewer.wicket.model.hints.IsisActionCompletedEvent;
import org.apache.causeway.viewer.wicket.model.hints.IsisEnvelopeEvent;
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/services/TranslationsResolverWicket.java b/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/services/TranslationsResolverWicket.java
index 317bd1e8f4..ba08b8652f 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/services/TranslationsResolverWicket.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/services/TranslationsResolverWicket.java
@@ -39,7 +39,7 @@ import org.springframework.stereotype.Service;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.applib.services.i18n.TranslationsResolver;
-import org.apache.causeway.core.config.IsisConfiguration;
+import org.apache.causeway.core.config.CausewayConfiguration;
import lombok.RequiredArgsConstructor;
import lombok.val;
@@ -60,7 +60,7 @@ import lombok.extern.log4j.Log4j2;
public class TranslationsResolverWicket implements TranslationsResolver {
private final ServletContext servletContext;
- private final IsisConfiguration isisConfiguration;
+ private final CausewayConfiguration isisConfiguration;
@Override
public List<String> readLines(final String fileName) {
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/webmodule/WebModuleWicket.java b/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/webmodule/WebModuleWicket.java
index ea83ba2dcf..cf50aeb896 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/webmodule/WebModuleWicket.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/webmodule/WebModuleWicket.java
@@ -33,8 +33,8 @@ import org.springframework.stereotype.Service;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.applib.services.inject.ServiceInjector;
-import org.apache.causeway.core.config.environment.IsisSystemEnvironment;
-import org.apache.causeway.core.config.IsisConfiguration;
+import org.apache.causeway.core.config.environment.CausewaySystemEnvironment;
+import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.webapp.modules.WebModuleAbstract;
import org.apache.causeway.core.webapp.modules.WebModuleContext;
@@ -52,8 +52,8 @@ public final class WebModuleWicket extends WebModuleAbstract {
private static final String WICKET_FILTER_NAME = "WicketFilter";
- private final IsisSystemEnvironment isisSystemEnvironment;
- private final IsisConfiguration isisConfiguration;
+ private final CausewaySystemEnvironment isisSystemEnvironment;
+ private final CausewayConfiguration isisConfiguration;
private final String wicketBasePath;
private final String deploymentMode;
@@ -62,8 +62,8 @@ public final class WebModuleWicket extends WebModuleAbstract {
@Inject
public WebModuleWicket(
- final IsisSystemEnvironment isisSystemEnvironment,
- final IsisConfiguration isisConfiguration,
+ final CausewaySystemEnvironment isisSystemEnvironment,
+ final CausewayConfiguration isisConfiguration,
final ServiceInjector serviceInjector) {
super(serviceInjector);
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/IsisWicketApplication.java
index b213a2fbd1..0af90b19fb 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/IsisWicketApplication.java
@@ -52,8 +52,8 @@ import org.apache.wicket.request.resource.CssResourceReference;
import org.apache.wicket.settings.RequestCycleSettings;
import org.apache.wicket.spring.injection.annot.SpringComponentInjector;
-import org.apache.causeway.core.config.IsisConfiguration;
-import org.apache.causeway.core.config.environment.IsisSystemEnvironment;
+import org.apache.causeway.core.config.CausewayConfiguration;
+import org.apache.causeway.core.config.environment.CausewaySystemEnvironment;
import org.apache.causeway.core.metamodel.context.HasMetaModelContext;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.core.metamodel.object.ManagedObject;
@@ -115,8 +115,8 @@ implements
@Getter(onMethod = @__(@Override))
@Inject private MetaModelContext metaModelContext;
@Inject private List<WicketApplicationInitializer> applicationInitializers;
- @Inject private IsisSystemEnvironment systemEnvironment;
- @Inject private IsisConfiguration configuration;
+ @Inject private CausewaySystemEnvironment systemEnvironment;
+ @Inject private CausewayConfiguration configuration;
@Getter(onMethod = @__(@Override))
@Inject private ComponentFactoryRegistry componentFactoryRegistry;
@@ -244,7 +244,7 @@ implements
/**
* protected visibility to allow ad-hoc overriding of some other authentication strategy.
*/
- protected void configureSecurity(final IsisConfiguration configuration) {
+ protected void configureSecurity(final CausewayConfiguration configuration) {
// since Wicket 9, CSP is enabled by default [https://developer.mozilla.org/en-US/docs/Web/HTTP/CSP]
getCspSettings().blocking().disabled();
getSecuritySettings().setAuthenticationStrategy(newAuthenticationStrategy(configuration));
@@ -257,7 +257,7 @@ implements
/**
* protected visibility to allow ad-hoc overriding of some other authentication strategy.
*/
- protected IAuthenticationStrategy newAuthenticationStrategy(final IsisConfiguration configuration) {
+ protected IAuthenticationStrategy newAuthenticationStrategy(final CausewayConfiguration configuration) {
val rememberMe = configuration.getViewer().getWicket().getRememberMe();
val cookieKey = rememberMe.getCookieKey();
val encryptionKey = rememberMe.getEncryptionKey().orElse(defaultEncryptionKey());
@@ -265,7 +265,7 @@ implements
}
/**
- * As called by {@link #newAuthenticationStrategy(IsisConfiguration)}.
+ * As called by {@link #newAuthenticationStrategy(CausewayConfiguration)}.
* If an encryption key for the 'rememberMe' cookie hasn't been configured,
* then use a different encryption key for the 'rememberMe'
* cookie each time the app is restarted.
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/wicketapp/config/DebugInitWkt.java b/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/wicketapp/config/DebugInitWkt.java
index f3987ab45f..e5749090ab 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/wicketapp/config/DebugInitWkt.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/wicketapp/config/DebugInitWkt.java
@@ -24,15 +24,15 @@ import org.apache.wicket.devutils.debugbar.DebugBarInitializer;
import org.apache.wicket.protocol.http.WebApplication;
import org.springframework.context.annotation.Configuration;
-import org.apache.causeway.core.config.IsisConfiguration;
-import org.apache.causeway.core.config.environment.IsisSystemEnvironment;
+import org.apache.causeway.core.config.CausewayConfiguration;
+import org.apache.causeway.core.config.environment.CausewaySystemEnvironment;
import org.apache.causeway.viewer.wicket.model.isis.WicketApplicationInitializer;
@Configuration
public class DebugInitWkt implements WicketApplicationInitializer {
- @Inject private IsisSystemEnvironment systemEnvironment;
- @Inject private IsisConfiguration configuration;
+ @Inject private CausewaySystemEnvironment systemEnvironment;
+ @Inject private CausewayConfiguration configuration;
@Override
public void init(final WebApplication webApplication) {
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/wicketapp/config/JQueryInitWkt.java b/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/wicketapp/config/JQueryInitWkt.java
index 20139a666e..60f51ebd91 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/wicketapp/config/JQueryInitWkt.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/wicketapp/config/JQueryInitWkt.java
@@ -23,7 +23,7 @@ import javax.inject.Inject;
import org.apache.wicket.protocol.http.WebApplication;
import org.springframework.context.annotation.Configuration;
-import org.apache.causeway.core.config.IsisConfiguration;
+import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.viewer.wicket.model.isis.WicketApplicationInitializer;
import lombok.val;
@@ -33,7 +33,7 @@ import de.agilecoders.wicket.webjars.request.resource.WebjarsJavaScriptResourceR
@Configuration
public class JQueryInitWkt implements WicketApplicationInitializer {
- @Inject IsisConfiguration configuration;
+ @Inject CausewayConfiguration configuration;
/**
* Upgrading jquery 3.6.0 -> 3.6.1 because of: