You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2019/12/04 17:31:55 UTC
[isis] branch master updated (76a12b9 -> 3be903a)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git.
from 76a12b9 ISIS-2148: builds core in parallel
new 23b72a9 ISIS-2213: moves all classes in isis-config under o.a.i.config
new 984f06f ISIS-2213: more reorg of isis-config
new 5ee0d14 ISIS-2213: slims down ConfigurationConstants
new 0b2f6ed ISIS-2213: removes unused constant fields
new 78ca710 ISIS-2213: more tidying up of isis-config
new 3be903a ISIS-2213: removes stale import and comments
The 6 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
build-core.sh | 1 +
.../ConfigPropsForPropertyOrParameterLayout.java | 12 -----
.../apache/isis/config/ConfigurationConstants.java | 47 ++---------------
.../org/apache/isis/config/IsisConfigModule.java | 3 +-
.../org/apache/isis/config/IsisConfiguration.java | 30 +++++++----
.../org/apache/isis/config/SystemConstants.java | 60 ----------------------
.../org/apache/isis/config/WebAppConstants.java | 47 -----------------
.../IsisBeanFactoryPostProcessorForSpring.java | 2 -
.../types => beans}/IsisBeanTypeRegistry.java | 3 +-
.../config/beans/IsisBeanTypeRegistryHolder.java | 2 -
.../config/beans/IsisComponentScanInterceptor.java | 2 -
.../{registry/types => beans}/TypeMetaData.java | 4 +-
.../{registry => }/messages/MessageRegistry.java | 13 +++--
.../facets}/AuditObjectsConfiguration.java | 2 +-
.../facets}/CommandActionsConfiguration.java | 2 +-
.../facets}/CommandPropertiesConfiguration.java | 2 +-
.../facets}/DefaultViewConfiguration.java | 2 +-
.../facets}/EditingObjectsConfiguration.java | 2 +-
.../facets}/PublishActionsConfiguration.java | 2 +-
.../facets}/PublishObjectsConfiguration.java | 2 +-
.../facets}/PublishPropertiesConfiguration.java | 2 +-
.../metamodel/facets}/Util.java | 2 +-
.../ApplicationFeaturesInitConfiguration.java | 2 +-
.../metamodel/specloader/IntrospectionMode.java | 2 +-
.../presets/DataNucleusAutoCreate.properties | 0
.../isis/config}/presets/DebugDiscovery.properties | 0
.../isis/config}/presets/DebugMetaModel.properties | 0
.../config}/presets/DebugPersistence.properties | 0
.../presets/DebugProgrammingModel.properties | 0
.../isis/config}/presets/H2InMemory.properties | 0
.../presets/H2InMemory_withUniqueSchema.properties | 0
.../isis/config}/presets/HsqlDbInMemory.properties | 0
.../isis/config}/presets/IsisIntegTest.properties | 0
.../isis/config/{ => presets}/IsisPresets.java | 28 +++++-----
.../isis/config}/presets/NoTranslations.properties | 0
.../config}/presets/SilenceMetaModel.properties | 0
.../presets/SilenceProgrammingModel.properties | 0
.../isis/config}/presets/SilenceWicket.properties | 0
.../ConfigUtil.java} | 38 ++++----------
.../ui => config/viewer/wicket}/DialogMode.java | 2 +-
.../viewer/wicket}/WebAppConfiguration.java | 2 +-
.../ConfigUtil_isProtected_Test.java} | 33 ++++++------
.../ConfigUtil_mask_Test.java} | 13 ++---
.../command/CommandFacetForActionAnnotation.java | 1 +
.../PublishedActionFacetForActionAnnotation.java | 1 +
.../facets/fallback/FallbackFacetFactory.java | 6 +--
.../AuditableFacetForDomainObjectAnnotation.java | 1 +
.../ImmutableFacetForDomainObjectAnnotation.java | 1 +
...lishedObjectFacetForDomainObjectAnnotation.java | 1 +
.../command/CommandFacetForPropertyAnnotation.java | 1 +
...ublishedPropertyFacetForPropertyAnnotation.java | 1 +
.../identify/ObjectIdentifier_builtinHandlers.java | 4 +-
.../ApplicationFeatureRepositoryDefault.java | 1 +
.../title/TitlesAndTranslationsValidator.java | 2 +-
.../specloader/SpecificationLoaderDefault.java | 3 +-
.../specimpl/ObjectSpecificationAbstract.java | 2 +-
.../metamodel/MetaModelContext_forTesting.java | 2 +-
.../action/ActionAnnotationFacetFactoryTest.java | 4 +-
.../ActionAnnotationFacetFactoryTest_Command.java | 2 +-
...ctionAnnotationFacetFactoryTest_Publishing.java | 2 +-
.../DomainObjectAnnotationFacetFactoryTest.java | 6 +--
.../isis/jdo/entities/JdoEntityTypeRegistry.java | 2 +-
.../confmenu/ConfigurationViewServiceDefault.java | 8 +--
.../menubars/MenuBarsLoaderServiceDefault.java | 2 +-
.../IsisRestfulObjectsSessionFilter.java | 7 ++-
.../auth/AuthenticationSessionStrategyDefault.java | 17 +++---
.../resources/MenuBarsResourceServerside.java | 4 +-
.../server/resources/UserResourceServerside.java | 4 +-
.../services/TranslationsResolverWicket.java | 8 ++-
.../serviceactions/ServiceActionUtil.java | 37 +++++++------
.../wicket/ui/components/welcome/WelcomePanel.java | 2 +-
.../ui/components/widgets/favicon/Favicon.java | 2 +-
.../ui/components/widgets/navbar/BrandLogo.java | 2 +-
.../ui/components/widgets/navbar/BrandName.java | 2 +-
.../isis/viewer/wicket/ui/pages/PageAbstract.java | 2 +-
.../isis/viewer/wicket/ui/pages/WebPageBase.java | 2 +-
.../accmngt/signup/RegistrationFormPanel.java | 2 +-
.../isis/viewer/wicket/ui/panels/PanelBase.java | 2 +-
.../isis/viewer/wicket/ui/panels/PanelUtil.java | 25 +++++----
.../java/demoapp/application/DemoAppManifest.java | 2 +-
.../testdomain/conf/Configuration_headless.java | 2 +-
.../testdomain/conf/Configuration_usingJdo.java | 2 +-
.../conf/Configuration_usingJdoAndShiro.java | 2 +-
.../testdomain/auditing/AuditerServiceTest.java | 2 +-
.../bootstrapping/AutoConfigurationTest.java | 2 +-
.../bootstrapping/JdoBootstrappingTest.java | 2 +-
.../JdoBootstrappingTest_usingFixtures.java | 2 +-
.../SpringServiceInjectOrderTest.java | 2 +-
.../SpringServiceProvisioningTest.java | 2 +-
.../domainmodel/AnnotationSyntesizerTest.java | 2 +-
.../DomainModelTest_usingBadDomain.java | 4 +-
.../DomainModelTest_usingGoodDomain.java | 2 +-
.../domainmodel/SpecloaderPerformanceTest.java | 2 +-
.../isis/testdomain/logging/LoggerSetupTest.java | 2 +-
.../isis/testdomain/shiro/ShiroLdapTest.java | 2 +-
.../isis/testdomain/shiro/ShiroSecmanLdapTest.java | 5 +-
.../shiro/ShiroSecmanLdap_restfulStressTest.java | 2 +-
.../transactions/TransactionRollbackTest.java | 2 +-
...TransactionRollbackTest_usingTransactional.java | 2 +-
99 files changed, 209 insertions(+), 371 deletions(-)
delete mode 100644 core/config/src/main/java/org/apache/isis/config/ConfigPropsForPropertyOrParameterLayout.java
delete mode 100644 core/config/src/main/java/org/apache/isis/config/SystemConstants.java
delete mode 100644 core/config/src/main/java/org/apache/isis/config/WebAppConstants.java
rename core/config/src/main/java/org/apache/isis/config/{registry/types => beans}/IsisBeanTypeRegistry.java (98%)
rename core/config/src/main/java/org/apache/isis/config/{registry/types => beans}/TypeMetaData.java (96%)
rename core/config/src/main/java/org/apache/isis/config/{registry => }/messages/MessageRegistry.java (77%)
rename core/config/src/main/java/org/apache/isis/{metamodel/facets/object/domainobject/auditing => config/metamodel/facets}/AuditObjectsConfiguration.java (93%)
rename core/config/src/main/java/org/apache/isis/{metamodel/facets/actions/action/command => config/metamodel/facets}/CommandActionsConfiguration.java (94%)
rename core/config/src/main/java/org/apache/isis/{metamodel/facets/properties/property/command => config/metamodel/facets}/CommandPropertiesConfiguration.java (92%)
rename core/config/src/main/java/org/apache/isis/{metamodel/facets/object/domainobject/auditing => config/metamodel/facets}/DefaultViewConfiguration.java (94%)
rename core/config/src/main/java/org/apache/isis/{metamodel/facets/object/domainobject/editing => config/metamodel/facets}/EditingObjectsConfiguration.java (92%)
rename core/config/src/main/java/org/apache/isis/{metamodel/facets/actions/action/publishing => config/metamodel/facets}/PublishActionsConfiguration.java (94%)
rename core/config/src/main/java/org/apache/isis/{metamodel/facets/object/domainobject/publishing => config/metamodel/facets}/PublishObjectsConfiguration.java (93%)
rename core/config/src/main/java/org/apache/isis/{metamodel/facets/properties/property/publishing => config/metamodel/facets}/PublishPropertiesConfiguration.java (92%)
rename core/config/src/main/java/org/apache/isis/{metamodel/facets/object/domainobject => config/metamodel/facets}/Util.java (95%)
rename core/config/src/main/java/org/apache/isis/{metamodel/services/appfeat => config/metamodel/services}/ApplicationFeaturesInitConfiguration.java (73%)
rename core/config/src/main/java/org/apache/isis/{ => config}/metamodel/specloader/IntrospectionMode.java (97%)
rename core/config/src/main/{resources => java/org/apache/isis/config}/presets/DataNucleusAutoCreate.properties (100%)
rename core/config/src/main/{resources => java/org/apache/isis/config}/presets/DebugDiscovery.properties (100%)
rename core/config/src/main/{resources => java/org/apache/isis/config}/presets/DebugMetaModel.properties (100%)
rename core/config/src/main/{resources => java/org/apache/isis/config}/presets/DebugPersistence.properties (100%)
rename core/config/src/main/{resources => java/org/apache/isis/config}/presets/DebugProgrammingModel.properties (100%)
rename core/config/src/main/{resources => java/org/apache/isis/config}/presets/H2InMemory.properties (100%)
rename core/config/src/main/{resources => java/org/apache/isis/config}/presets/H2InMemory_withUniqueSchema.properties (100%)
rename core/config/src/main/{resources => java/org/apache/isis/config}/presets/HsqlDbInMemory.properties (100%)
rename core/config/src/main/{resources => java/org/apache/isis/config}/presets/IsisIntegTest.properties (100%)
rename core/config/src/main/java/org/apache/isis/config/{ => presets}/IsisPresets.java (59%)
rename core/config/src/main/{resources => java/org/apache/isis/config}/presets/NoTranslations.properties (100%)
rename core/config/src/main/{resources => java/org/apache/isis/config}/presets/SilenceMetaModel.properties (100%)
rename core/config/src/main/{resources => java/org/apache/isis/config}/presets/SilenceProgrammingModel.properties (100%)
rename core/config/src/main/{resources => java/org/apache/isis/config}/presets/SilenceWicket.properties (100%)
copy core/config/src/main/java/org/apache/isis/config/{ConfigurationConstants.java => util/ConfigUtil.java} (65%)
rename core/config/src/main/java/org/apache/isis/{viewer/wicket/ui => config/viewer/wicket}/DialogMode.java (95%)
rename core/config/src/main/java/org/apache/isis/{viewer/wicket/ui => config/viewer/wicket}/WebAppConfiguration.java (98%)
rename core/config/src/test/java/org/apache/isis/config/{ConfigurationConstants_isProtected_Test.java => util/ConfigUtil_isProtected_Test.java} (53%)
rename core/config/src/test/java/org/apache/isis/config/{ConfigurationConstants_mask_Test.java => util/ConfigUtil_mask_Test.java} (70%)
[isis] 04/06: ISIS-2213: removes unused constant fields
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 0b2f6ed2154f20170ff96475ddab4432194811a9
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Dec 4 16:04:01 2019 +0000
ISIS-2213: removes unused constant fields
---
.../org/apache/isis/config/SystemConstants.java | 21 ++-------------------
.../org/apache/isis/config/WebAppConstants.java | 9 ---------
2 files changed, 2 insertions(+), 28 deletions(-)
diff --git a/core/config/src/main/java/org/apache/isis/config/SystemConstants.java b/core/config/src/main/java/org/apache/isis/config/SystemConstants.java
index 2127354..dd7532f 100644
--- a/core/config/src/main/java/org/apache/isis/config/SystemConstants.java
+++ b/core/config/src/main/java/org/apache/isis/config/SystemConstants.java
@@ -21,8 +21,9 @@ package org.apache.isis.config;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
+import lombok.experimental.UtilityClass;
-@NoArgsConstructor(access = AccessLevel.PRIVATE)
+@UtilityClass
public final class SystemConstants {
public static final String MSG_ARE_YOU_SURE = "Are you sure?";
@@ -30,24 +31,6 @@ public final class SystemConstants {
public static final String MSG_CANCEL = "Cancel";
/**
- * Default for {@link #AUTHENTICATION_INSTALLER_KEY}.
- */
- public static final String AUTHENTICATION_DEFAULT = "shiro";
-
- /**
- * Default for {@link #AUTHORIZATION_DEFAULT}.
- */
- public static final String AUTHORIZATION_DEFAULT = "shiro";
-
-
- /**
- * Key by which requested fixture (eg via command line) is made available in
- * {@link IsisConfigurationLegacy}.
- */
- public final static String FIXTURE_KEY = ConfigurationConstants.ROOT + "fixtures";
-
-
- /**
* Somewhat hacky, add this to the query
*/
public static final String ISIS_SESSION_FILTER_QUERY_STRING_FORCE_LOGOUT = "__isis_force_logout";
diff --git a/core/config/src/main/java/org/apache/isis/config/WebAppConstants.java b/core/config/src/main/java/org/apache/isis/config/WebAppConstants.java
index e962fc4..1263ceb 100644
--- a/core/config/src/main/java/org/apache/isis/config/WebAppConstants.java
+++ b/core/config/src/main/java/org/apache/isis/config/WebAppConstants.java
@@ -21,18 +21,9 @@ package org.apache.isis.config;
public final class WebAppConstants {
- /**
- * Key under which the {@link AuthenticationSession} is bound as a session
- * attribute ( <tt>HttpSession#getAttribute(String)</tt>).
- */
public final static String HTTP_SESSION_AUTHENTICATION_SESSION_KEY = WebAppConstants.class.getPackage().getName() + ".authenticationSession";
/**
- * Property name given to the web app directory.
- */
- public static final String WEB_APP_DIR = "application.webapp.dir";
-
- /**
* Servlet context parameter name used to specify the location for property file
* overloads. Property files in this location take precedence over property files
* in other locations. Since the ResourceStreamSourceComposite is being used
[isis] 05/06: ISIS-2213: more tidying up of isis-config
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 78ca71013d140b80953a28ba84a981953b8e7254
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Dec 4 16:15:35 2019 +0000
ISIS-2213: more tidying up of isis-config
---
.../apache/isis/config/ConfigurationConstants.java | 2 +
.../org/apache/isis/config/SystemConstants.java | 43 ----------------------
.../org/apache/isis/config/WebAppConstants.java | 38 -------------------
.../IsisBeanFactoryPostProcessorForSpring.java | 2 -
.../types => beans}/IsisBeanTypeRegistry.java | 3 +-
.../config/beans/IsisBeanTypeRegistryHolder.java | 2 -
.../config/beans/IsisComponentScanInterceptor.java | 2 -
.../{registry/types => beans}/TypeMetaData.java | 4 +-
.../{registry => }/messages/MessageRegistry.java | 13 ++++---
.../identify/ObjectIdentifier_builtinHandlers.java | 4 +-
.../title/TitlesAndTranslationsValidator.java | 2 +-
.../specloader/SpecificationLoaderDefault.java | 2 +-
.../specimpl/ObjectSpecificationAbstract.java | 2 +-
.../metamodel/MetaModelContext_forTesting.java | 2 +-
.../isis/jdo/entities/JdoEntityTypeRegistry.java | 2 +-
.../IsisRestfulObjectsSessionFilter.java | 7 +++-
.../auth/AuthenticationSessionStrategyDefault.java | 10 +++--
.../resources/MenuBarsResourceServerside.java | 4 +-
.../server/resources/UserResourceServerside.java | 4 +-
.../services/TranslationsResolverWicket.java | 8 +++-
.../serviceactions/ServiceActionUtil.java | 37 +++++++++----------
.../isis/viewer/wicket/ui/panels/PanelUtil.java | 25 ++++++-------
22 files changed, 71 insertions(+), 147 deletions(-)
diff --git a/core/config/src/main/java/org/apache/isis/config/ConfigurationConstants.java b/core/config/src/main/java/org/apache/isis/config/ConfigurationConstants.java
index c9780bc..fcb490b 100644
--- a/core/config/src/main/java/org/apache/isis/config/ConfigurationConstants.java
+++ b/core/config/src/main/java/org/apache/isis/config/ConfigurationConstants.java
@@ -39,4 +39,6 @@ public final class ConfigurationConstants {
public static final List<String> PROTECTED_KEYS =
_Lists.of("password", "apiKey", "authToken");
+ // -- SERVICE SUPPORT
+ public static final String SERVICE_IDENTIFIER = "1";
}
diff --git a/core/config/src/main/java/org/apache/isis/config/SystemConstants.java b/core/config/src/main/java/org/apache/isis/config/SystemConstants.java
deleted file mode 100644
index dd7532f..0000000
--- a/core/config/src/main/java/org/apache/isis/config/SystemConstants.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.config;
-
-import lombok.AccessLevel;
-import lombok.NoArgsConstructor;
-import lombok.experimental.UtilityClass;
-
-@UtilityClass
-public final class SystemConstants {
-
- public static final String MSG_ARE_YOU_SURE = "Are you sure?";
- public static final String MSG_CONFIRM = "Confirm";
- public static final String MSG_CANCEL = "Cancel";
-
- /**
- * Somewhat hacky, add this to the query
- */
- public static final String ISIS_SESSION_FILTER_QUERY_STRING_FORCE_LOGOUT = "__isis_force_logout";
-
- //public static final String LOCALE_KEY = ConfigurationConstants.ROOT + "locale";
-
- // -- SERVICE SUPPORT
- public static final String SERVICE_IDENTIFIER = "1";
-
-}
diff --git a/core/config/src/main/java/org/apache/isis/config/WebAppConstants.java b/core/config/src/main/java/org/apache/isis/config/WebAppConstants.java
deleted file mode 100644
index 1263ceb..0000000
--- a/core/config/src/main/java/org/apache/isis/config/WebAppConstants.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.config;
-
-public final class WebAppConstants {
-
- public final static String HTTP_SESSION_AUTHENTICATION_SESSION_KEY = WebAppConstants.class.getPackage().getName() + ".authenticationSession";
-
- /**
- * Servlet context parameter name used to specify the location for property file
- * overloads. Property files in this location take precedence over property files
- * in other locations. Since the ResourceStreamSourceComposite is being used
- * property files from various locations are merged together. So only overloaded
- * properties (entries in the file) need to present.
- */
- public static final String CONFIG_DIR_PARAM = "isis.config.dir";
-
- private WebAppConstants() {
- }
-
-}
diff --git a/core/config/src/main/java/org/apache/isis/config/beans/IsisBeanFactoryPostProcessorForSpring.java b/core/config/src/main/java/org/apache/isis/config/beans/IsisBeanFactoryPostProcessorForSpring.java
index eb8faa7..0c5c37e 100644
--- a/core/config/src/main/java/org/apache/isis/config/beans/IsisBeanFactoryPostProcessorForSpring.java
+++ b/core/config/src/main/java/org/apache/isis/config/beans/IsisBeanFactoryPostProcessorForSpring.java
@@ -27,8 +27,6 @@ import org.springframework.stereotype.Component;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.DomainService;
import org.apache.isis.applib.annotation.ViewModel;
-import org.apache.isis.config.registry.types.IsisBeanTypeRegistry;
-import org.apache.isis.config.registry.types.TypeMetaData;
import lombok.Getter;
import lombok.val;
diff --git a/core/config/src/main/java/org/apache/isis/config/registry/types/IsisBeanTypeRegistry.java b/core/config/src/main/java/org/apache/isis/config/beans/IsisBeanTypeRegistry.java
similarity index 98%
rename from core/config/src/main/java/org/apache/isis/config/registry/types/IsisBeanTypeRegistry.java
rename to core/config/src/main/java/org/apache/isis/config/beans/IsisBeanTypeRegistry.java
index b82d6f8..15e715e 100644
--- a/core/config/src/main/java/org/apache/isis/config/registry/types/IsisBeanTypeRegistry.java
+++ b/core/config/src/main/java/org/apache/isis/config/beans/IsisBeanTypeRegistry.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.config.registry.types;
+package org.apache.isis.config.beans;
import java.io.Serializable;
import java.util.Collection;
@@ -43,7 +43,6 @@ import org.apache.isis.commons.internal.components.SessionScopedComponent;
import org.apache.isis.commons.internal.components.TransactionScopedComponent;
import org.apache.isis.commons.internal.ioc.BeanSort;
import org.apache.isis.commons.internal.reflection._Reflect;
-import org.apache.isis.config.beans.IsisComponentScanInterceptor;
import static org.apache.isis.commons.internal.base._With.requires;
import static org.apache.isis.commons.internal.reflection._Annotations.findNearestAnnotation;
diff --git a/core/config/src/main/java/org/apache/isis/config/beans/IsisBeanTypeRegistryHolder.java b/core/config/src/main/java/org/apache/isis/config/beans/IsisBeanTypeRegistryHolder.java
index 014f59c..e00f3a3 100644
--- a/core/config/src/main/java/org/apache/isis/config/beans/IsisBeanTypeRegistryHolder.java
+++ b/core/config/src/main/java/org/apache/isis/config/beans/IsisBeanTypeRegistryHolder.java
@@ -1,7 +1,5 @@
package org.apache.isis.config.beans;
-import org.apache.isis.config.registry.types.IsisBeanTypeRegistry;
-
public interface IsisBeanTypeRegistryHolder {
IsisBeanTypeRegistry getIsisBeanTypeRegistry();
diff --git a/core/config/src/main/java/org/apache/isis/config/beans/IsisComponentScanInterceptor.java b/core/config/src/main/java/org/apache/isis/config/beans/IsisComponentScanInterceptor.java
index 4450c82..1267fbd 100644
--- a/core/config/src/main/java/org/apache/isis/config/beans/IsisComponentScanInterceptor.java
+++ b/core/config/src/main/java/org/apache/isis/config/beans/IsisComponentScanInterceptor.java
@@ -20,8 +20,6 @@ package org.apache.isis.config.beans;
import org.springframework.stereotype.Component;
-import org.apache.isis.config.registry.types.TypeMetaData;
-
/**
* @apiNote implementing classes must not rely on IsisConfiguration or other provisioned
* services to be available; type classification happens before the post-construct phase
diff --git a/core/config/src/main/java/org/apache/isis/config/registry/types/TypeMetaData.java b/core/config/src/main/java/org/apache/isis/config/beans/TypeMetaData.java
similarity index 96%
rename from core/config/src/main/java/org/apache/isis/config/registry/types/TypeMetaData.java
rename to core/config/src/main/java/org/apache/isis/config/beans/TypeMetaData.java
index 50d5ba4..cf03343 100644
--- a/core/config/src/main/java/org/apache/isis/config/registry/types/TypeMetaData.java
+++ b/core/config/src/main/java/org/apache/isis/config/beans/TypeMetaData.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.config.registry.types;
+package org.apache.isis.config.beans;
import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.commons.internal.context._Context;
@@ -28,7 +28,7 @@ import lombok.Setter;
import lombok.val;
@RequiredArgsConstructor(staticName = "of")
-public final class TypeMetaData {
+final class TypeMetaData {
/**
* Fully qualified name of the underlying class.
diff --git a/core/config/src/main/java/org/apache/isis/config/registry/messages/MessageRegistry.java b/core/config/src/main/java/org/apache/isis/config/messages/MessageRegistry.java
similarity index 77%
rename from core/config/src/main/java/org/apache/isis/config/registry/messages/MessageRegistry.java
rename to core/config/src/main/java/org/apache/isis/config/messages/MessageRegistry.java
index 73bc73c..5988909 100644
--- a/core/config/src/main/java/org/apache/isis/config/registry/messages/MessageRegistry.java
+++ b/core/config/src/main/java/org/apache/isis/config/messages/MessageRegistry.java
@@ -17,22 +17,25 @@
* under the License.
*/
-package org.apache.isis.config.registry.messages;
+package org.apache.isis.config.messages;
import java.util.List;
import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.config.SystemConstants;
public class MessageRegistry {
+ public static final String MSG_ARE_YOU_SURE = "Are you sure?";
+ public static final String MSG_CONFIRM = "Confirm";
+ public static final String MSG_CANCEL = "Cancel";
+
public MessageRegistry(){}
public List<String> listMessages() {
return _Lists.of(
- SystemConstants.MSG_ARE_YOU_SURE,
- SystemConstants.MSG_CONFIRM,
- SystemConstants.MSG_CANCEL);
+ MSG_ARE_YOU_SURE,
+ MSG_CONFIRM,
+ MSG_CANCEL);
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/objectmanager/identify/ObjectIdentifier_builtinHandlers.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/objectmanager/identify/ObjectIdentifier_builtinHandlers.java
index 08694ec..f6cd557 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/objectmanager/identify/ObjectIdentifier_builtinHandlers.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/objectmanager/identify/ObjectIdentifier_builtinHandlers.java
@@ -21,7 +21,7 @@ package org.apache.isis.metamodel.objectmanager.identify;
import java.util.UUID;
import org.apache.isis.commons.internal.exceptions._Exceptions;
-import org.apache.isis.config.SystemConstants;
+import org.apache.isis.config.ConfigurationConstants;
import org.apache.isis.metamodel.adapter.oid.Oid;
import org.apache.isis.metamodel.adapter.oid.RootOid;
import org.apache.isis.metamodel.facets.object.entity.EntityFacet;
@@ -60,7 +60,7 @@ class ObjectIdentifier_builtinHandlers {
@Override
public RootOid handle(ManagedObject managedObject) {
- final String identifier = SystemConstants.SERVICE_IDENTIFIER;
+ final String identifier = ConfigurationConstants.SERVICE_IDENTIFIER;
return Oid.Factory.persistentOf(managedObject.getSpecification().getSpecId(), identifier);
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/title/TitlesAndTranslationsValidator.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/title/TitlesAndTranslationsValidator.java
index 43547ca..696b706 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/title/TitlesAndTranslationsValidator.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/title/TitlesAndTranslationsValidator.java
@@ -22,7 +22,7 @@ import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.services.i18n.TranslationService;
import org.apache.isis.applib.services.title.TitleService;
import org.apache.isis.commons.internal.base._Blackhole;
-import org.apache.isis.config.registry.messages.MessageRegistry;
+import org.apache.isis.config.messages.MessageRegistry;
import org.apache.isis.metamodel.specloader.validator.MetaModelValidatorAbstract;
import org.apache.isis.metamodel.specloader.validator.ValidationFailures;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/SpecificationLoaderDefault.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/SpecificationLoaderDefault.java
index a940955..d2c30b8 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/SpecificationLoaderDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/SpecificationLoaderDefault.java
@@ -38,7 +38,7 @@ import org.apache.isis.commons.internal.environment.IsisSystemEnvironment;
import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.config.beans.IsisBeanTypeRegistryHolder;
import org.apache.isis.config.metamodel.specloader.IntrospectionMode;
-import org.apache.isis.config.registry.types.IsisBeanTypeRegistry;
+import org.apache.isis.config.beans.IsisBeanTypeRegistry;
import org.apache.isis.metamodel.MetaModelContext;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.progmodel.ProgrammingModel;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
index a60965d..a06daa0 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
@@ -42,7 +42,7 @@ import org.apache.isis.commons.internal.collections._Streams;
import org.apache.isis.commons.internal.ioc.BeanSort;
import org.apache.isis.commons.internal.ioc.ManagedBeanAdapter;
import org.apache.isis.config.beans.IsisBeanTypeRegistryHolder;
-import org.apache.isis.config.registry.types.IsisBeanTypeRegistry;
+import org.apache.isis.config.beans.IsisBeanTypeRegistry;
import org.apache.isis.metamodel.commons.ClassExtensions;
import org.apache.isis.metamodel.commons.ToString;
import org.apache.isis.metamodel.consent.Consent;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/MetaModelContext_forTesting.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/MetaModelContext_forTesting.java
index 573923f..d9d2881 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/MetaModelContext_forTesting.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/MetaModelContext_forTesting.java
@@ -36,7 +36,7 @@ import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.commons.internal.environment.IsisSystemEnvironment;
import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.config.beans.IsisBeanTypeRegistryHolder;
-import org.apache.isis.config.registry.types.IsisBeanTypeRegistry;
+import org.apache.isis.config.beans.IsisBeanTypeRegistry;
import org.apache.isis.metamodel.objectmanager.ObjectManager;
import org.apache.isis.metamodel.objectmanager.ObjectManagerDefault;
import org.apache.isis.metamodel.progmodel.ProgrammingModel;
diff --git a/core/persistence/jdo/common/src/main/java/org/apache/isis/jdo/entities/JdoEntityTypeRegistry.java b/core/persistence/jdo/common/src/main/java/org/apache/isis/jdo/entities/JdoEntityTypeRegistry.java
index c270ddc..405ec00 100644
--- a/core/persistence/jdo/common/src/main/java/org/apache/isis/jdo/entities/JdoEntityTypeRegistry.java
+++ b/core/persistence/jdo/common/src/main/java/org/apache/isis/jdo/entities/JdoEntityTypeRegistry.java
@@ -26,7 +26,7 @@ import java.util.stream.Collectors;
import javax.jdo.annotations.PersistenceCapable;
import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.config.registry.types.IsisBeanTypeRegistry;
+import org.apache.isis.config.beans.IsisBeanTypeRegistry;
import org.apache.isis.jdo.metamodel.JdoMetamodelUtil;
import static org.apache.isis.commons.internal.base._NullSafe.stream;
diff --git a/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/IsisRestfulObjectsSessionFilter.java b/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/IsisRestfulObjectsSessionFilter.java
index 3d2ede7..939314c 100644
--- a/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/IsisRestfulObjectsSessionFilter.java
+++ b/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/IsisRestfulObjectsSessionFilter.java
@@ -41,7 +41,6 @@ import javax.servlet.http.HttpServletResponse;
import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.commons.internal.factory.InstanceUtil;
-import org.apache.isis.config.SystemConstants;
import org.apache.isis.metamodel.commons.StringExtensions;
import org.apache.isis.metamodel.specloader.SpecificationLoader;
import org.apache.isis.metamodel.specloader.validator.MetaModelInvalidException;
@@ -145,6 +144,10 @@ public class IsisRestfulObjectsSessionFilter implements Filter {
* The value is expected as a comma separated list.
*/
public static final String IGNORE_EXTENSIONS_KEY = "ignoreExtensions";
+ /**
+ * Somewhat hacky, add this to the query
+ */
+ public static final String ISIS_SESSION_FILTER_QUERY_STRING_FORCE_LOGOUT = "__isis_force_logout";
private static final Function<String, Pattern> STRING_TO_PATTERN = (final String input) -> {
return Pattern.compile(".*\\." + input);
@@ -351,7 +354,7 @@ public class IsisRestfulObjectsSessionFilter implements Filter {
try {
val queryString = httpServletRequest.getQueryString();
if (queryString != null && queryString
- .contains(SystemConstants.ISIS_SESSION_FILTER_QUERY_STRING_FORCE_LOGOUT)) {
+ .contains(ISIS_SESSION_FILTER_QUERY_STRING_FORCE_LOGOUT)) {
authSessionStrategy.invalidate(httpServletRequest, httpServletResponse);
return;
diff --git a/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/auth/AuthenticationSessionStrategyDefault.java b/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/auth/AuthenticationSessionStrategyDefault.java
index e96d0a2..2e407e8 100644
--- a/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/auth/AuthenticationSessionStrategyDefault.java
+++ b/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/auth/AuthenticationSessionStrategyDefault.java
@@ -37,7 +37,7 @@ import lombok.val;
* The session is looked-up as follows:
* <ul>
* <li>it looks up from the {@link HttpSession} using the value
- * {@link WebAppConstants#HTTP_SESSION_AUTHENTICATION_SESSION_KEY}</li>
+ * {@link AuthenticationSessionStrategyDefault#HTTP_SESSION_AUTHENTICATION_SESSION_KEY}</li>
* </ul>
*
* @implNote prior to version 2.0 ... failing that, if a {@link LogonFixture} has been provided and not already
@@ -49,6 +49,8 @@ import lombok.val;
*/
public class AuthenticationSessionStrategyDefault extends AuthenticationSessionStrategyAbstract {
+ public final static String HTTP_SESSION_AUTHENTICATION_SESSION_KEY = AuthenticationSessionStrategyDefault.class.getPackage().getName() + ".authenticationSession";
+
@Override
public AuthenticationSession lookupValid(
final HttpServletRequest httpServletRequest,
@@ -59,7 +61,7 @@ public class AuthenticationSessionStrategyDefault extends AuthenticationSessionS
// use previously authenticated session if available
val authSession = (AuthenticationSession)
- httpSession.getAttribute(WebAppConstants.HTTP_SESSION_AUTHENTICATION_SESSION_KEY);
+ httpSession.getAttribute(HTTP_SESSION_AUTHENTICATION_SESSION_KEY);
if (authSession != null) {
val sessionValid = authenticationManager.isSessionValid(authSession);
if (sessionValid) {
@@ -79,9 +81,9 @@ public class AuthenticationSessionStrategyDefault extends AuthenticationSessionS
val httpSession = getHttpSession(httpServletRequest);
if(authSession != null) {
httpSession.setAttribute(
- WebAppConstants.HTTP_SESSION_AUTHENTICATION_SESSION_KEY, authSession);
+ HTTP_SESSION_AUTHENTICATION_SESSION_KEY, authSession);
} else {
- httpSession.removeAttribute(WebAppConstants.HTTP_SESSION_AUTHENTICATION_SESSION_KEY);
+ httpSession.removeAttribute(HTTP_SESSION_AUTHENTICATION_SESSION_KEY);
}
}
diff --git a/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/MenuBarsResourceServerside.java b/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/MenuBarsResourceServerside.java
index a71afeb..5b0f0f7 100644
--- a/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/MenuBarsResourceServerside.java
+++ b/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/MenuBarsResourceServerside.java
@@ -27,7 +27,7 @@ import org.apache.isis.applib.layout.component.ServiceActionLayoutData;
import org.apache.isis.applib.layout.links.Link;
import org.apache.isis.applib.layout.menubars.MenuBars;
import org.apache.isis.applib.services.menu.MenuBarsService;
-import org.apache.isis.config.SystemConstants;
+import org.apache.isis.config.ConfigurationConstants;
import org.apache.isis.viewer.restfulobjects.applib.Rel;
import org.apache.isis.viewer.restfulobjects.applib.RepresentationType;
import org.apache.isis.viewer.restfulobjects.applib.RestfulHttpMethod;
@@ -73,7 +73,7 @@ public class MenuBarsResourceServerside extends ResourceAbstract implements Menu
final String objectType = actionLayoutData.getObjectType();
final String relativeUrl = String.format(
"objects/%s/%s/actions/%s",
- objectType, SystemConstants.SERVICE_IDENTIFIER, actionLayoutData.getId());
+ objectType, ConfigurationConstants.SERVICE_IDENTIFIER, actionLayoutData.getId());
Link link = new Link(
Rel.ACTION.getName(),
RestfulHttpMethod.GET.getJavaxRsMethod(),
diff --git a/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/UserResourceServerside.java b/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/UserResourceServerside.java
index 3b18256..7ad9c44 100644
--- a/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/UserResourceServerside.java
+++ b/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/UserResourceServerside.java
@@ -26,7 +26,7 @@ import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import org.apache.isis.applib.annotation.Where;
-import org.apache.isis.config.SystemConstants;
+import org.apache.isis.viewer.restfulobjects.IsisRestfulObjectsSessionFilter;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.RepresentationType;
import org.apache.isis.viewer.restfulobjects.applib.RestfulMediaType;
@@ -83,7 +83,7 @@ public class UserResourceServerside extends ResourceAbstract implements UserReso
// we also redirect to home page with special query string; this allows the session filter
// to clear out any cookies/headers (eg if BASIC auth in use).
try {
- final URI location = new URI("?" + SystemConstants.ISIS_SESSION_FILTER_QUERY_STRING_FORCE_LOGOUT);
+ final URI location = new URI("?" + IsisRestfulObjectsSessionFilter.ISIS_SESSION_FILTER_QUERY_STRING_FORCE_LOGOUT);
return Response.temporaryRedirect(location).build();
} catch (URISyntaxException e) {
throw new RuntimeException(e);
diff --git a/core/viewers/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/TranslationsResolverWicket.java b/core/viewers/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/TranslationsResolverWicket.java
index 1383923..391b6f2 100644
--- a/core/viewers/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/TranslationsResolverWicket.java
+++ b/core/viewers/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/TranslationsResolverWicket.java
@@ -35,7 +35,6 @@ import org.springframework.stereotype.Service;
import org.apache.isis.applib.services.i18n.TranslationsResolver;
import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.config.WebAppConstants;
import org.apache.isis.viewer.wicket.viewer.IsisWicketApplication;
import lombok.val;
@@ -48,11 +47,16 @@ import lombok.extern.log4j.Log4j2;
@Service @Log4j2
public class TranslationsResolverWicket implements TranslationsResolver {
+ /**
+ * Servlet context parameter name used to specify the location for translations.
+ */
+ public static final String CONFIG_DIR_PARAM = "isis.config.dir";
+
@Override
public List<String> readLines(final String fileName) {
final ServletContext servletContext = getServletContext();
- final String configLocation = servletContext.getInitParameter(WebAppConstants.CONFIG_DIR_PARAM);
+ final String configLocation = servletContext.getInitParameter(CONFIG_DIR_PARAM);
try {
if(configLocation != null) {
log.info( "Reading translations relative to config override location: {}", configLocation );
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionUtil.java b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionUtil.java
index 7b951f4..4321ee2 100644
--- a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionUtil.java
+++ b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionUtil.java
@@ -19,15 +19,13 @@
package org.apache.isis.viewer.wicket.ui.components.actionmenu.serviceactions;
-import java.util.List;
+import de.agilecoders.wicket.core.markup.html.bootstrap.components.TooltipConfig;
+import de.agilecoders.wicket.extensions.markup.html.bootstrap.confirmation.ConfirmationBehavior;
+import de.agilecoders.wicket.extensions.markup.html.bootstrap.confirmation.ConfirmationConfig;
+import lombok.extern.log4j.Log4j2;
+import lombok.val;
-import org.apache.wicket.Component;
-import org.apache.wicket.MarkupContainer;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.link.AbstractLink;
-import org.apache.wicket.markup.html.list.ListItem;
-import org.apache.wicket.markup.html.list.ListView;
-import org.apache.wicket.markup.html.panel.Fragment;
+import java.util.List;
import org.apache.isis.applib.layout.component.ServiceActionLayoutData;
import org.apache.isis.applib.layout.menubars.MenuBars;
@@ -37,7 +35,7 @@ import org.apache.isis.applib.layout.menubars.bootstrap3.BS3MenuBar;
import org.apache.isis.applib.services.i18n.TranslationService;
import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.config.SystemConstants;
+import org.apache.isis.config.messages.MessageRegistry;
import org.apache.isis.metamodel.spec.feature.ObjectAction;
import org.apache.isis.viewer.wicket.model.models.EntityModel;
import org.apache.isis.viewer.wicket.model.models.ServiceActionsModel;
@@ -45,12 +43,13 @@ import org.apache.isis.viewer.wicket.ui.components.actionmenu.CssClassFaBehavior
import org.apache.isis.viewer.wicket.ui.util.CssClassAppender;
import org.apache.isis.viewer.wicket.ui.util.Tooltips;
import org.apache.isis.webapp.context.IsisWebAppCommonContext;
-
-import de.agilecoders.wicket.core.markup.html.bootstrap.components.TooltipConfig;
-import de.agilecoders.wicket.extensions.markup.html.bootstrap.confirmation.ConfirmationBehavior;
-import de.agilecoders.wicket.extensions.markup.html.bootstrap.confirmation.ConfirmationConfig;
-import lombok.val;
-import lombok.extern.log4j.Log4j2;
+import org.apache.wicket.Component;
+import org.apache.wicket.MarkupContainer;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.link.AbstractLink;
+import org.apache.wicket.markup.html.list.ListItem;
+import org.apache.wicket.markup.html.list.ListView;
+import org.apache.wicket.markup.html.panel.Fragment;
@Log4j2
public final class ServiceActionUtil {
@@ -259,10 +258,10 @@ public final class ServiceActionUtil {
ConfirmationConfig confirmationConfig = new ConfirmationConfig();
- final String context = SystemConstants.class.getName();
- final String areYouSure = translationService.translate(context, SystemConstants.MSG_ARE_YOU_SURE);
- final String confirm = translationService.translate(context, SystemConstants.MSG_CONFIRM);
- final String cancel = translationService.translate(context, SystemConstants.MSG_CANCEL);
+ final String context = MessageRegistry.class.getName();
+ final String areYouSure = translationService.translate(context, MessageRegistry.MSG_ARE_YOU_SURE);
+ final String confirm = translationService.translate(context, MessageRegistry.MSG_CONFIRM);
+ final String cancel = translationService.translate(context, MessageRegistry.MSG_CANCEL);
confirmationConfig
.withTitle(areYouSure)
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelUtil.java b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelUtil.java
index 3b38017..b5ccfa3 100644
--- a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelUtil.java
+++ b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelUtil.java
@@ -18,6 +18,14 @@
*/
package org.apache.isis.viewer.wicket.ui.panels;
+import de.agilecoders.wicket.core.markup.html.bootstrap.components.TooltipConfig;
+import de.agilecoders.wicket.extensions.markup.html.bootstrap.confirmation.ConfirmationBehavior;
+import de.agilecoders.wicket.extensions.markup.html.bootstrap.confirmation.ConfirmationConfig;
+
+import org.apache.isis.applib.annotation.SemanticsOf;
+import org.apache.isis.applib.services.i18n.TranslationService;
+import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.config.messages.MessageRegistry;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.attributes.AjaxCallListener;
import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
@@ -26,15 +34,6 @@ import org.apache.wicket.markup.head.CssReferenceHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.request.resource.CssResourceReference;
-import org.apache.isis.applib.annotation.SemanticsOf;
-import org.apache.isis.applib.services.i18n.TranslationService;
-import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.config.SystemConstants;
-
-import de.agilecoders.wicket.core.markup.html.bootstrap.components.TooltipConfig;
-import de.agilecoders.wicket.extensions.markup.html.bootstrap.confirmation.ConfirmationBehavior;
-import de.agilecoders.wicket.extensions.markup.html.bootstrap.confirmation.ConfirmationConfig;
-
public final class PanelUtil {
private PanelUtil(){}
@@ -98,10 +97,10 @@ public final class PanelUtil {
ConfirmationConfig confirmationConfig = new ConfirmationConfig();
- final String context = SystemConstants.class.getName();
- final String areYouSure = translationService.translate(context, SystemConstants.MSG_ARE_YOU_SURE);
- final String confirm = translationService.translate(context, SystemConstants.MSG_CONFIRM);
- final String cancel = translationService.translate(context, SystemConstants.MSG_CANCEL);
+ final String context = MessageRegistry.class.getName();
+ final String areYouSure = translationService.translate(context, MessageRegistry.MSG_ARE_YOU_SURE);
+ final String confirm = translationService.translate(context, MessageRegistry.MSG_CONFIRM);
+ final String cancel = translationService.translate(context, MessageRegistry.MSG_CANCEL);
confirmationConfig
.withTitle(areYouSure)
[isis] 02/06: ISIS-2213: more reorg of isis-config
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 984f06f6344f98551314714277df3371dacb1710
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Dec 4 15:55:40 2019 +0000
ISIS-2213: more reorg of isis-config
* moves IsisPresets to presets, and moves the classpath resources alongside and into src/main/java
* moves ConfigPropsForPropertyOrParameterLayout interface into IsisConfiguration.Viewers (better scoping, I think)
---
.../ConfigPropsForPropertyOrParameterLayout.java | 12 ----------
.../org/apache/isis/config/IsisConfiguration.java | 8 +++++++
.../presets/DataNucleusAutoCreate.properties | 0
.../isis/config}/presets/DebugDiscovery.properties | 0
.../isis/config}/presets/DebugMetaModel.properties | 0
.../config}/presets/DebugPersistence.properties | 0
.../presets/DebugProgrammingModel.properties | 0
.../isis/config}/presets/H2InMemory.properties | 0
.../presets/H2InMemory_withUniqueSchema.properties | 0
.../isis/config}/presets/HsqlDbInMemory.properties | 0
.../isis/config}/presets/IsisIntegTest.properties | 0
.../isis/config/{ => presets}/IsisPresets.java | 28 +++++++++++-----------
.../isis/config}/presets/NoTranslations.properties | 0
.../config}/presets/SilenceMetaModel.properties | 0
.../presets/SilenceProgrammingModel.properties | 0
.../isis/config}/presets/SilenceWicket.properties | 0
.../facets/fallback/FallbackFacetFactory.java | 6 ++---
.../java/demoapp/application/DemoAppManifest.java | 2 +-
.../testdomain/conf/Configuration_headless.java | 2 +-
.../testdomain/conf/Configuration_usingJdo.java | 2 +-
.../conf/Configuration_usingJdoAndShiro.java | 2 +-
.../testdomain/auditing/AuditerServiceTest.java | 2 +-
.../bootstrapping/AutoConfigurationTest.java | 2 +-
.../bootstrapping/JdoBootstrappingTest.java | 2 +-
.../JdoBootstrappingTest_usingFixtures.java | 2 +-
.../SpringServiceInjectOrderTest.java | 2 +-
.../SpringServiceProvisioningTest.java | 2 +-
.../domainmodel/AnnotationSyntesizerTest.java | 2 +-
.../DomainModelTest_usingBadDomain.java | 2 +-
.../DomainModelTest_usingGoodDomain.java | 2 +-
.../domainmodel/SpecloaderPerformanceTest.java | 2 +-
.../isis/testdomain/logging/LoggerSetupTest.java | 2 +-
.../isis/testdomain/shiro/ShiroLdapTest.java | 2 +-
.../isis/testdomain/shiro/ShiroSecmanLdapTest.java | 5 +---
.../shiro/ShiroSecmanLdap_restfulStressTest.java | 2 +-
.../transactions/TransactionRollbackTest.java | 2 +-
...TransactionRollbackTest_usingTransactional.java | 2 +-
37 files changed, 45 insertions(+), 52 deletions(-)
diff --git a/core/config/src/main/java/org/apache/isis/config/ConfigPropsForPropertyOrParameterLayout.java b/core/config/src/main/java/org/apache/isis/config/ConfigPropsForPropertyOrParameterLayout.java
deleted file mode 100644
index 71a70c5..0000000
--- a/core/config/src/main/java/org/apache/isis/config/ConfigPropsForPropertyOrParameterLayout.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.apache.isis.config;
-
-import org.apache.isis.applib.annotation.LabelPosition;
-
-public interface ConfigPropsForPropertyOrParameterLayout {
- public LabelPosition getLabelPosition();
-
- /**
- * Alias for {@link #getLabelPosition()}
- */
- public LabelPosition getLabel();
-}
diff --git a/core/config/src/main/java/org/apache/isis/config/IsisConfiguration.java b/core/config/src/main/java/org/apache/isis/config/IsisConfiguration.java
index 23540a0..d680a5c 100644
--- a/core/config/src/main/java/org/apache/isis/config/IsisConfiguration.java
+++ b/core/config/src/main/java/org/apache/isis/config/IsisConfiguration.java
@@ -1050,6 +1050,14 @@ public class IsisConfiguration {
private LabelPosition label = LabelPosition.NOT_SPECIFIED;
}
+ public interface ConfigPropsForPropertyOrParameterLayout {
+ public LabelPosition getLabelPosition();
+
+ /**
+ * Alias for {@link #getLabelPosition()}
+ */
+ public LabelPosition getLabel();
+ }
}
@Component
diff --git a/core/config/src/main/resources/presets/DataNucleusAutoCreate.properties b/core/config/src/main/java/org/apache/isis/config/presets/DataNucleusAutoCreate.properties
similarity index 100%
rename from core/config/src/main/resources/presets/DataNucleusAutoCreate.properties
rename to core/config/src/main/java/org/apache/isis/config/presets/DataNucleusAutoCreate.properties
diff --git a/core/config/src/main/resources/presets/DebugDiscovery.properties b/core/config/src/main/java/org/apache/isis/config/presets/DebugDiscovery.properties
similarity index 100%
rename from core/config/src/main/resources/presets/DebugDiscovery.properties
rename to core/config/src/main/java/org/apache/isis/config/presets/DebugDiscovery.properties
diff --git a/core/config/src/main/resources/presets/DebugMetaModel.properties b/core/config/src/main/java/org/apache/isis/config/presets/DebugMetaModel.properties
similarity index 100%
rename from core/config/src/main/resources/presets/DebugMetaModel.properties
rename to core/config/src/main/java/org/apache/isis/config/presets/DebugMetaModel.properties
diff --git a/core/config/src/main/resources/presets/DebugPersistence.properties b/core/config/src/main/java/org/apache/isis/config/presets/DebugPersistence.properties
similarity index 100%
rename from core/config/src/main/resources/presets/DebugPersistence.properties
rename to core/config/src/main/java/org/apache/isis/config/presets/DebugPersistence.properties
diff --git a/core/config/src/main/resources/presets/DebugProgrammingModel.properties b/core/config/src/main/java/org/apache/isis/config/presets/DebugProgrammingModel.properties
similarity index 100%
rename from core/config/src/main/resources/presets/DebugProgrammingModel.properties
rename to core/config/src/main/java/org/apache/isis/config/presets/DebugProgrammingModel.properties
diff --git a/core/config/src/main/resources/presets/H2InMemory.properties b/core/config/src/main/java/org/apache/isis/config/presets/H2InMemory.properties
similarity index 100%
rename from core/config/src/main/resources/presets/H2InMemory.properties
rename to core/config/src/main/java/org/apache/isis/config/presets/H2InMemory.properties
diff --git a/core/config/src/main/resources/presets/H2InMemory_withUniqueSchema.properties b/core/config/src/main/java/org/apache/isis/config/presets/H2InMemory_withUniqueSchema.properties
similarity index 100%
rename from core/config/src/main/resources/presets/H2InMemory_withUniqueSchema.properties
rename to core/config/src/main/java/org/apache/isis/config/presets/H2InMemory_withUniqueSchema.properties
diff --git a/core/config/src/main/resources/presets/HsqlDbInMemory.properties b/core/config/src/main/java/org/apache/isis/config/presets/HsqlDbInMemory.properties
similarity index 100%
rename from core/config/src/main/resources/presets/HsqlDbInMemory.properties
rename to core/config/src/main/java/org/apache/isis/config/presets/HsqlDbInMemory.properties
diff --git a/core/config/src/main/resources/presets/IsisIntegTest.properties b/core/config/src/main/java/org/apache/isis/config/presets/IsisIntegTest.properties
similarity index 100%
rename from core/config/src/main/resources/presets/IsisIntegTest.properties
rename to core/config/src/main/java/org/apache/isis/config/presets/IsisIntegTest.properties
diff --git a/core/config/src/main/java/org/apache/isis/config/IsisPresets.java b/core/config/src/main/java/org/apache/isis/config/presets/IsisPresets.java
similarity index 59%
rename from core/config/src/main/java/org/apache/isis/config/IsisPresets.java
rename to core/config/src/main/java/org/apache/isis/config/presets/IsisPresets.java
index 2f10ce9..a556c36 100644
--- a/core/config/src/main/java/org/apache/isis/config/IsisPresets.java
+++ b/core/config/src/main/java/org/apache/isis/config/presets/IsisPresets.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.config;
+package org.apache.isis.config.presets;
/**
* Supports Spring's {@code @PropertySource} annotation.
@@ -26,32 +26,32 @@ package org.apache.isis.config;
*/
public final class IsisPresets {
- public static final String NoTranslations = "classpath:/presets/NoTranslations.properties";
+ public static final String NoTranslations = "classpath:/org/apache/isis/config/presets/NoTranslations.properties";
- public static final String H2InMemory = "classpath:/presets/H2InMemory.properties";
+ public static final String H2InMemory = "classpath:/org/apache/isis/config/presets/H2InMemory.properties";
/** randomized (unique) database name, eg. to allow for concurrent testing */
- public static final String H2InMemory_withUniqueSchema = "classpath:/presets/H2InMemory_withUniqueSchema.properties";
+ public static final String H2InMemory_withUniqueSchema = "classpath:/org/apache/isis/config/presets/H2InMemory_withUniqueSchema.properties";
- public static final String HsqlDbInMemory = "classpath:/presets/HsqlDbInMemory.properties";
- public static final String DataNucleusAutoCreate = "classpath:/presets/DataNucleusAutoCreate.properties";
+ public static final String HsqlDbInMemory = "classpath:/org/apache/isis/config/presets/HsqlDbInMemory.properties";
+ public static final String DataNucleusAutoCreate = "classpath:/org/apache/isis/config/presets/DataNucleusAutoCreate.properties";
- public static final String DebugPersistence = "classpath:/presets/DebugPersistence.properties";
- public static final String DebugDiscovery = "classpath:/presets/DebugDiscovery.properties";
+ public static final String DebugPersistence = "classpath:/org/apache/isis/config/presets/DebugPersistence.properties";
+ public static final String DebugDiscovery = "classpath:/org/apache/isis/config/presets/DebugDiscovery.properties";
- public static final String DebugProgrammingModel = "classpath:/presets/DebugProgrammingModel.properties";
- public static final String SilenceProgrammingModel = "classpath:/presets/SilenceProgrammingModel.properties";
+ public static final String DebugProgrammingModel = "classpath:/org/apache/isis/config/presets/DebugProgrammingModel.properties";
+ public static final String SilenceProgrammingModel = "classpath:/org/apache/isis/config/presets/SilenceProgrammingModel.properties";
- public static final String DebugMetaModel = "classpath:/presets/DebugMetaModel.properties";
- public static final String SilenceMetaModel = "classpath:/presets/SilenceMetaModel.properties";
+ public static final String DebugMetaModel = "classpath:/org/apache/isis/config/presets/DebugMetaModel.properties";
+ public static final String SilenceMetaModel = "classpath:/org/apache/isis/config/presets/SilenceMetaModel.properties";
- public static final String SilenceWicket = "classpath:/presets/SilenceWicket.properties";
+ public static final String SilenceWicket = "classpath:/org/apache/isis/config/presets/SilenceWicket.properties";
/**
* @deprecated seems no longer required anyway
*/
@Deprecated
- public static final String IsisIntegTest = "classpath:/presets/IsisIntegTest.properties";
+ public static final String IsisIntegTest = "classpath:/org/apache/isis/config/presets/IsisIntegTest.properties";
/**
* Use PROTOTYPING mode as the default. Does not override if the system-property
diff --git a/core/config/src/main/resources/presets/NoTranslations.properties b/core/config/src/main/java/org/apache/isis/config/presets/NoTranslations.properties
similarity index 100%
rename from core/config/src/main/resources/presets/NoTranslations.properties
rename to core/config/src/main/java/org/apache/isis/config/presets/NoTranslations.properties
diff --git a/core/config/src/main/resources/presets/SilenceMetaModel.properties b/core/config/src/main/java/org/apache/isis/config/presets/SilenceMetaModel.properties
similarity index 100%
rename from core/config/src/main/resources/presets/SilenceMetaModel.properties
rename to core/config/src/main/java/org/apache/isis/config/presets/SilenceMetaModel.properties
diff --git a/core/config/src/main/resources/presets/SilenceProgrammingModel.properties b/core/config/src/main/java/org/apache/isis/config/presets/SilenceProgrammingModel.properties
similarity index 100%
rename from core/config/src/main/resources/presets/SilenceProgrammingModel.properties
rename to core/config/src/main/java/org/apache/isis/config/presets/SilenceProgrammingModel.properties
diff --git a/core/config/src/main/resources/presets/SilenceWicket.properties b/core/config/src/main/java/org/apache/isis/config/presets/SilenceWicket.properties
similarity index 100%
rename from core/config/src/main/resources/presets/SilenceWicket.properties
rename to core/config/src/main/java/org/apache/isis/config/presets/SilenceWicket.properties
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/fallback/FallbackFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/fallback/FallbackFacetFactory.java
index f95e441..284f75e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/fallback/FallbackFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/fallback/FallbackFacetFactory.java
@@ -22,7 +22,7 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.isis.applib.annotation.LabelPosition;
-import org.apache.isis.config.ConfigPropsForPropertyOrParameterLayout;
+import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.metamodel.commons.StringExtensions;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facetapi.FacetHolder;
@@ -129,12 +129,12 @@ public class FallbackFacetFactory extends FacetFactoryAbstract {
}
- private Facet newPropParamLayoutFacetIfAny(final FacetHolder facetHolder, final String layoutKey, ConfigPropsForPropertyOrParameterLayout configPropsHolder) {
+ private Facet newPropParamLayoutFacetIfAny(final FacetHolder facetHolder, final String layoutKey, IsisConfiguration.Viewers.ConfigPropsForPropertyOrParameterLayout configPropsHolder) {
final LabelPosition labelPosition = from(configPropsHolder);
return new LabelAtFacetFromLayoutConfiguration(labelPosition, facetHolder);
}
- private static LabelPosition from(ConfigPropsForPropertyOrParameterLayout configPropsHolder) {
+ private static LabelPosition from(IsisConfiguration.Viewers.ConfigPropsForPropertyOrParameterLayout configPropsHolder) {
final LabelPosition labelPosition = configPropsHolder.getLabelPosition();
if(labelPosition != LabelPosition.NOT_SPECIFIED) {
return labelPosition;
diff --git a/examples/demo/src/main/java/demoapp/application/DemoAppManifest.java b/examples/demo/src/main/java/demoapp/application/DemoAppManifest.java
index e4e54f6..3e181c2 100644
--- a/examples/demo/src/main/java/demoapp/application/DemoAppManifest.java
+++ b/examples/demo/src/main/java/demoapp/application/DemoAppManifest.java
@@ -27,7 +27,7 @@ import org.springframework.context.annotation.Import;
import org.springframework.context.annotation.PropertySource;
import org.springframework.context.annotation.PropertySources;
-import org.apache.isis.config.IsisPresets;
+import org.apache.isis.config.presets.IsisPresets;
import org.apache.isis.extensions.fixtures.IsisExtFixturesModule;
import org.apache.isis.extensions.secman.api.SecurityModuleConfig;
import org.apache.isis.extensions.secman.api.permission.PermissionsEvaluationService;
diff --git a/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_headless.java b/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_headless.java
index f4580c6..af0a1d7 100644
--- a/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_headless.java
+++ b/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_headless.java
@@ -36,7 +36,7 @@ import org.apache.isis.applib.services.metrics.MetricsService;
import org.apache.isis.applib.services.xactn.TransactionId;
import org.apache.isis.applib.services.xactn.TransactionService;
import org.apache.isis.applib.services.xactn.TransactionState;
-import org.apache.isis.config.IsisPresets;
+import org.apache.isis.config.presets.IsisPresets;
import org.apache.isis.extensions.incubator.IsisBootIncubator;
import org.apache.isis.runtime.spring.IsisBoot;
import org.apache.isis.security.bypass.IsisBootSecurityBypass;
diff --git a/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingJdo.java b/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingJdo.java
index fead143..ba46c8c 100644
--- a/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingJdo.java
+++ b/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingJdo.java
@@ -24,7 +24,7 @@ import org.springframework.context.annotation.Import;
import org.springframework.context.annotation.PropertySource;
import org.springframework.context.annotation.PropertySources;
-import org.apache.isis.config.IsisPresets;
+import org.apache.isis.config.presets.IsisPresets;
import org.apache.isis.extensions.fixtures.IsisExtFixturesModule;
import org.apache.isis.jdo.IsisBootDataNucleus;
import org.apache.isis.runtime.spring.IsisBoot;
diff --git a/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingJdoAndShiro.java b/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingJdoAndShiro.java
index 44ab63d..09ec5bf 100644
--- a/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingJdoAndShiro.java
+++ b/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingJdoAndShiro.java
@@ -27,7 +27,7 @@ import org.springframework.context.annotation.Import;
import org.springframework.context.annotation.PropertySource;
import org.springframework.context.annotation.PropertySources;
-import org.apache.isis.config.IsisPresets;
+import org.apache.isis.config.presets.IsisPresets;
import org.apache.isis.extensions.fixtures.IsisExtFixturesModule;
import org.apache.isis.extensions.secman.api.SecurityModuleConfig;
import org.apache.isis.extensions.secman.api.permission.PermissionsEvaluationService;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/auditing/AuditerServiceTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/auditing/AuditerServiceTest.java
index fa6c8fa..b527fc1 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/auditing/AuditerServiceTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/auditing/AuditerServiceTest.java
@@ -39,7 +39,7 @@ import org.apache.isis.applib.services.bookmark.Bookmark;
import org.apache.isis.applib.services.repository.RepositoryService;
import org.apache.isis.applib.services.wrapper.WrapperFactory;
import org.apache.isis.applib.services.wrapper.WrapperFactory.ExecutionMode;
-import org.apache.isis.config.IsisPresets;
+import org.apache.isis.config.presets.IsisPresets;
import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts;
import org.apache.isis.testdomain.Smoketest;
import org.apache.isis.testdomain.conf.Configuration_usingJdo;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/AutoConfigurationTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/AutoConfigurationTest.java
index 9d80261..b56f025 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/AutoConfigurationTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/AutoConfigurationTest.java
@@ -30,7 +30,7 @@ import org.springframework.stereotype.Component;
import org.springframework.test.context.TestPropertySource;
import org.apache.isis.commons.internal.environment.IsisSystemEnvironment;
-import org.apache.isis.config.IsisPresets;
+import org.apache.isis.config.presets.IsisPresets;
import org.apache.isis.config.beans.IsisBeanFactoryPostProcessorForSpring;
import org.apache.isis.config.beans.IsisBeanTypeRegistryHolder;
import org.apache.isis.metamodel.MetaModelContexts;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/JdoBootstrappingTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/JdoBootstrappingTest.java
index 2b241e7..d65c321 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/JdoBootstrappingTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/JdoBootstrappingTest.java
@@ -38,7 +38,7 @@ import org.springframework.test.annotation.Rollback;
import org.springframework.transaction.annotation.Transactional;
import org.apache.isis.applib.services.repository.RepositoryService;
-import org.apache.isis.config.IsisPresets;
+import org.apache.isis.config.presets.IsisPresets;
import org.apache.isis.testdomain.Smoketest;
import org.apache.isis.testdomain.conf.Configuration_usingJdo;
import org.apache.isis.testdomain.jdo.Book;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/JdoBootstrappingTest_usingFixtures.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/JdoBootstrappingTest_usingFixtures.java
index 517d0c2..a52f2a8 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/JdoBootstrappingTest_usingFixtures.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/JdoBootstrappingTest_usingFixtures.java
@@ -26,7 +26,7 @@ import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.transaction.annotation.Transactional;
import org.apache.isis.applib.services.repository.RepositoryService;
-import org.apache.isis.config.IsisPresets;
+import org.apache.isis.config.presets.IsisPresets;
import org.apache.isis.config.beans.IsisBeanFactoryPostProcessorForSpring;
import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts;
import org.apache.isis.testdomain.Smoketest;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/SpringServiceInjectOrderTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/SpringServiceInjectOrderTest.java
index 0658dd1..cdb1855 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/SpringServiceInjectOrderTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/SpringServiceInjectOrderTest.java
@@ -38,7 +38,7 @@ import org.springframework.test.context.TestPropertySource;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.applib.services.message.MessageService;
-import org.apache.isis.config.IsisPresets;
+import org.apache.isis.config.presets.IsisPresets;
import org.apache.isis.runtime.services.message.MessageServiceDefault;
//import org.apache.isis.testdomain.Incubating;
import org.apache.isis.testdomain.Smoketest;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/SpringServiceProvisioningTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/SpringServiceProvisioningTest.java
index 91052be..aa3b310 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/SpringServiceProvisioningTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/SpringServiceProvisioningTest.java
@@ -33,7 +33,7 @@ import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.commons.internal.ioc.ManagedBeanAdapter;
import org.apache.isis.commons.internal.resources._Resources;
-import org.apache.isis.config.IsisPresets;
+import org.apache.isis.config.presets.IsisPresets;
//import org.apache.isis.testdomain.Incubating;
import org.apache.isis.testdomain.Smoketest;
import org.apache.isis.testdomain.conf.Configuration_usingJdo;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/AnnotationSyntesizerTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/AnnotationSyntesizerTest.java
index 64f3fb4..04b9be4 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/AnnotationSyntesizerTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/AnnotationSyntesizerTest.java
@@ -30,7 +30,7 @@ import org.apache.isis.applib.events.domain.ActionDomainEvent;
import org.apache.isis.applib.services.jaxb.JaxbService;
import org.apache.isis.applib.services.metamodel.MetaModelService;
import org.apache.isis.commons.internal.reflection._Annotations;
-import org.apache.isis.config.IsisPresets;
+import org.apache.isis.config.presets.IsisPresets;
import org.apache.isis.schema.metamodel.v1.DomainClassDto;
import org.apache.isis.testdomain.Smoketest;
import org.apache.isis.testdomain.conf.Configuration_headless;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingBadDomain.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingBadDomain.java
index b091489..794de40 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingBadDomain.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingBadDomain.java
@@ -27,7 +27,7 @@ import org.springframework.test.context.TestPropertySource;
import org.apache.isis.commons.internal.environment.IsisSystemEnvironment;
import org.apache.isis.config.IsisConfiguration;
-import org.apache.isis.config.IsisPresets;
+import org.apache.isis.config.presets.IsisPresets;
import org.apache.isis.integtestsupport.validate.ValidateDomainModel;
import org.apache.isis.metamodel.spec.DomainModelException;
import org.apache.isis.config.metamodel.specloader.IntrospectionMode;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingGoodDomain.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingGoodDomain.java
index 9cd169a..35217b8 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingGoodDomain.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingGoodDomain.java
@@ -24,7 +24,7 @@ import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.TestPropertySource;
-import org.apache.isis.config.IsisPresets;
+import org.apache.isis.config.presets.IsisPresets;
import org.apache.isis.integtestsupport.validate.ValidateDomainModel;
import org.apache.isis.metamodel.specloader.SpecificationLoader;
import org.apache.isis.testdomain.Smoketest;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/SpecloaderPerformanceTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/SpecloaderPerformanceTest.java
index 1304ecf..cad8a4a 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/SpecloaderPerformanceTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/SpecloaderPerformanceTest.java
@@ -28,7 +28,7 @@ import org.springframework.test.context.TestPropertySource;
import org.apache.isis.commons.internal.base._Timing;
import org.apache.isis.commons.internal.reflection._Annotations;
import org.apache.isis.config.IsisConfiguration;
-import org.apache.isis.config.IsisPresets;
+import org.apache.isis.config.presets.IsisPresets;
import org.apache.isis.metamodel.specloader.SpecificationLoader;
import org.apache.isis.testdomain.Incubating;
import org.apache.isis.testdomain.Smoketest;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/logging/LoggerSetupTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/logging/LoggerSetupTest.java
index e70da5d..316c7e4 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/logging/LoggerSetupTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/logging/LoggerSetupTest.java
@@ -25,7 +25,7 @@ import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.annotation.Configuration;
import org.springframework.test.context.TestPropertySource;
-import org.apache.isis.config.IsisPresets;
+import org.apache.isis.config.presets.IsisPresets;
import static org.junit.jupiter.api.Assertions.assertFalse;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroLdapTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroLdapTest.java
index 02c82af..3156cc8 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroLdapTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroLdapTest.java
@@ -31,7 +31,7 @@ import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.annotation.Import;
import org.apache.isis.applib.services.inject.ServiceInjector;
-import org.apache.isis.config.IsisPresets;
+import org.apache.isis.config.presets.IsisPresets;
import org.apache.isis.testdomain.Smoketest;
import org.apache.isis.testdomain.conf.Configuration_usingJdoAndShiro;
import org.apache.isis.testdomain.ldap.LdapConstants;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdapTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdapTest.java
index 9d49a7f..b983a71 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdapTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdapTest.java
@@ -26,14 +26,13 @@ import org.apache.shiro.authc.CredentialsException;
import org.apache.shiro.authc.DisabledAccountException;
import org.apache.shiro.authc.UsernamePasswordToken;
import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.annotation.Import;
import org.apache.isis.applib.services.inject.ServiceInjector;
-import org.apache.isis.config.IsisPresets;
+import org.apache.isis.config.presets.IsisPresets;
import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts;
import org.apache.isis.extensions.secman.api.SecurityModuleConfig;
import org.apache.isis.extensions.secman.api.role.ApplicationRoleRepository;
@@ -42,8 +41,6 @@ import org.apache.isis.extensions.secman.encryption.jbcrypt.IsisBootSecmanEncryp
import org.apache.isis.extensions.secman.jdo.IsisBootSecmanPersistenceJdo;
import org.apache.isis.extensions.secman.model.IsisBootSecmanModel;
import org.apache.isis.extensions.secman.shiro.IsisBootSecmanRealmShiro;
-import org.apache.isis.runtime.system.session.IsisSessionFactory;
-import org.apache.isis.security.shiro.WebModuleShiro;
import org.apache.isis.testdomain.Incubating;
import org.apache.isis.testdomain.Smoketest;
import org.apache.isis.testdomain.conf.Configuration_usingJdoAndShiro;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdap_restfulStressTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdap_restfulStressTest.java
index 994363a..20be472 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdap_restfulStressTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdap_restfulStressTest.java
@@ -28,7 +28,7 @@ import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.annotation.Import;
import org.apache.isis.applib.services.inject.ServiceInjector;
-import org.apache.isis.config.IsisPresets;
+import org.apache.isis.config.presets.IsisPresets;
import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts;
import org.apache.isis.extensions.secman.api.SecurityModuleConfig;
import org.apache.isis.extensions.secman.api.role.ApplicationRoleRepository;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/transactions/TransactionRollbackTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/transactions/TransactionRollbackTest.java
index 6d06abb..664fd76 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/transactions/TransactionRollbackTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/transactions/TransactionRollbackTest.java
@@ -27,7 +27,7 @@ import org.springframework.boot.test.context.SpringBootTest;
import org.apache.isis.applib.services.repository.RepositoryService;
import org.apache.isis.applib.services.xactn.TransactionService;
import org.apache.isis.commons.internal.exceptions._Exceptions;
-import org.apache.isis.config.IsisPresets;
+import org.apache.isis.config.presets.IsisPresets;
import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts;
import org.apache.isis.testdomain.Smoketest;
import org.apache.isis.testdomain.conf.Configuration_usingJdo;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/transactions/TransactionRollbackTest_usingTransactional.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/transactions/TransactionRollbackTest_usingTransactional.java
index 06608fb..ba65fdf 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/transactions/TransactionRollbackTest_usingTransactional.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/transactions/TransactionRollbackTest_usingTransactional.java
@@ -29,7 +29,7 @@ import org.springframework.test.annotation.Commit;
import org.springframework.transaction.annotation.Transactional;
import org.apache.isis.applib.services.repository.RepositoryService;
-import org.apache.isis.config.IsisPresets;
+import org.apache.isis.config.presets.IsisPresets;
import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts;
import org.apache.isis.testdomain.Smoketest;
import org.apache.isis.testdomain.conf.Configuration_usingJdo;
[isis] 01/06: ISIS-2213: moves all classes in isis-config under
o.a.i.config
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 23b72a94238cc644c29530c5e9ac07e4057635d8
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Dec 4 15:38:09 2019 +0000
ISIS-2213: moves all classes in isis-config under o.a.i.config
---
build-core.sh | 1 +
.../org/apache/isis/config/IsisConfigModule.java | 3 +--
.../org/apache/isis/config/IsisConfiguration.java | 22 +++++++++++-----------
.../facets}/AuditObjectsConfiguration.java | 2 +-
.../facets}/CommandActionsConfiguration.java | 2 +-
.../facets}/CommandPropertiesConfiguration.java | 2 +-
.../facets}/DefaultViewConfiguration.java | 2 +-
.../facets}/EditingObjectsConfiguration.java | 2 +-
.../facets}/PublishActionsConfiguration.java | 2 +-
.../facets}/PublishObjectsConfiguration.java | 2 +-
.../facets}/PublishPropertiesConfiguration.java | 2 +-
.../metamodel/facets}/Util.java | 2 +-
.../ApplicationFeaturesInitConfiguration.java | 2 +-
.../metamodel/specloader/IntrospectionMode.java | 2 +-
.../ui => config/viewer/wicket}/DialogMode.java | 2 +-
.../viewer/wicket}/WebAppConfiguration.java | 2 +-
.../command/CommandFacetForActionAnnotation.java | 1 +
.../PublishedActionFacetForActionAnnotation.java | 1 +
.../AuditableFacetForDomainObjectAnnotation.java | 1 +
.../ImmutableFacetForDomainObjectAnnotation.java | 1 +
...lishedObjectFacetForDomainObjectAnnotation.java | 1 +
.../command/CommandFacetForPropertyAnnotation.java | 1 +
...ublishedPropertyFacetForPropertyAnnotation.java | 1 +
.../ApplicationFeatureRepositoryDefault.java | 1 +
.../specloader/SpecificationLoaderDefault.java | 1 +
.../action/ActionAnnotationFacetFactoryTest.java | 4 ++--
.../ActionAnnotationFacetFactoryTest_Command.java | 2 +-
...ctionAnnotationFacetFactoryTest_Publishing.java | 2 +-
.../DomainObjectAnnotationFacetFactoryTest.java | 6 +++---
.../menubars/MenuBarsLoaderServiceDefault.java | 2 +-
.../wicket/ui/components/welcome/WelcomePanel.java | 2 +-
.../ui/components/widgets/favicon/Favicon.java | 2 +-
.../ui/components/widgets/navbar/BrandLogo.java | 2 +-
.../ui/components/widgets/navbar/BrandName.java | 2 +-
.../isis/viewer/wicket/ui/pages/PageAbstract.java | 2 +-
.../isis/viewer/wicket/ui/pages/WebPageBase.java | 2 +-
.../accmngt/signup/RegistrationFormPanel.java | 2 +-
.../isis/viewer/wicket/ui/panels/PanelBase.java | 2 +-
.../DomainModelTest_usingBadDomain.java | 2 +-
39 files changed, 52 insertions(+), 43 deletions(-)
diff --git a/build-core.sh b/build-core.sh
index cd5f4e0..1e13bab 100644
--- a/build-core.sh
+++ b/build-core.sh
@@ -1,3 +1,4 @@
#!/bin/bash
+export MVN_STAGES="install"
export BATCH_MODE_FLAG=off
sh scripts/ci/build-core.sh $*
\ No newline at end of file
diff --git a/core/config/src/main/java/org/apache/isis/config/IsisConfigModule.java b/core/config/src/main/java/org/apache/isis/config/IsisConfigModule.java
index 5405110..37e7cb0 100644
--- a/core/config/src/main/java/org/apache/isis/config/IsisConfigModule.java
+++ b/core/config/src/main/java/org/apache/isis/config/IsisConfigModule.java
@@ -28,11 +28,10 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import org.apache.isis.commons.internal.environment.IsisSystemEnvironment;
-import org.apache.isis.viewer.wicket.ui.WebAppConfiguration;
+import org.apache.isis.config.viewer.wicket.WebAppConfiguration;
@Configuration
@Import({
- //IsisConfiguration.class // not required
IsisConfiguration.PatternsConverter.class,
IsisSystemEnvironment.class,
WebAppConfiguration.class
diff --git a/core/config/src/main/java/org/apache/isis/config/IsisConfiguration.java b/core/config/src/main/java/org/apache/isis/config/IsisConfiguration.java
index fa6e47e..23540a0 100644
--- a/core/config/src/main/java/org/apache/isis/config/IsisConfiguration.java
+++ b/core/config/src/main/java/org/apache/isis/config/IsisConfiguration.java
@@ -44,17 +44,17 @@ import org.apache.isis.applib.services.i18n.TranslationService;
import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.commons.internal.collections._Maps;
-import org.apache.isis.metamodel.facets.actions.action.command.CommandActionsConfiguration;
-import org.apache.isis.metamodel.facets.actions.action.publishing.PublishActionsConfiguration;
-import org.apache.isis.metamodel.facets.object.domainobject.auditing.AuditObjectsConfiguration;
-import org.apache.isis.metamodel.facets.object.domainobject.auditing.DefaultViewConfiguration;
-import org.apache.isis.metamodel.facets.object.domainobject.editing.EditingObjectsConfiguration;
-import org.apache.isis.metamodel.facets.object.domainobject.publishing.PublishObjectsConfiguration;
-import org.apache.isis.metamodel.facets.properties.property.command.CommandPropertiesConfiguration;
-import org.apache.isis.metamodel.facets.properties.property.publishing.PublishPropertiesConfiguration;
-import org.apache.isis.metamodel.services.appfeat.ApplicationFeaturesInitConfiguration;
-import org.apache.isis.metamodel.specloader.IntrospectionMode;
-import org.apache.isis.viewer.wicket.ui.DialogMode;
+import org.apache.isis.config.metamodel.facets.CommandActionsConfiguration;
+import org.apache.isis.config.metamodel.facets.PublishActionsConfiguration;
+import org.apache.isis.config.metamodel.facets.AuditObjectsConfiguration;
+import org.apache.isis.config.metamodel.facets.DefaultViewConfiguration;
+import org.apache.isis.config.metamodel.facets.EditingObjectsConfiguration;
+import org.apache.isis.config.metamodel.facets.PublishObjectsConfiguration;
+import org.apache.isis.config.metamodel.facets.CommandPropertiesConfiguration;
+import org.apache.isis.config.metamodel.facets.PublishPropertiesConfiguration;
+import org.apache.isis.config.metamodel.services.ApplicationFeaturesInitConfiguration;
+import org.apache.isis.config.metamodel.specloader.IntrospectionMode;
+import org.apache.isis.config.viewer.wicket.DialogMode;
import lombok.Data;
diff --git a/core/config/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/auditing/AuditObjectsConfiguration.java b/core/config/src/main/java/org/apache/isis/config/metamodel/facets/AuditObjectsConfiguration.java
similarity index 93%
rename from core/config/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/auditing/AuditObjectsConfiguration.java
rename to core/config/src/main/java/org/apache/isis/config/metamodel/facets/AuditObjectsConfiguration.java
index cefc63f..46d5fff 100644
--- a/core/config/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/auditing/AuditObjectsConfiguration.java
+++ b/core/config/src/main/java/org/apache/isis/config/metamodel/facets/AuditObjectsConfiguration.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.metamodel.facets.object.domainobject.auditing;
+package org.apache.isis.config.metamodel.facets;
import org.apache.isis.config.IsisConfiguration;
diff --git a/core/config/src/main/java/org/apache/isis/metamodel/facets/actions/action/command/CommandActionsConfiguration.java b/core/config/src/main/java/org/apache/isis/config/metamodel/facets/CommandActionsConfiguration.java
similarity index 94%
rename from core/config/src/main/java/org/apache/isis/metamodel/facets/actions/action/command/CommandActionsConfiguration.java
rename to core/config/src/main/java/org/apache/isis/config/metamodel/facets/CommandActionsConfiguration.java
index fffb7db..a46be00 100644
--- a/core/config/src/main/java/org/apache/isis/metamodel/facets/actions/action/command/CommandActionsConfiguration.java
+++ b/core/config/src/main/java/org/apache/isis/config/metamodel/facets/CommandActionsConfiguration.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.metamodel.facets.actions.action.command;
+package org.apache.isis.config.metamodel.facets;
import org.apache.isis.config.IsisConfiguration;
diff --git a/core/config/src/main/java/org/apache/isis/metamodel/facets/properties/property/command/CommandPropertiesConfiguration.java b/core/config/src/main/java/org/apache/isis/config/metamodel/facets/CommandPropertiesConfiguration.java
similarity index 92%
rename from core/config/src/main/java/org/apache/isis/metamodel/facets/properties/property/command/CommandPropertiesConfiguration.java
rename to core/config/src/main/java/org/apache/isis/config/metamodel/facets/CommandPropertiesConfiguration.java
index 72b3b19..fac8729 100644
--- a/core/config/src/main/java/org/apache/isis/metamodel/facets/properties/property/command/CommandPropertiesConfiguration.java
+++ b/core/config/src/main/java/org/apache/isis/config/metamodel/facets/CommandPropertiesConfiguration.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.metamodel.facets.properties.property.command;
+package org.apache.isis.config.metamodel.facets;
public enum CommandPropertiesConfiguration {
ALL,
diff --git a/core/config/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/auditing/DefaultViewConfiguration.java b/core/config/src/main/java/org/apache/isis/config/metamodel/facets/DefaultViewConfiguration.java
similarity index 94%
rename from core/config/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/auditing/DefaultViewConfiguration.java
rename to core/config/src/main/java/org/apache/isis/config/metamodel/facets/DefaultViewConfiguration.java
index be11d80..f921ca0 100644
--- a/core/config/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/auditing/DefaultViewConfiguration.java
+++ b/core/config/src/main/java/org/apache/isis/config/metamodel/facets/DefaultViewConfiguration.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.metamodel.facets.object.domainobject.auditing;
+package org.apache.isis.config.metamodel.facets;
import org.apache.isis.config.IsisConfiguration;
diff --git a/core/config/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/editing/EditingObjectsConfiguration.java b/core/config/src/main/java/org/apache/isis/config/metamodel/facets/EditingObjectsConfiguration.java
similarity index 92%
rename from core/config/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/editing/EditingObjectsConfiguration.java
rename to core/config/src/main/java/org/apache/isis/config/metamodel/facets/EditingObjectsConfiguration.java
index e67a62e..8fc740c 100644
--- a/core/config/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/editing/EditingObjectsConfiguration.java
+++ b/core/config/src/main/java/org/apache/isis/config/metamodel/facets/EditingObjectsConfiguration.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.metamodel.facets.object.domainobject.editing;
+package org.apache.isis.config.metamodel.facets;
public enum EditingObjectsConfiguration {
TRUE,
diff --git a/core/config/src/main/java/org/apache/isis/metamodel/facets/actions/action/publishing/PublishActionsConfiguration.java b/core/config/src/main/java/org/apache/isis/config/metamodel/facets/PublishActionsConfiguration.java
similarity index 94%
rename from core/config/src/main/java/org/apache/isis/metamodel/facets/actions/action/publishing/PublishActionsConfiguration.java
rename to core/config/src/main/java/org/apache/isis/config/metamodel/facets/PublishActionsConfiguration.java
index 5e1bb3c..227cd36 100644
--- a/core/config/src/main/java/org/apache/isis/metamodel/facets/actions/action/publishing/PublishActionsConfiguration.java
+++ b/core/config/src/main/java/org/apache/isis/config/metamodel/facets/PublishActionsConfiguration.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.metamodel.facets.actions.action.publishing;
+package org.apache.isis.config.metamodel.facets;
import org.apache.isis.config.IsisConfiguration;
diff --git a/core/config/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/publishing/PublishObjectsConfiguration.java b/core/config/src/main/java/org/apache/isis/config/metamodel/facets/PublishObjectsConfiguration.java
similarity index 93%
rename from core/config/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/publishing/PublishObjectsConfiguration.java
rename to core/config/src/main/java/org/apache/isis/config/metamodel/facets/PublishObjectsConfiguration.java
index f0e8343..370d623 100644
--- a/core/config/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/publishing/PublishObjectsConfiguration.java
+++ b/core/config/src/main/java/org/apache/isis/config/metamodel/facets/PublishObjectsConfiguration.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.metamodel.facets.object.domainobject.publishing;
+package org.apache.isis.config.metamodel.facets;
import org.apache.isis.config.IsisConfiguration;
diff --git a/core/config/src/main/java/org/apache/isis/metamodel/facets/properties/property/publishing/PublishPropertiesConfiguration.java b/core/config/src/main/java/org/apache/isis/config/metamodel/facets/PublishPropertiesConfiguration.java
similarity index 92%
rename from core/config/src/main/java/org/apache/isis/metamodel/facets/properties/property/publishing/PublishPropertiesConfiguration.java
rename to core/config/src/main/java/org/apache/isis/config/metamodel/facets/PublishPropertiesConfiguration.java
index 1604c90..94ac649 100644
--- a/core/config/src/main/java/org/apache/isis/metamodel/facets/properties/property/publishing/PublishPropertiesConfiguration.java
+++ b/core/config/src/main/java/org/apache/isis/config/metamodel/facets/PublishPropertiesConfiguration.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.metamodel.facets.properties.property.publishing;
+package org.apache.isis.config.metamodel.facets;
public enum PublishPropertiesConfiguration {
ALL,
diff --git a/core/config/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/Util.java b/core/config/src/main/java/org/apache/isis/config/metamodel/facets/Util.java
similarity index 95%
rename from core/config/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/Util.java
rename to core/config/src/main/java/org/apache/isis/config/metamodel/facets/Util.java
index e9d299f..b758caa 100644
--- a/core/config/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/Util.java
+++ b/core/config/src/main/java/org/apache/isis/config/metamodel/facets/Util.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.metamodel.facets.object.domainobject;
+package org.apache.isis.config.metamodel.facets;
public final class Util {
diff --git a/core/config/src/main/java/org/apache/isis/metamodel/services/appfeat/ApplicationFeaturesInitConfiguration.java b/core/config/src/main/java/org/apache/isis/config/metamodel/services/ApplicationFeaturesInitConfiguration.java
similarity index 73%
rename from core/config/src/main/java/org/apache/isis/metamodel/services/appfeat/ApplicationFeaturesInitConfiguration.java
rename to core/config/src/main/java/org/apache/isis/config/metamodel/services/ApplicationFeaturesInitConfiguration.java
index be4f14d..fb09d92 100644
--- a/core/config/src/main/java/org/apache/isis/metamodel/services/appfeat/ApplicationFeaturesInitConfiguration.java
+++ b/core/config/src/main/java/org/apache/isis/config/metamodel/services/ApplicationFeaturesInitConfiguration.java
@@ -1,4 +1,4 @@
-package org.apache.isis.metamodel.services.appfeat;
+package org.apache.isis.config.metamodel.services;
public enum ApplicationFeaturesInitConfiguration {
EAGER,
diff --git a/core/config/src/main/java/org/apache/isis/metamodel/specloader/IntrospectionMode.java b/core/config/src/main/java/org/apache/isis/config/metamodel/specloader/IntrospectionMode.java
similarity index 97%
rename from core/config/src/main/java/org/apache/isis/metamodel/specloader/IntrospectionMode.java
rename to core/config/src/main/java/org/apache/isis/config/metamodel/specloader/IntrospectionMode.java
index efbdf60..b9bf8a1 100644
--- a/core/config/src/main/java/org/apache/isis/metamodel/specloader/IntrospectionMode.java
+++ b/core/config/src/main/java/org/apache/isis/config/metamodel/specloader/IntrospectionMode.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.metamodel.specloader;
+package org.apache.isis.config.metamodel.specloader;
import org.apache.isis.commons.internal.environment.DeploymentType;
import org.apache.isis.commons.internal.environment.IsisSystemEnvironment;
diff --git a/core/config/src/main/java/org/apache/isis/viewer/wicket/ui/DialogMode.java b/core/config/src/main/java/org/apache/isis/config/viewer/wicket/DialogMode.java
similarity index 95%
rename from core/config/src/main/java/org/apache/isis/viewer/wicket/ui/DialogMode.java
rename to core/config/src/main/java/org/apache/isis/config/viewer/wicket/DialogMode.java
index 107e6cf..cb32dc1 100644
--- a/core/config/src/main/java/org/apache/isis/viewer/wicket/ui/DialogMode.java
+++ b/core/config/src/main/java/org/apache/isis/config/viewer/wicket/DialogMode.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.wicket.ui;
+package org.apache.isis.config.viewer.wicket;
public enum DialogMode {
diff --git a/core/config/src/main/java/org/apache/isis/viewer/wicket/ui/WebAppConfiguration.java b/core/config/src/main/java/org/apache/isis/config/viewer/wicket/WebAppConfiguration.java
similarity index 98%
rename from core/config/src/main/java/org/apache/isis/viewer/wicket/ui/WebAppConfiguration.java
rename to core/config/src/main/java/org/apache/isis/config/viewer/wicket/WebAppConfiguration.java
index 62812a0..d6f88b6 100644
--- a/core/config/src/main/java/org/apache/isis/viewer/wicket/ui/WebAppConfiguration.java
+++ b/core/config/src/main/java/org/apache/isis/config/viewer/wicket/WebAppConfiguration.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.wicket.ui;
+package org.apache.isis.config.viewer.wicket;
import java.util.Optional;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/command/CommandFacetForActionAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/command/CommandFacetForActionAnnotation.java
index c44ab7d..65cd948 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/command/CommandFacetForActionAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/command/CommandFacetForActionAnnotation.java
@@ -27,6 +27,7 @@ import org.apache.isis.applib.annotation.CommandReification;
import org.apache.isis.applib.services.command.CommandDtoProcessor;
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.metamodel.facets.CommandActionsConfiguration;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.actions.command.CommandFacet;
import org.apache.isis.metamodel.facets.actions.command.CommandFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/publishing/PublishedActionFacetForActionAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/publishing/PublishedActionFacetForActionAnnotation.java
index c5ec65f..af04ddc 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/publishing/PublishedActionFacetForActionAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/publishing/PublishedActionFacetForActionAnnotation.java
@@ -24,6 +24,7 @@ import java.util.Optional;
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.Publishing;
import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.metamodel.facets.PublishActionsConfiguration;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.actions.publish.PublishedActionFacet;
import org.apache.isis.metamodel.facets.actions.publish.PublishedActionFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/auditing/AuditableFacetForDomainObjectAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/auditing/AuditableFacetForDomainObjectAnnotation.java
index dff66fa..fe55eb9 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/auditing/AuditableFacetForDomainObjectAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/auditing/AuditableFacetForDomainObjectAnnotation.java
@@ -24,6 +24,7 @@ import java.util.Optional;
import org.apache.isis.applib.annotation.Auditing;
import org.apache.isis.commons.internal.exceptions._Exceptions;
import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.metamodel.facets.AuditObjectsConfiguration;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.object.audit.AuditableFacet;
import org.apache.isis.metamodel.facets.object.audit.AuditableFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/editing/ImmutableFacetForDomainObjectAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/editing/ImmutableFacetForDomainObjectAnnotation.java
index 2c17f1c..00bc18c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/editing/ImmutableFacetForDomainObjectAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/editing/ImmutableFacetForDomainObjectAnnotation.java
@@ -26,6 +26,7 @@ import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.commons.internal.exceptions._Exceptions;
import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.metamodel.facets.EditingObjectsConfiguration;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facetapi.FacetUtil;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/publishing/PublishedObjectFacetForDomainObjectAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/publishing/PublishedObjectFacetForDomainObjectAnnotation.java
index 6d58354..ef70659 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/publishing/PublishedObjectFacetForDomainObjectAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/publishing/PublishedObjectFacetForDomainObjectAnnotation.java
@@ -23,6 +23,7 @@ import java.util.Optional;
import org.apache.isis.applib.annotation.Publishing;
import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.metamodel.facets.PublishObjectsConfiguration;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.object.publishedobject.PublishedObjectFacet;
import org.apache.isis.metamodel.facets.object.publishedobject.PublishedObjectFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/property/command/CommandFacetForPropertyAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/property/command/CommandFacetForPropertyAnnotation.java
index 7b1a903..db730cb 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/property/command/CommandFacetForPropertyAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/property/command/CommandFacetForPropertyAnnotation.java
@@ -27,6 +27,7 @@ import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.services.command.CommandDtoProcessor;
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.metamodel.facets.CommandPropertiesConfiguration;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.actions.action.command.CommandFacetFromConfiguration;
import org.apache.isis.metamodel.facets.actions.command.CommandFacet;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/property/publishing/PublishedPropertyFacetForPropertyAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/property/publishing/PublishedPropertyFacetForPropertyAnnotation.java
index 0826ae5..1dfa513 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/property/publishing/PublishedPropertyFacetForPropertyAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/property/publishing/PublishedPropertyFacetForPropertyAnnotation.java
@@ -24,6 +24,7 @@ import java.util.Optional;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.Publishing;
import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.metamodel.facets.PublishPropertiesConfiguration;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.properties.publish.PublishedPropertyFacet;
import org.apache.isis.metamodel.facets.properties.publish.PublishedPropertyFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java
index b179fb4..9f4b848 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java
@@ -29,6 +29,7 @@ import java.util.stream.Collectors;
import javax.annotation.PostConstruct;
import javax.inject.Inject;
+import org.apache.isis.config.metamodel.services.ApplicationFeaturesInitConfiguration;
import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.SemanticsOf;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/SpecificationLoaderDefault.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/SpecificationLoaderDefault.java
index ff7e1d4..a940955 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/SpecificationLoaderDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/SpecificationLoaderDefault.java
@@ -37,6 +37,7 @@ import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.commons.internal.environment.IsisSystemEnvironment;
import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.config.beans.IsisBeanTypeRegistryHolder;
+import org.apache.isis.config.metamodel.specloader.IntrospectionMode;
import org.apache.isis.config.registry.types.IsisBeanTypeRegistry;
import org.apache.isis.metamodel.MetaModelContext;
import org.apache.isis.metamodel.facetapi.Facet;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest.java
index 22809e7..7c3f838 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest.java
@@ -29,8 +29,8 @@ import org.junit.Before;
import org.apache.isis.applib.services.HasUniqueId;
import org.apache.isis.metamodel.facets.AbstractFacetFactoryJUnit4TestCase;
-import org.apache.isis.metamodel.facets.actions.action.command.CommandActionsConfiguration;
-import org.apache.isis.metamodel.facets.actions.action.publishing.PublishActionsConfiguration;
+import org.apache.isis.config.metamodel.facets.CommandActionsConfiguration;
+import org.apache.isis.config.metamodel.facets.PublishActionsConfiguration;
import org.apache.isis.metamodel.facets.object.domainobject.domainevents.ActionDomainEventDefaultFacetForDomainObjectAnnotation;
import org.apache.isis.metamodel.spec.ObjectSpecification;
import org.apache.isis.security.authentication.AuthenticationSessionProvider;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Command.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Command.java
index 021988e..d047883 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Command.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Command.java
@@ -29,7 +29,7 @@ import org.apache.isis.applib.annotation.CommandReification;
import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facets.FacetFactory.ProcessMethodContext;
-import org.apache.isis.metamodel.facets.actions.action.command.CommandActionsConfiguration;
+import org.apache.isis.config.metamodel.facets.CommandActionsConfiguration;
import org.apache.isis.metamodel.facets.actions.action.command.CommandFacetForActionAnnotation;
import org.apache.isis.metamodel.facets.actions.action.command.CommandFacetForActionAnnotationAsConfigured;
import org.apache.isis.metamodel.facets.actions.action.command.CommandFacetFromConfiguration;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Publishing.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Publishing.java
index 2f35504..d604ef5 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Publishing.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Publishing.java
@@ -27,7 +27,7 @@ import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.commons.internal.base._Blackhole;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facets.FacetFactory.ProcessMethodContext;
-import org.apache.isis.metamodel.facets.actions.action.publishing.PublishActionsConfiguration;
+import org.apache.isis.config.metamodel.facets.PublishActionsConfiguration;
import org.apache.isis.metamodel.facets.actions.action.publishing.PublishedActionFacetForActionAnnotation;
import org.apache.isis.metamodel.facets.actions.action.publishing.PublishedActionFacetFromConfiguration;
import org.apache.isis.metamodel.facets.actions.publish.PublishedActionFacet;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java
index 8bfe0b3..0d00064 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java
@@ -36,17 +36,17 @@ import org.apache.isis.metamodel.facets.FacetFactory.ProcessClassContext;
import org.apache.isis.metamodel.facets.ObjectSpecIdFacetFactory.ProcessObjectSpecIdContext;
import org.apache.isis.metamodel.facets.object.audit.AuditableFacet;
import org.apache.isis.metamodel.facets.object.autocomplete.AutoCompleteFacet;
-import org.apache.isis.metamodel.facets.object.domainobject.auditing.AuditObjectsConfiguration;
+import org.apache.isis.config.metamodel.facets.AuditObjectsConfiguration;
import org.apache.isis.metamodel.facets.object.domainobject.auditing.AuditableFacetForDomainObjectAnnotation;
import org.apache.isis.metamodel.facets.object.domainobject.auditing.AuditableFacetForDomainObjectAnnotationAsConfigured;
import org.apache.isis.metamodel.facets.object.domainobject.auditing.AuditableFacetFromConfiguration;
import org.apache.isis.metamodel.facets.object.domainobject.autocomplete.AutoCompleteFacetForDomainObjectAnnotation;
import org.apache.isis.metamodel.facets.object.domainobject.choices.ChoicesFacetForDomainObjectAnnotation;
-import org.apache.isis.metamodel.facets.object.domainobject.editing.EditingObjectsConfiguration;
+import org.apache.isis.config.metamodel.facets.EditingObjectsConfiguration;
import org.apache.isis.metamodel.facets.object.domainobject.editing.ImmutableFacetForDomainObjectAnnotation;
import org.apache.isis.metamodel.facets.object.domainobject.editing.ImmutableFacetFromConfiguration;
import org.apache.isis.metamodel.facets.object.domainobject.objectspecid.ObjectSpecIdFacetForDomainObjectAnnotation;
-import org.apache.isis.metamodel.facets.object.domainobject.publishing.PublishObjectsConfiguration;
+import org.apache.isis.config.metamodel.facets.PublishObjectsConfiguration;
import org.apache.isis.metamodel.facets.object.domainobject.publishing.PublishedObjectFacetForDomainObjectAnnotation;
import org.apache.isis.metamodel.facets.object.domainobject.publishing.PublishedObjectFacetFromConfiguration;
import org.apache.isis.metamodel.facets.object.domainobject.recreatable.RecreatableObjectFacetForDomainObjectAnnotation;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/menubars/MenuBarsLoaderServiceDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/menubars/MenuBarsLoaderServiceDefault.java
index 736aefd..83f8883 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/menubars/MenuBarsLoaderServiceDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/menubars/MenuBarsLoaderServiceDefault.java
@@ -32,7 +32,7 @@ import org.apache.isis.applib.services.jaxb.JaxbService;
import org.apache.isis.applib.services.menu.MenuBarsLoaderService;
import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.commons.internal.environment.IsisSystemEnvironment;
-import org.apache.isis.viewer.wicket.ui.WebAppConfiguration;
+import org.apache.isis.config.viewer.wicket.WebAppConfiguration;
import lombok.val;
import lombok.extern.log4j.Log4j2;
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/welcome/WelcomePanel.java b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/welcome/WelcomePanel.java
index 700f50b..87082cd 100644
--- a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/welcome/WelcomePanel.java
+++ b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/welcome/WelcomePanel.java
@@ -24,7 +24,7 @@ import javax.inject.Inject;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.isis.viewer.wicket.model.models.WelcomeModel;
-import org.apache.isis.viewer.wicket.ui.WebAppConfiguration;
+import org.apache.isis.config.viewer.wicket.WebAppConfiguration;
import org.apache.isis.viewer.wicket.ui.pages.home.HomePage;
import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/favicon/Favicon.java b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/favicon/Favicon.java
index da4ac6f..34da2c0 100644
--- a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/favicon/Favicon.java
+++ b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/favicon/Favicon.java
@@ -24,7 +24,7 @@ import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.html.WebComponent;
import org.apache.wicket.util.string.Strings;
-import org.apache.isis.viewer.wicket.ui.WebAppConfiguration;
+import org.apache.isis.config.viewer.wicket.WebAppConfiguration;
/**
* A component for application favorite icon
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/navbar/BrandLogo.java b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/navbar/BrandLogo.java
index e4cc2b5..5e7518b 100644
--- a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/navbar/BrandLogo.java
+++ b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/navbar/BrandLogo.java
@@ -23,7 +23,7 @@ import javax.inject.Inject;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.html.WebComponent;
-import org.apache.isis.viewer.wicket.ui.WebAppConfiguration;
+import org.apache.isis.config.viewer.wicket.WebAppConfiguration;
/**
* A component used as a brand logo in the top-left corner of the navigation bar
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/navbar/BrandName.java b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/navbar/BrandName.java
index 5b34ff5..377c1b1 100644
--- a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/navbar/BrandName.java
+++ b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/navbar/BrandName.java
@@ -23,7 +23,7 @@ import javax.inject.Inject;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.model.Model;
-import org.apache.isis.viewer.wicket.ui.WebAppConfiguration;
+import org.apache.isis.config.viewer.wicket.WebAppConfiguration;
/**
* A component used as a brand logo in the top-left corner of the navigation bar
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
index 1d9cd4a..ff8b5c0 100644
--- a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
+++ b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
@@ -75,7 +75,7 @@ import org.apache.isis.viewer.wicket.model.models.EntityModel;
import org.apache.isis.viewer.wicket.model.models.PageType;
import org.apache.isis.viewer.wicket.ui.ComponentFactory;
import org.apache.isis.viewer.wicket.ui.ComponentType;
-import org.apache.isis.viewer.wicket.ui.DialogMode;
+import org.apache.isis.config.viewer.wicket.DialogMode;
import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistry;
import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistryAccessor;
import org.apache.isis.viewer.wicket.ui.components.actionprompt.ActionPromptModalWindow;
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/WebPageBase.java b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/WebPageBase.java
index 5be8994..5131de4 100644
--- a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/WebPageBase.java
+++ b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/WebPageBase.java
@@ -24,7 +24,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.isis.runtime.system.session.IsisSessionFactory;
import org.apache.isis.viewer.wicket.model.common.CommonContextUtils;
-import org.apache.isis.viewer.wicket.ui.WebAppConfiguration;
+import org.apache.isis.config.viewer.wicket.WebAppConfiguration;
import org.apache.isis.webapp.context.IsisWebAppCommonContext;
/**
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/signup/RegistrationFormPanel.java b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/signup/RegistrationFormPanel.java
index 3f51944..b6abbe8 100644
--- a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/signup/RegistrationFormPanel.java
+++ b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/signup/RegistrationFormPanel.java
@@ -35,7 +35,7 @@ import org.apache.wicket.validation.validator.EmailAddressValidator;
import org.apache.isis.applib.services.userreg.EmailNotificationService;
import org.apache.isis.applib.services.userreg.events.EmailRegistrationEvent;
import org.apache.isis.viewer.wicket.model.models.PageType;
-import org.apache.isis.viewer.wicket.ui.WebAppConfiguration;
+import org.apache.isis.config.viewer.wicket.WebAppConfiguration;
import org.apache.isis.viewer.wicket.ui.components.widgets.bootstrap.FormGroup;
import org.apache.isis.viewer.wicket.ui.pages.EmailVerificationUrlService;
import org.apache.isis.viewer.wicket.ui.pages.PageNavigationService;
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelBase.java b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelBase.java
index 378ff4b..73afb0e 100644
--- a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelBase.java
+++ b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelBase.java
@@ -34,7 +34,7 @@ import org.apache.isis.viewer.wicket.model.common.CommonContextUtils;
import org.apache.isis.viewer.wicket.model.hints.UiHintContainer;
import org.apache.isis.viewer.wicket.model.isis.WicketViewerSettings;
import org.apache.isis.viewer.wicket.model.models.ImageResourceCache;
-import org.apache.isis.viewer.wicket.ui.WebAppConfiguration;
+import org.apache.isis.config.viewer.wicket.WebAppConfiguration;
import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistry;
import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistryAccessor;
import org.apache.isis.viewer.wicket.ui.components.tree.themes.TreeThemeProvider;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingBadDomain.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingBadDomain.java
index 69b12c8..b091489 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingBadDomain.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingBadDomain.java
@@ -30,7 +30,7 @@ import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.config.IsisPresets;
import org.apache.isis.integtestsupport.validate.ValidateDomainModel;
import org.apache.isis.metamodel.spec.DomainModelException;
-import org.apache.isis.metamodel.specloader.IntrospectionMode;
+import org.apache.isis.config.metamodel.specloader.IntrospectionMode;
import org.apache.isis.metamodel.specloader.SpecificationLoader;
import org.apache.isis.testdomain.Smoketest;
import org.apache.isis.testdomain.conf.Configuration_headless;
[isis] 03/06: ISIS-2213: slims down ConfigurationConstants
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 5ee0d14e86bc6d222ce91fa1dd0d3c8e23176f41
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Dec 4 15:59:01 2019 +0000
ISIS-2213: slims down ConfigurationConstants
---
.../apache/isis/config/ConfigurationConstants.java | 45 ++--------------------
.../ConfigUtil.java} | 38 +++++-------------
.../ConfigUtil_isProtected_Test.java} | 33 ++++++++--------
.../ConfigUtil_mask_Test.java} | 13 ++++---
.../confmenu/ConfigurationViewServiceDefault.java | 8 ++--
5 files changed, 41 insertions(+), 96 deletions(-)
diff --git a/core/config/src/main/java/org/apache/isis/config/ConfigurationConstants.java b/core/config/src/main/java/org/apache/isis/config/ConfigurationConstants.java
index 11bf3f3..c9780bc 100644
--- a/core/config/src/main/java/org/apache/isis/config/ConfigurationConstants.java
+++ b/core/config/src/main/java/org/apache/isis/config/ConfigurationConstants.java
@@ -19,6 +19,8 @@
package org.apache.isis.config;
+import lombok.experimental.UtilityClass;
+
import java.util.List;
import java.util.Map;
import java.util.function.Supplier;
@@ -26,6 +28,7 @@ import java.util.function.Supplier;
import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.commons.internal.collections._Lists;
+@UtilityClass
public final class ConfigurationConstants {
public static final String LIST_SEPARATOR = ",";
@@ -33,49 +36,7 @@ public final class ConfigurationConstants {
public static final String ROOT_PREFIX = "isis";
public static final String ROOT = ROOT_PREFIX + DELIMITER;
-// public static final String DEFAULT_CONFIG_DIRECTORY = "config";
- public static final String WEBINF_DIRECTORY = "WEB-INF";
-// public static final String WEBINF_FULL_DIRECTORY = "src/main/webapp/" + WEBINF_DIRECTORY;
-
-// public static final String DEFAULT_CONFIG_FILE = "isis.properties";
-// public static final String WEB_CONFIG_FILE = "web.properties";
-
public static final List<String> PROTECTED_KEYS =
_Lists.of("password", "apiKey", "authToken");
- public static String maskIfProtected(final String key, final String value) {
- return isProtected(key) ? "********" : value;
- }
-
- public static Map<String, String> maskIfProtected(
- final Map<String, String> inMap,
- final Supplier<Map<String, String>> mapFactory) {
- final Map<String, String> result = mapFactory.get();
-
- inMap.forEach((k, v)->{
- result.put(k, maskIfProtected(k, v));
- });
-
- return result;
- }
-
- // -- HELPER
-
- private ConfigurationConstants() {}
-
- static boolean isProtected(final String key) {
- if(_Strings.isNullOrEmpty(key)) {
- return false;
- }
- final String toLowerCase = key.toLowerCase();
- for (String protectedKey : ConfigurationConstants.PROTECTED_KEYS) {
- if(toLowerCase.contains(protectedKey.toLowerCase())) {
- return true;
- }
- }
- return false;
- }
-
-
-
}
diff --git a/core/config/src/main/java/org/apache/isis/config/ConfigurationConstants.java b/core/config/src/main/java/org/apache/isis/config/util/ConfigUtil.java
similarity index 65%
copy from core/config/src/main/java/org/apache/isis/config/ConfigurationConstants.java
copy to core/config/src/main/java/org/apache/isis/config/util/ConfigUtil.java
index 11bf3f3..0a518b9 100644
--- a/core/config/src/main/java/org/apache/isis/config/ConfigurationConstants.java
+++ b/core/config/src/main/java/org/apache/isis/config/util/ConfigUtil.java
@@ -16,39 +16,21 @@
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.isis.config.util;
-package org.apache.isis.config;
+import lombok.experimental.UtilityClass;
-import java.util.List;
import java.util.Map;
import java.util.function.Supplier;
import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.config.ConfigurationConstants;
-public final class ConfigurationConstants {
-
- public static final String LIST_SEPARATOR = ",";
- public static final String DELIMITER = ".";
- public static final String ROOT_PREFIX = "isis";
- public static final String ROOT = ROOT_PREFIX + DELIMITER;
-
-// public static final String DEFAULT_CONFIG_DIRECTORY = "config";
- public static final String WEBINF_DIRECTORY = "WEB-INF";
-// public static final String WEBINF_FULL_DIRECTORY = "src/main/webapp/" + WEBINF_DIRECTORY;
-
-// public static final String DEFAULT_CONFIG_FILE = "isis.properties";
-// public static final String WEB_CONFIG_FILE = "web.properties";
-
- public static final List<String> PROTECTED_KEYS =
- _Lists.of("password", "apiKey", "authToken");
-
- public static String maskIfProtected(final String key, final String value) {
- return isProtected(key) ? "********" : value;
- }
+@UtilityClass
+public class ConfigUtil {
public static Map<String, String> maskIfProtected(
- final Map<String, String> inMap,
+ final Map<String, String> inMap,
final Supplier<Map<String, String>> mapFactory) {
final Map<String, String> result = mapFactory.get();
@@ -59,9 +41,9 @@ public final class ConfigurationConstants {
return result;
}
- // -- HELPER
-
- private ConfigurationConstants() {}
+ public static String maskIfProtected(final String key, final String value) {
+ return isProtected(key) ? "********" : value;
+ }
static boolean isProtected(final String key) {
if(_Strings.isNullOrEmpty(key)) {
@@ -76,6 +58,4 @@ public final class ConfigurationConstants {
return false;
}
-
-
}
diff --git a/core/config/src/test/java/org/apache/isis/config/ConfigurationConstants_isProtected_Test.java b/core/config/src/test/java/org/apache/isis/config/util/ConfigUtil_isProtected_Test.java
similarity index 53%
rename from core/config/src/test/java/org/apache/isis/config/ConfigurationConstants_isProtected_Test.java
rename to core/config/src/test/java/org/apache/isis/config/util/ConfigUtil_isProtected_Test.java
index 8fa7333..cd7862c 100644
--- a/core/config/src/test/java/org/apache/isis/config/ConfigurationConstants_isProtected_Test.java
+++ b/core/config/src/test/java/org/apache/isis/config/util/ConfigUtil_isProtected_Test.java
@@ -16,51 +16,52 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.config;
+package org.apache.isis.config.util;
+import org.apache.isis.config.ConfigurationConstants;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-public class ConfigurationConstants_isProtected_Test {
+public class ConfigUtil_isProtected_Test {
@Test
public void null_is_not() {
- assertFalse(ConfigurationConstants.isProtected(null));
+ assertFalse(ConfigUtil.isProtected(null));
- assertEquals("xxx", ConfigurationConstants.maskIfProtected(null, "xxx"));
+ assertEquals("xxx", ConfigUtil.maskIfProtected(null, "xxx"));
}
@Test
public void empty_is_not() {
- assertFalse(ConfigurationConstants.isProtected(""));
+ assertFalse(ConfigUtil.isProtected(""));
}
@Test
public void password_is() {
- assertTrue(ConfigurationConstants.isProtected("foo.PassWord.bar"));
- assertTrue(ConfigurationConstants.isProtected("password.bar"));
- assertTrue(ConfigurationConstants.isProtected("foo.PASSWORD"));
+ assertTrue(ConfigUtil.isProtected("foo.PassWord.bar"));
+ assertTrue(ConfigUtil.isProtected("password.bar"));
+ assertTrue(ConfigUtil.isProtected("foo.PASSWORD"));
- assertEquals("********", ConfigurationConstants.maskIfProtected("password", "xxx"));
+ assertEquals("********", ConfigUtil.maskIfProtected("password", "xxx"));
}
@Test
public void apiKey_is() {
- assertTrue(ConfigurationConstants.isProtected("foo.apiKey.bar"));
- assertTrue(ConfigurationConstants.isProtected("APIKEY.bar"));
- assertTrue(ConfigurationConstants.isProtected("foo.apikey"));
+ assertTrue(ConfigUtil.isProtected("foo.apiKey.bar"));
+ assertTrue(ConfigUtil.isProtected("APIKEY.bar"));
+ assertTrue(ConfigUtil.isProtected("foo.apikey"));
}
@Test
public void authToken_is() {
- assertTrue(ConfigurationConstants.isProtected("foo.authToken.bar"));
- assertTrue(ConfigurationConstants.isProtected("AUTHTOKEN.bar"));
- assertTrue(ConfigurationConstants.isProtected("foo.authtoken"));
+ assertTrue(ConfigUtil.isProtected("foo.authToken.bar"));
+ assertTrue(ConfigUtil.isProtected("AUTHTOKEN.bar"));
+ assertTrue(ConfigUtil.isProtected("foo.authtoken"));
}
@Test
public void otherwise_is_not() {
- assertFalse(ConfigurationConstants.isProtected("foo"));
+ assertFalse(ConfigUtil.isProtected("foo"));
}
}
\ No newline at end of file
diff --git a/core/config/src/test/java/org/apache/isis/config/ConfigurationConstants_mask_Test.java b/core/config/src/test/java/org/apache/isis/config/util/ConfigUtil_mask_Test.java
similarity index 70%
rename from core/config/src/test/java/org/apache/isis/config/ConfigurationConstants_mask_Test.java
rename to core/config/src/test/java/org/apache/isis/config/util/ConfigUtil_mask_Test.java
index 70abf68..7732d3f 100644
--- a/core/config/src/test/java/org/apache/isis/config/ConfigurationConstants_mask_Test.java
+++ b/core/config/src/test/java/org/apache/isis/config/util/ConfigUtil_mask_Test.java
@@ -16,34 +16,35 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.config;
+package org.apache.isis.config.util;
+import org.apache.isis.config.ConfigurationConstants;
import org.junit.Test;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.is;
import static org.junit.Assert.assertThat;
-public class ConfigurationConstants_mask_Test {
+public class ConfigUtil_mask_Test {
@Test
public void not_a_password() {
- assertThat(ConfigurationConstants.maskIfProtected("foo", "bar"), is(equalTo("bar")));
+ assertThat(ConfigUtil.maskIfProtected("foo", "bar"), is(equalTo("bar")));
}
@Test
public void a_password() {
- assertThat(ConfigurationConstants.maskIfProtected("xyz.password.abc", "bar"), is(equalTo("********")));
+ assertThat(ConfigUtil.maskIfProtected("xyz.password.abc", "bar"), is(equalTo("********")));
}
@Test
public void a_PassWord() {
- assertThat(ConfigurationConstants.maskIfProtected("xyz.PassWord.abc", "bar"), is(equalTo("********")));
+ assertThat(ConfigUtil.maskIfProtected("xyz.PassWord.abc", "bar"), is(equalTo("********")));
}
@Test
public void is_null() {
- assertThat(ConfigurationConstants.maskIfProtected(null, "bar"), is(equalTo("bar")));
+ assertThat(ConfigUtil.maskIfProtected(null, "bar"), is(equalTo("bar")));
}
}
\ No newline at end of file
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/confmenu/ConfigurationViewServiceDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/confmenu/ConfigurationViewServiceDefault.java
index 868da79..6d36274 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/confmenu/ConfigurationViewServiceDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/confmenu/ConfigurationViewServiceDefault.java
@@ -35,6 +35,7 @@ import org.apache.isis.commons.internal.collections._Maps;
import org.apache.isis.commons.internal.environment.IsisSystemEnvironment;
import org.apache.isis.config.ConfigurationConstants;
import org.apache.isis.config.IsisConfiguration;
+import org.apache.isis.config.util.ConfigUtil;
import lombok.val;
import lombok.extern.log4j.Log4j2;
@@ -112,11 +113,12 @@ public class ConfigurationViewServiceDefault implements ConfigurationViewService
private static void add(String key, String value, Map<String, ConfigurationProperty> map) {
- value = ConfigurationConstants.maskIfProtected(key, value);
+ value = ConfigUtil.maskIfProtected(key, value);
map.put(key, new ConfigurationProperty(key, value));
}
-
-
+
+
+
}
[isis] 06/06: ISIS-2213: removes stale import and comments
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 3be903a0b175bff20fbe8f4646f701cf21be07e2
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Dec 4 17:23:02 2019 +0000
ISIS-2213: removes stale import and comments
---
.../server/auth/AuthenticationSessionStrategyDefault.java | 7 -------
1 file changed, 7 deletions(-)
diff --git a/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/auth/AuthenticationSessionStrategyDefault.java b/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/auth/AuthenticationSessionStrategyDefault.java
index 2e407e8..b32f40a 100644
--- a/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/auth/AuthenticationSessionStrategyDefault.java
+++ b/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/auth/AuthenticationSessionStrategyDefault.java
@@ -23,7 +23,6 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
-import org.apache.isis.config.WebAppConstants;
import org.apache.isis.security.authentication.AuthenticationSession;
import lombok.val;
@@ -40,12 +39,6 @@ import lombok.val;
* {@link AuthenticationSessionStrategyDefault#HTTP_SESSION_AUTHENTICATION_SESSION_KEY}</li>
* </ul>
*
- * @implNote prior to version 2.0 ... failing that, if a {@link LogonFixture} has been provided and not already
- * used, will provide a session for that fixture. The {@link HttpSession} also
- * stores the value
- * {@link WebAppConstants#HTTP_SESSION_LOGGED_ON_PREVIOUSLY_USING_LOGON_FIXTURE_KEY}
- * in the session to track whether this has been done</li>
- *
*/
public class AuthenticationSessionStrategyDefault extends AuthenticationSessionStrategyAbstract {