You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2020/01/10 18:35:31 UTC
[isis] 06/14: ISIS-2259: updates packages for isis-core-webapp
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 02836073ad26d949fa45e540845c2ca67b4e40dd
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 15:50:19 2020 +0000
ISIS-2259: updates packages for isis-core-webapp
---
antora/playbooks/site-core.yml | 2 +-
antora/playbooks/site.yml | 2 +-
core/unittestsupport/pom.xml | 4 ++--
core/webapp/pom.xml | 2 +-
.../org/apache/isis/{ => core}/webapp/IsisModuleWebapp.java | 10 +++++-----
.../{ => core}/webapp/context/IsisWebAppCommonContext.java | 6 +++---
.../isis/{ => core}/webapp/context/memento/ObjectMemento.java | 2 +-
.../webapp/context/memento/ObjectMementoCollection.java | 2 +-
.../webapp/context/memento/ObjectMementoService.java | 2 +-
.../webapp/diagnostics/IsisLogOnExceptionFilter.java | 2 +-
.../webapp/health/HealthIndicatorUsingHealthCheckService.java | 2 +-
.../org/apache/isis/{ => core}/webapp/modules/WebModule.java | 4 ++--
.../isis/{ => core}/webapp/modules/WebModuleAbstract.java | 2 +-
.../isis/{ => core}/webapp/modules/WebModuleContext.java | 2 +-
.../webapp/modules/logonlog/WebModuleLogOnExceptionLogger.java | 6 +++---
.../modules/templresources/TemplateResourceCachingFilter.java | 2 +-
.../webapp/modules/templresources/TemplateResourceServlet.java | 2 +-
.../TemplateResourceServlet_HtmlTemplateVariables.java | 2 +-
.../modules/templresources/WebModuleTemplateResources.java | 4 ++--
.../isis/{ => core}/webapp/routing/ForwardingServlet.java | 2 +-
.../apache/isis/{ => core}/webapp/routing/RedirectFilter.java | 2 +-
.../apache/isis/{ => core}/webapp/routing/RedirectServlet.java | 2 +-
.../isis/{ => core}/webapp/routing/RedirectToDocsFilter.java | 4 ++--
.../webapp/webappctx/IsisWebAppContextInitializer.java | 8 ++++----
.../webapp/wormhole/AuthenticationSessionWormhole.java | 2 +-
examples/demo/src/main/resources/application.yml | 2 +-
.../scripts/IsisModuleSecurityFixtureRoleAndPermissions.java | 2 +-
.../extensions/shirorealmldap/realm/impl/IsisLdapRealm.java | 8 ++++----
.../isis/extensions/cors/impl/webmodule/WebModuleCors.java | 2 +-
.../isis/security/keycloak/IsisModuleSecurityKeycloak.java | 2 +-
.../keycloak/authentication/AuthenticatorKeycloak.java | 2 +-
.../isis/security/keycloak/webmodule/KeycloakFilter.java | 2 +-
.../isis/security/keycloak/webmodule/WebModuleKeycloak.java | 2 +-
.../apache/isis/security/shiro/IsisModuleSecurityShiro.java | 2 +-
.../apache/isis/security/shiro/webmodule/WebModuleShiro.java | 4 ++--
starters/src/main/doc/modules/simpleapp/pages/about.adoc | 2 +-
.../testing/fixtures/applib/modules/ModuleWithFixtures.java | 4 ++--
.../testing/h2console/ui/IsisModuleTestingH2ConsoleUi.java | 2 +-
.../testing/h2console/ui/webmodule/WebModuleH2Console.java | 4 ++--
.../isis/extensions/hsqldbmgr/dom/IsisModuleExtHsqldbMgr.java | 2 +-
.../valuetypes/sse/ui/webmodule/WebModuleServerSentEvents.java | 2 +-
.../jaxrsresteasy4/webmodule/WebModuleJaxrsResteasy4.java | 4 ++--
.../restfulobjects/viewer/IsisModuleRestfulObjectsViewer.java | 2 +-
.../viewer/webmodule/IsisRestfulObjectsSessionFilter.java | 4 ++--
.../apache/isis/viewer/wicket/model/IsisModuleWicketModel.java | 2 +-
.../isis/viewer/wicket/model/common/CommonContextUtils.java | 2 +-
.../org/apache/isis/viewer/wicket/model/models/AboutModel.java | 2 +-
.../apache/isis/viewer/wicket/model/models/ActionModel.java | 2 +-
.../isis/viewer/wicket/model/models/BookmarkableModel.java | 2 +-
.../isis/viewer/wicket/model/models/BookmarkedPagesModel.java | 2 +-
.../isis/viewer/wicket/model/models/EntityCollectionModel.java | 6 +++---
.../apache/isis/viewer/wicket/model/models/EntityModel.java | 4 ++--
.../viewer/wicket/model/models/EntityModelForReference.java | 2 +-
.../wicket/model/models/HintPageParameterSerializer.java | 2 +-
.../apache/isis/viewer/wicket/model/models/ModelAbstract.java | 2 +-
.../isis/viewer/wicket/model/models/ObjectAdapterModel.java | 2 +-
.../apache/isis/viewer/wicket/model/models/ScalarModel.java | 2 +-
.../wicket/model/models/ScalarModelWithMultiPending.java | 2 +-
.../viewer/wicket/model/models/ScalarModelWithPending.java | 2 +-
.../isis/viewer/wicket/model/models/ServiceActionsModel.java | 2 +-
.../viewer/wicket/model/models/ToggledMementosProvider.java | 2 +-
.../org/apache/isis/viewer/wicket/model/models/ValueModel.java | 4 ++--
.../org/apache/isis/viewer/wicket/model/models/VoidModel.java | 2 +-
.../apache/isis/viewer/wicket/model/models/WelcomeModel.java | 2 +-
.../wicket/model/models/whereami/WhereAmIModelDefault.java | 2 +-
.../apache/isis/viewer/wicket/model/util/ComponentHintKey.java | 2 +-
.../isis/viewer/wicket/model/models/EntityModel_hintsTest.java | 2 +-
.../model/models/ScalarModel_isScalarSubtypingAnyOf_Test.java | 4 ++--
.../apache/isis/viewer/wicket/ui/ComponentFactoryAbstract.java | 2 +-
.../actionresponse/ActionResultResponseHandlingStrategy.java | 2 +-
.../wicket/ui/actionresponse/ActionResultResponseType.java | 2 +-
.../viewer/wicket/ui/components/about/JarManifestModel.java | 2 +-
.../ui/components/actionmenu/serviceactions/CssMenuItem.java | 2 +-
.../actionmenu/serviceactions/ServiceActionUtil.java | 2 +-
.../actionmenu/serviceactions/TertiaryActionsPanel.java | 2 +-
.../ui/components/collection/AssociatedWithActionsHelper.java | 2 +-
.../wicket/ui/components/collection/CollectionPanel.java | 2 +-
.../ajaxtable/CollectionContentsAsAjaxTablePanel.java | 2 +-
.../collectioncontents/ajaxtable/columns/ColumnAbstract.java | 2 +-
.../ajaxtable/columns/ObjectAdapterPropertyColumn.java | 2 +-
.../ajaxtable/columns/ObjectAdapterTitleColumn.java | 4 ++--
.../ajaxtable/columns/ObjectAdapterToggleboxColumn.java | 2 +-
.../components/entity/icontitle/EntityIconAndTitlePanel.java | 2 +-
.../ui/components/scalars/ScalarPanelSelect2Abstract.java | 2 +-
.../scalars/datepicker/TextFieldWithDateTimePicker.java | 2 +-
.../wicket/ui/components/scalars/reference/ReferencePanel.java | 2 +-
.../scalars/valuechoices/ValueChoicesSelect2Panel.java | 2 +-
.../wicket/ui/components/tree/IsisToWicketTreeAdapter.java | 2 +-
.../wicket/ui/components/welcome/WelcomePanelFactory.java | 2 +-
.../ui/components/widgets/breadcrumbs/BreadcrumbModel.java | 2 +-
.../wicket/ui/components/widgets/linkandlabel/ActionLink.java | 2 +-
.../widgets/linkandlabel/ActionLinkFactoryAbstract.java | 2 +-
.../viewer/wicket/ui/components/widgets/select2/ChoiceExt.java | 2 +-
.../viewer/wicket/ui/components/widgets/select2/Select2.java | 2 +-
.../wicket/ui/components/widgets/select2/Select2ChoiceExt.java | 2 +-
.../ui/components/widgets/select2/Select2MultiChoiceExt.java | 2 +-
.../widgets/select2/providers/EmptyChoiceProvider.java | 2 +-
.../providers/ObjectAdapterMementoProviderAbstract.java | 4 ++--
.../providers/ObjectAdapterMementoProviderForChoices.java | 2 +-
.../ObjectAdapterMementoProviderForReferenceChoices.java | 2 +-
...ctAdapterMementoProviderForReferenceObjectAutoComplete.java | 2 +-
...MementoProviderForReferenceParamOrPropertyAutoComplete.java | 2 +-
.../providers/ObjectAdapterMementoProviderForValueChoices.java | 2 +-
.../apache/isis/viewer/wicket/ui/errors/ExceptionModel.java | 2 +-
.../apache/isis/viewer/wicket/ui/errors/JGrowlBehaviour.java | 2 +-
.../org/apache/isis/viewer/wicket/ui/pages/WebPageBase.java | 2 +-
.../wicket/ui/pages/accmngt/EmailAvailableValidator.java | 2 +-
.../wicket/ui/pages/accmngt/UsernameAvailableValidator.java | 2 +-
.../viewer/wicket/ui/pages/actionprompt/ActionPromptPage.java | 2 +-
.../apache/isis/viewer/wicket/ui/pages/entity/EntityPage.java | 2 +-
.../org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java | 2 +-
.../isis/viewer/wicket/ui/panels/FormExecutorDefault.java | 4 ++--
.../org/apache/isis/viewer/wicket/ui/panels/PanelBase.java | 2 +-
.../apache/isis/viewer/wicket/ui/validation/ValidatorBase.java | 2 +-
.../viewer/wicket/ui/ComponentFactoryAbstractTest_init.java | 2 +-
.../selector/CollectionContentsSelectorDropdownPanelTest.java | 2 +-
.../ObjectAdapterMementoProviderForValueChoicesTest.java | 4 ++--
.../viewer/integration/AuthenticatedWebSessionForIsis.java | 4 ++--
.../viewer/integration/ConverterForObjectAdapterMemento.java | 4 ++--
.../wicket/viewer/integration/WebRequestCycleForIsis.java | 2 +-
.../registries/components/ComponentFactoryRegistryDefault.java | 2 +-
.../viewer/services/mementos/ObjectMementoServiceWicket.java | 6 +++---
.../isis/viewer/wicket/viewer/webmodule/WebModuleWicket.java | 4 ++--
.../viewer/wicket/viewer/wicketapp/IsisWicketApplication.java | 4 ++--
.../viewer/wicketapp/IsisWicketApplication_newPageFactory.java | 2 +-
.../AuthenticatedWebSessionForIsis_Authenticate.java | 2 +-
.../integration/AuthenticatedWebSessionForIsis_SignIn.java | 2 +-
.../AuthenticatedWebSessionForIsis_TestAbstract.java | 2 +-
.../viewer/wicketapp/IsisWicketApplication_Defaults.java | 2 +-
129 files changed, 167 insertions(+), 167 deletions(-)
diff --git a/antora/playbooks/site-core.yml b/antora/playbooks/site-core.yml
index 3759e2a..8afaf24 100644
--- a/antora/playbooks/site-core.yml
+++ b/antora/playbooks/site-core.yml
@@ -38,7 +38,7 @@ content:
start_path: core/runtime-services/src/main/doc # core
branches: HEAD
- url: .
- start_path: core/webapp/src/main/doc # core
+ start_path: core/corewebapp/src/main/doc # core
branches: HEAD
# examples
diff --git a/antora/playbooks/site.yml b/antora/playbooks/site.yml
index 97a6138..58ab4f1 100644
--- a/antora/playbooks/site.yml
+++ b/antora/playbooks/site.yml
@@ -82,7 +82,7 @@ content:
start_path: core/runtimeservices/src/main/doc # core
branches: HEAD
- url: .
- start_path: core/webapp/src/main/doc # core
+ start_path: core/corewebapp/src/main/doc # core
branches: HEAD
- url: .
start_path: core/security/src/main/doc # security
diff --git a/core/unittestsupport/pom.xml b/core/unittestsupport/pom.xml
index 3946926..03b9a29 100644
--- a/core/unittestsupport/pom.xml
+++ b/core/unittestsupport/pom.xml
@@ -24,8 +24,8 @@
<name>Apache Isis Core - Unit Test Support</name>
<properties>
- <jar-plugin.automaticModuleName>org.apache.isis.unittestsupport</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/unittestsupport</git-plugin.propertiesDir>
+ <jar-plugin.automaticModuleName>org.apache.isis.core.unittestsupport</jar-plugin.automaticModuleName>
+ <git-plugin.propertiesDir>org/apache/isis/core/unittestsupport</git-plugin.propertiesDir>
</properties>
<description>
diff --git a/core/webapp/pom.xml b/core/webapp/pom.xml
index a7fff88..3a68e10 100644
--- a/core/webapp/pom.xml
+++ b/core/webapp/pom.xml
@@ -34,7 +34,7 @@
</description>
<properties>
- <jar-plugin.automaticModuleName>org.apache.isis.webapp</jar-plugin.automaticModuleName>
+ <jar-plugin.automaticModuleName>org.apache.isis.corewebapp</jar-plugin.automaticModuleName>
<git-plugin.propertiesDir>org/apache/isis/webapp</git-plugin.propertiesDir>
</properties>
diff --git a/core/webapp/src/main/java/org/apache/isis/webapp/IsisModuleWebapp.java b/core/webapp/src/main/java/org/apache/isis/core/webapp/IsisModuleWebapp.java
similarity index 79%
rename from core/webapp/src/main/java/org/apache/isis/webapp/IsisModuleWebapp.java
rename to core/webapp/src/main/java/org/apache/isis/core/webapp/IsisModuleWebapp.java
index 697f3a7..19c3ff6 100644
--- a/core/webapp/src/main/java/org/apache/isis/webapp/IsisModuleWebapp.java
+++ b/core/webapp/src/main/java/org/apache/isis/core/webapp/IsisModuleWebapp.java
@@ -16,16 +16,16 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.webapp;
+package org.apache.isis.core.webapp;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import org.apache.isis.core.runtime.IsisCoreModuleRuntime;
-import org.apache.isis.webapp.health.HealthIndicatorUsingHealthCheckService;
-import org.apache.isis.webapp.modules.logonlog.WebModuleLogOnExceptionLogger;
-import org.apache.isis.webapp.modules.templresources.WebModuleTemplateResources;
-import org.apache.isis.webapp.webappctx.IsisWebAppContextInitializer;
+import org.apache.isis.core.webapp.modules.logonlog.WebModuleLogOnExceptionLogger;
+import org.apache.isis.core.webapp.modules.templresources.WebModuleTemplateResources;
+import org.apache.isis.core.webapp.health.HealthIndicatorUsingHealthCheckService;
+import org.apache.isis.core.webapp.webappctx.IsisWebAppContextInitializer;
@Configuration
@Import({
diff --git a/core/webapp/src/main/java/org/apache/isis/webapp/context/IsisWebAppCommonContext.java b/core/webapp/src/main/java/org/apache/isis/core/webapp/context/IsisWebAppCommonContext.java
similarity index 96%
rename from core/webapp/src/main/java/org/apache/isis/webapp/context/IsisWebAppCommonContext.java
rename to core/webapp/src/main/java/org/apache/isis/core/webapp/context/IsisWebAppCommonContext.java
index 54e1b94..6b4c2af 100644
--- a/core/webapp/src/main/java/org/apache/isis/webapp/context/IsisWebAppCommonContext.java
+++ b/core/webapp/src/main/java/org/apache/isis/core/webapp/context/IsisWebAppCommonContext.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.webapp.context;
+package org.apache.isis.core.webapp.context;
import java.util.function.Function;
import java.util.function.Supplier;
@@ -33,8 +33,8 @@ import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.runtime.session.IsisSession;
-import org.apache.isis.webapp.context.memento.ObjectMemento;
-import org.apache.isis.webapp.context.memento.ObjectMementoService;
+import org.apache.isis.core.webapp.context.memento.ObjectMemento;
+import org.apache.isis.core.webapp.context.memento.ObjectMementoService;
import lombok.AccessLevel;
import lombok.Getter;
diff --git a/core/webapp/src/main/java/org/apache/isis/webapp/context/memento/ObjectMemento.java b/core/webapp/src/main/java/org/apache/isis/core/webapp/context/memento/ObjectMemento.java
similarity index 98%
rename from core/webapp/src/main/java/org/apache/isis/webapp/context/memento/ObjectMemento.java
rename to core/webapp/src/main/java/org/apache/isis/core/webapp/context/memento/ObjectMemento.java
index d7cd2f3..6c206ad 100644
--- a/core/webapp/src/main/java/org/apache/isis/webapp/context/memento/ObjectMemento.java
+++ b/core/webapp/src/main/java/org/apache/isis/core/webapp/context/memento/ObjectMemento.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.webapp.context.memento;
+package org.apache.isis.core.webapp.context.memento;
import java.io.Serializable;
import java.util.ArrayList;
diff --git a/core/webapp/src/main/java/org/apache/isis/webapp/context/memento/ObjectMementoCollection.java b/core/webapp/src/main/java/org/apache/isis/core/webapp/context/memento/ObjectMementoCollection.java
similarity index 97%
rename from core/webapp/src/main/java/org/apache/isis/webapp/context/memento/ObjectMementoCollection.java
rename to core/webapp/src/main/java/org/apache/isis/core/webapp/context/memento/ObjectMementoCollection.java
index a814b21..be5c7b9 100644
--- a/core/webapp/src/main/java/org/apache/isis/webapp/context/memento/ObjectMementoCollection.java
+++ b/core/webapp/src/main/java/org/apache/isis/core/webapp/context/memento/ObjectMementoCollection.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.webapp.context.memento;
+package org.apache.isis.core.webapp.context.memento;
import java.util.ArrayList;
diff --git a/core/webapp/src/main/java/org/apache/isis/webapp/context/memento/ObjectMementoService.java b/core/webapp/src/main/java/org/apache/isis/core/webapp/context/memento/ObjectMementoService.java
similarity index 96%
rename from core/webapp/src/main/java/org/apache/isis/webapp/context/memento/ObjectMementoService.java
rename to core/webapp/src/main/java/org/apache/isis/core/webapp/context/memento/ObjectMementoService.java
index be25c16..9ef899b 100644
--- a/core/webapp/src/main/java/org/apache/isis/webapp/context/memento/ObjectMementoService.java
+++ b/core/webapp/src/main/java/org/apache/isis/core/webapp/context/memento/ObjectMementoService.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.webapp.context.memento;
+package org.apache.isis.core.webapp.context.memento;
import org.apache.isis.core.metamodel.adapter.oid.RootOid;
import org.apache.isis.core.metamodel.spec.ManagedObject;
diff --git a/core/webapp/src/main/java/org/apache/isis/webapp/diagnostics/IsisLogOnExceptionFilter.java b/core/webapp/src/main/java/org/apache/isis/core/webapp/diagnostics/IsisLogOnExceptionFilter.java
similarity index 98%
rename from core/webapp/src/main/java/org/apache/isis/webapp/diagnostics/IsisLogOnExceptionFilter.java
rename to core/webapp/src/main/java/org/apache/isis/core/webapp/diagnostics/IsisLogOnExceptionFilter.java
index 6ae8b8d..8e4b4a2 100644
--- a/core/webapp/src/main/java/org/apache/isis/webapp/diagnostics/IsisLogOnExceptionFilter.java
+++ b/core/webapp/src/main/java/org/apache/isis/core/webapp/diagnostics/IsisLogOnExceptionFilter.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.webapp.diagnostics;
+package org.apache.isis.core.webapp.diagnostics;
import java.io.IOException;
diff --git a/core/webapp/src/main/java/org/apache/isis/webapp/health/HealthIndicatorUsingHealthCheckService.java b/core/webapp/src/main/java/org/apache/isis/core/webapp/health/HealthIndicatorUsingHealthCheckService.java
similarity index 97%
rename from core/webapp/src/main/java/org/apache/isis/webapp/health/HealthIndicatorUsingHealthCheckService.java
rename to core/webapp/src/main/java/org/apache/isis/core/webapp/health/HealthIndicatorUsingHealthCheckService.java
index 5c100d8..65bf1f0 100644
--- a/core/webapp/src/main/java/org/apache/isis/webapp/health/HealthIndicatorUsingHealthCheckService.java
+++ b/core/webapp/src/main/java/org/apache/isis/core/webapp/health/HealthIndicatorUsingHealthCheckService.java
@@ -1,4 +1,4 @@
-package org.apache.isis.webapp.health;
+package org.apache.isis.core.webapp.health;
import java.util.Optional;
diff --git a/core/webapp/src/main/java/org/apache/isis/webapp/modules/WebModule.java b/core/webapp/src/main/java/org/apache/isis/core/webapp/modules/WebModule.java
similarity index 96%
rename from core/webapp/src/main/java/org/apache/isis/webapp/modules/WebModule.java
rename to core/webapp/src/main/java/org/apache/isis/core/webapp/modules/WebModule.java
index aaa101a..ffb6e19 100644
--- a/core/webapp/src/main/java/org/apache/isis/webapp/modules/WebModule.java
+++ b/core/webapp/src/main/java/org/apache/isis/core/webapp/modules/WebModule.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.webapp.modules;
+package org.apache.isis.core.webapp.modules;
import javax.annotation.Priority;
import javax.servlet.Filter;
@@ -30,7 +30,7 @@ import org.springframework.core.annotation.Order;
import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.core.commons.collections.Can;
-import org.apache.isis.webapp.webappctx.IsisWebAppContextInitializer;
+import org.apache.isis.core.webapp.webappctx.IsisWebAppContextInitializer;
import lombok.val;
diff --git a/core/webapp/src/main/java/org/apache/isis/webapp/modules/WebModuleAbstract.java b/core/webapp/src/main/java/org/apache/isis/core/webapp/modules/WebModuleAbstract.java
similarity index 98%
rename from core/webapp/src/main/java/org/apache/isis/webapp/modules/WebModuleAbstract.java
rename to core/webapp/src/main/java/org/apache/isis/core/webapp/modules/WebModuleAbstract.java
index 8df21c9..0b0f138 100644
--- a/core/webapp/src/main/java/org/apache/isis/webapp/modules/WebModuleAbstract.java
+++ b/core/webapp/src/main/java/org/apache/isis/core/webapp/modules/WebModuleAbstract.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.webapp.modules;
+package org.apache.isis.core.webapp.modules;
import java.util.Optional;
diff --git a/core/webapp/src/main/java/org/apache/isis/webapp/modules/WebModuleContext.java b/core/webapp/src/main/java/org/apache/isis/core/webapp/modules/WebModuleContext.java
similarity index 99%
rename from core/webapp/src/main/java/org/apache/isis/webapp/modules/WebModuleContext.java
rename to core/webapp/src/main/java/org/apache/isis/core/webapp/modules/WebModuleContext.java
index 327032a..539ac1e 100644
--- a/core/webapp/src/main/java/org/apache/isis/webapp/modules/WebModuleContext.java
+++ b/core/webapp/src/main/java/org/apache/isis/core/webapp/modules/WebModuleContext.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.webapp.modules;
+package org.apache.isis.core.webapp.modules;
import java.util.ArrayList;
import java.util.List;
diff --git a/core/webapp/src/main/java/org/apache/isis/webapp/modules/logonlog/WebModuleLogOnExceptionLogger.java b/core/webapp/src/main/java/org/apache/isis/core/webapp/modules/logonlog/WebModuleLogOnExceptionLogger.java
similarity index 92%
rename from core/webapp/src/main/java/org/apache/isis/webapp/modules/logonlog/WebModuleLogOnExceptionLogger.java
rename to core/webapp/src/main/java/org/apache/isis/core/webapp/modules/logonlog/WebModuleLogOnExceptionLogger.java
index 3da0d38..e4c1eff 100644
--- a/core/webapp/src/main/java/org/apache/isis/webapp/modules/logonlog/WebModuleLogOnExceptionLogger.java
+++ b/core/webapp/src/main/java/org/apache/isis/core/webapp/modules/logonlog/WebModuleLogOnExceptionLogger.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.webapp.modules.logonlog;
+package org.apache.isis.core.webapp.modules.logonlog;
import javax.inject.Inject;
import javax.inject.Named;
@@ -31,8 +31,8 @@ import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.core.commons.collections.Can;
-import org.apache.isis.webapp.diagnostics.IsisLogOnExceptionFilter;
-import org.apache.isis.webapp.modules.WebModuleAbstract;
+import org.apache.isis.core.webapp.diagnostics.IsisLogOnExceptionFilter;
+import org.apache.isis.core.webapp.modules.WebModuleAbstract;
import lombok.Getter;
diff --git a/core/webapp/src/main/java/org/apache/isis/webapp/modules/templresources/TemplateResourceCachingFilter.java b/core/webapp/src/main/java/org/apache/isis/core/webapp/modules/templresources/TemplateResourceCachingFilter.java
similarity index 99%
rename from core/webapp/src/main/java/org/apache/isis/webapp/modules/templresources/TemplateResourceCachingFilter.java
rename to core/webapp/src/main/java/org/apache/isis/core/webapp/modules/templresources/TemplateResourceCachingFilter.java
index b71cd0a..fedf92c 100644
--- a/core/webapp/src/main/java/org/apache/isis/webapp/modules/templresources/TemplateResourceCachingFilter.java
+++ b/core/webapp/src/main/java/org/apache/isis/core/webapp/modules/templresources/TemplateResourceCachingFilter.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.webapp.modules.templresources;
+package org.apache.isis.core.webapp.modules.templresources;
import java.io.IOException;
import java.text.DateFormat;
diff --git a/core/webapp/src/main/java/org/apache/isis/webapp/modules/templresources/TemplateResourceServlet.java b/core/webapp/src/main/java/org/apache/isis/core/webapp/modules/templresources/TemplateResourceServlet.java
similarity index 99%
rename from core/webapp/src/main/java/org/apache/isis/webapp/modules/templresources/TemplateResourceServlet.java
rename to core/webapp/src/main/java/org/apache/isis/core/webapp/modules/templresources/TemplateResourceServlet.java
index e79aaa3..5b5cbb5 100644
--- a/core/webapp/src/main/java/org/apache/isis/webapp/modules/templresources/TemplateResourceServlet.java
+++ b/core/webapp/src/main/java/org/apache/isis/core/webapp/modules/templresources/TemplateResourceServlet.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.webapp.modules.templresources;
+package org.apache.isis.core.webapp.modules.templresources;
import java.io.IOException;
import java.io.InputStream;
diff --git a/core/webapp/src/main/java/org/apache/isis/webapp/modules/templresources/TemplateResourceServlet_HtmlTemplateVariables.java b/core/webapp/src/main/java/org/apache/isis/core/webapp/modules/templresources/TemplateResourceServlet_HtmlTemplateVariables.java
similarity index 97%
rename from core/webapp/src/main/java/org/apache/isis/webapp/modules/templresources/TemplateResourceServlet_HtmlTemplateVariables.java
rename to core/webapp/src/main/java/org/apache/isis/core/webapp/modules/templresources/TemplateResourceServlet_HtmlTemplateVariables.java
index a6dc71e..e8f79b3 100644
--- a/core/webapp/src/main/java/org/apache/isis/webapp/modules/templresources/TemplateResourceServlet_HtmlTemplateVariables.java
+++ b/core/webapp/src/main/java/org/apache/isis/core/webapp/modules/templresources/TemplateResourceServlet_HtmlTemplateVariables.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.webapp.modules.templresources;
+package org.apache.isis.core.webapp.modules.templresources;
import java.util.HashMap;
import java.util.Map;
diff --git a/core/webapp/src/main/java/org/apache/isis/webapp/modules/templresources/WebModuleTemplateResources.java b/core/webapp/src/main/java/org/apache/isis/core/webapp/modules/templresources/WebModuleTemplateResources.java
similarity index 95%
rename from core/webapp/src/main/java/org/apache/isis/webapp/modules/templresources/WebModuleTemplateResources.java
rename to core/webapp/src/main/java/org/apache/isis/core/webapp/modules/templresources/WebModuleTemplateResources.java
index f93c751..05ef038 100644
--- a/core/webapp/src/main/java/org/apache/isis/webapp/modules/templresources/WebModuleTemplateResources.java
+++ b/core/webapp/src/main/java/org/apache/isis/core/webapp/modules/templresources/WebModuleTemplateResources.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.webapp.modules.templresources;
+package org.apache.isis.core.webapp.modules.templresources;
import javax.inject.Inject;
import javax.inject.Named;
@@ -31,7 +31,7 @@ import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.core.commons.collections.Can;
-import org.apache.isis.webapp.modules.WebModuleAbstract;
+import org.apache.isis.core.webapp.modules.WebModuleAbstract;
import lombok.Getter;
diff --git a/core/webapp/src/main/java/org/apache/isis/webapp/routing/ForwardingServlet.java b/core/webapp/src/main/java/org/apache/isis/core/webapp/routing/ForwardingServlet.java
similarity index 97%
rename from core/webapp/src/main/java/org/apache/isis/webapp/routing/ForwardingServlet.java
rename to core/webapp/src/main/java/org/apache/isis/core/webapp/routing/ForwardingServlet.java
index 8e3b886..f6177c3 100644
--- a/core/webapp/src/main/java/org/apache/isis/webapp/routing/ForwardingServlet.java
+++ b/core/webapp/src/main/java/org/apache/isis/core/webapp/routing/ForwardingServlet.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.webapp.routing;
+package org.apache.isis.core.webapp.routing;
import java.io.IOException;
diff --git a/core/webapp/src/main/java/org/apache/isis/webapp/routing/RedirectFilter.java b/core/webapp/src/main/java/org/apache/isis/core/webapp/routing/RedirectFilter.java
similarity index 97%
rename from core/webapp/src/main/java/org/apache/isis/webapp/routing/RedirectFilter.java
rename to core/webapp/src/main/java/org/apache/isis/core/webapp/routing/RedirectFilter.java
index 1bd6dce..13e3e36 100644
--- a/core/webapp/src/main/java/org/apache/isis/webapp/routing/RedirectFilter.java
+++ b/core/webapp/src/main/java/org/apache/isis/core/webapp/routing/RedirectFilter.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.webapp.routing;
+package org.apache.isis.core.webapp.routing;
import java.io.IOException;
diff --git a/core/webapp/src/main/java/org/apache/isis/webapp/routing/RedirectServlet.java b/core/webapp/src/main/java/org/apache/isis/core/webapp/routing/RedirectServlet.java
similarity index 97%
rename from core/webapp/src/main/java/org/apache/isis/webapp/routing/RedirectServlet.java
rename to core/webapp/src/main/java/org/apache/isis/core/webapp/routing/RedirectServlet.java
index b374235..068ad44 100644
--- a/core/webapp/src/main/java/org/apache/isis/webapp/routing/RedirectServlet.java
+++ b/core/webapp/src/main/java/org/apache/isis/core/webapp/routing/RedirectServlet.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.webapp.routing;
+package org.apache.isis.core.webapp.routing;
import java.io.IOException;
diff --git a/core/webapp/src/main/java/org/apache/isis/webapp/routing/RedirectToDocsFilter.java b/core/webapp/src/main/java/org/apache/isis/core/webapp/routing/RedirectToDocsFilter.java
similarity index 96%
rename from core/webapp/src/main/java/org/apache/isis/webapp/routing/RedirectToDocsFilter.java
rename to core/webapp/src/main/java/org/apache/isis/core/webapp/routing/RedirectToDocsFilter.java
index d7375bc..96476b6 100644
--- a/core/webapp/src/main/java/org/apache/isis/webapp/routing/RedirectToDocsFilter.java
+++ b/core/webapp/src/main/java/org/apache/isis/core/webapp/routing/RedirectToDocsFilter.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.webapp.routing;
+package org.apache.isis.core.webapp.routing;
import java.io.IOException;
@@ -39,7 +39,7 @@ import lombok.extern.log4j.Log4j2;
* <p>
* Specifically, if the request is to "/" but the Accept header is anything
* other than "application/json" (eg is set to "text/html" and suggesting that
- * the user is using a browser to access the webapp) then the filter redirects
+ * the user is using a browser to access the corewebapp) then the filter redirects
* to /index.html (the documentation pages).
*
* <p>
diff --git a/core/webapp/src/main/java/org/apache/isis/webapp/webappctx/IsisWebAppContextInitializer.java b/core/webapp/src/main/java/org/apache/isis/core/webapp/webappctx/IsisWebAppContextInitializer.java
similarity index 95%
rename from core/webapp/src/main/java/org/apache/isis/webapp/webappctx/IsisWebAppContextInitializer.java
rename to core/webapp/src/main/java/org/apache/isis/core/webapp/webappctx/IsisWebAppContextInitializer.java
index ce8a93b..66394a2 100644
--- a/core/webapp/src/main/java/org/apache/isis/webapp/webappctx/IsisWebAppContextInitializer.java
+++ b/core/webapp/src/main/java/org/apache/isis/core/webapp/webappctx/IsisWebAppContextInitializer.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.webapp.webappctx;
+package org.apache.isis.core.webapp.webappctx;
import java.util.EventListener;
import java.util.concurrent.atomic.LongAdder;
@@ -34,8 +34,8 @@ import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.core.commons.internal.context._Context;
import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.core.config.viewer.wicket.WebAppContextPath;
-import org.apache.isis.webapp.modules.WebModule;
-import org.apache.isis.webapp.modules.WebModuleContext;
+import org.apache.isis.core.webapp.modules.WebModule;
+import org.apache.isis.core.webapp.modules.WebModuleContext;
import lombok.NonNull;
import lombok.Value;
@@ -49,7 +49,7 @@ import lombok.extern.log4j.Log4j2;
* Acts as the single application entry-point for setting up the
* ServletContext programmatically.
* </p><p>
- * Installs {@link WebModule}s on the ServletContext.
+ * Installs {@link WebModule}s on the ServletContext.
* </p>
*
* @since 2.0
diff --git a/core/webapp/src/main/java/org/apache/isis/webapp/wormhole/AuthenticationSessionWormhole.java b/core/webapp/src/main/java/org/apache/isis/core/webapp/wormhole/AuthenticationSessionWormhole.java
similarity index 96%
rename from core/webapp/src/main/java/org/apache/isis/webapp/wormhole/AuthenticationSessionWormhole.java
rename to core/webapp/src/main/java/org/apache/isis/core/webapp/wormhole/AuthenticationSessionWormhole.java
index 6388f63..9c18837 100644
--- a/core/webapp/src/main/java/org/apache/isis/webapp/wormhole/AuthenticationSessionWormhole.java
+++ b/core/webapp/src/main/java/org/apache/isis/core/webapp/wormhole/AuthenticationSessionWormhole.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.webapp.wormhole;
+package org.apache.isis.core.webapp.wormhole;
import org.apache.isis.security.api.authentication.AuthenticationSession;
diff --git a/examples/demo/src/main/resources/application.yml b/examples/demo/src/main/resources/application.yml
index 7eb0ff6..cbb592a 100644
--- a/examples/demo/src/main/resources/application.yml
+++ b/examples/demo/src/main/resources/application.yml
@@ -49,7 +49,7 @@ isis:
viewer:
wicket:
application:
- menubars-layout-xml: demoapp/webapp/menubars.layout.xml
+ menubars-layout-xml: demoapp/corewebapp/menubars.layout.xml
favicon-url: /images/favicon.png
brand-logo-header: /images/gift_48.png
brand-logo-signin: /images/gift_256.png
diff --git a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/IsisModuleSecurityFixtureRoleAndPermissions.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/IsisModuleSecurityFixtureRoleAndPermissions.java
index c2b6cd6..47f6a7a 100644
--- a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/IsisModuleSecurityFixtureRoleAndPermissions.java
+++ b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/IsisModuleSecurityFixtureRoleAndPermissions.java
@@ -23,7 +23,7 @@ import org.apache.isis.extensions.secman.api.permission.ApplicationPermissionMod
import org.apache.isis.extensions.secman.api.permission.ApplicationPermissionRule;
/**
- * Role to run in the prototype fixture scripts for the example webapp for the security module.
+ * Role to run in the prototype fixture scripts for the example corewebapp for the security module.
*/
public class IsisModuleSecurityFixtureRoleAndPermissions extends AbstractRoleAndPermissionsFixtureScript {
diff --git a/extensions/security/shiro-realm-ldap/impl/src/main/java/org/apache/isis/extensions/shirorealmldap/realm/impl/IsisLdapRealm.java b/extensions/security/shiro-realm-ldap/impl/src/main/java/org/apache/isis/extensions/shirorealmldap/realm/impl/IsisLdapRealm.java
index d1ac924..011486c 100644
--- a/extensions/security/shiro-realm-ldap/impl/src/main/java/org/apache/isis/extensions/shirorealmldap/realm/impl/IsisLdapRealm.java
+++ b/extensions/security/shiro-realm-ldap/impl/src/main/java/org/apache/isis/extensions/shirorealmldap/realm/impl/IsisLdapRealm.java
@@ -95,11 +95,11 @@ import static org.apache.isis.core.commons.internal.base._NullSafe.stream;
* {@link #setResourcePath(String)} to an 'ini' file with a [roles] section, eg:
* <p/>
* <pre>
- * ldapRealm.resourcePath=classpath:webapp/myroles.ini
+ * ldapRealm.resourcePath=classpath:corewebapp/myroles.ini
* </pre>
* <p/>
* <p>
- * where <tt>myroles.ini</tt> is in <tt>src/main/resources/webapp</tt>, and takes the form:
+ * where <tt>myroles.ini</tt> is in <tt>src/main/resources/corewebapp</tt>, and takes the form:
* <p/>
* <pre>
* [roles]
@@ -416,11 +416,11 @@ public class IsisLdapRealm extends DefaultLdapRealm {
/**
* <pre>
- * ldapRealm.resourcePath=classpath:webapp/myroles.ini
+ * ldapRealm.resourcePath=classpath:corewebapp/myroles.ini
* </pre>
* <p/>
* <p/>
- * where <tt>myroles.ini</tt> is in <tt>src/main/resources/webapp</tt>, and takes the form:
+ * where <tt>myroles.ini</tt> is in <tt>src/main/resources/corewebapp</tt>, and takes the form:
* <p/>
* <pre>
* [roles]
diff --git a/extensions/vro/cors/impl/src/main/java/org/apache/isis/extensions/cors/impl/webmodule/WebModuleCors.java b/extensions/vro/cors/impl/src/main/java/org/apache/isis/extensions/cors/impl/webmodule/WebModuleCors.java
index 515167c..f8d458d 100644
--- a/extensions/vro/cors/impl/src/main/java/org/apache/isis/extensions/cors/impl/webmodule/WebModuleCors.java
+++ b/extensions/vro/cors/impl/src/main/java/org/apache/isis/extensions/cors/impl/webmodule/WebModuleCors.java
@@ -32,7 +32,7 @@ import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.core.commons.collections.Can;
-import org.apache.isis.webapp.modules.WebModuleAbstract;
+import org.apache.isis.core.webapp.modules.WebModuleAbstract;
import lombok.Getter;
diff --git a/security/keycloak/src/main/java/org/apache/isis/security/keycloak/IsisModuleSecurityKeycloak.java b/security/keycloak/src/main/java/org/apache/isis/security/keycloak/IsisModuleSecurityKeycloak.java
index 886493d..ad4455a 100644
--- a/security/keycloak/src/main/java/org/apache/isis/security/keycloak/IsisModuleSecurityKeycloak.java
+++ b/security/keycloak/src/main/java/org/apache/isis/security/keycloak/IsisModuleSecurityKeycloak.java
@@ -25,7 +25,7 @@ import org.apache.isis.core.runtimeservices.IsisModuleCoreRuntimeServices;
import org.apache.isis.security.keycloak.authentication.AuthenticatorKeycloak;
import org.apache.isis.security.keycloak.authorization.AuthorizorKeycloak;
import org.apache.isis.security.keycloak.webmodule.WebModuleKeycloak;
-import org.apache.isis.webapp.IsisModuleWebapp;
+import org.apache.isis.core.webapp.IsisModuleWebapp;
/**
* Configuration Bean to support Isis Security using Shiro.
diff --git a/security/keycloak/src/main/java/org/apache/isis/security/keycloak/authentication/AuthenticatorKeycloak.java b/security/keycloak/src/main/java/org/apache/isis/security/keycloak/authentication/AuthenticatorKeycloak.java
index 403986f..8ac6117 100644
--- a/security/keycloak/src/main/java/org/apache/isis/security/keycloak/authentication/AuthenticatorKeycloak.java
+++ b/security/keycloak/src/main/java/org/apache/isis/security/keycloak/authentication/AuthenticatorKeycloak.java
@@ -29,7 +29,7 @@ import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.security.api.authentication.AuthenticationRequest;
import org.apache.isis.security.api.authentication.AuthenticationSession;
import org.apache.isis.security.api.authentication.standard.Authenticator;
-import org.apache.isis.webapp.wormhole.AuthenticationSessionWormhole;
+import org.apache.isis.core.webapp.wormhole.AuthenticationSessionWormhole;
@Service
@Named("isisSecurityKeycloak.AuthenticatorKeycloak")
diff --git a/security/keycloak/src/main/java/org/apache/isis/security/keycloak/webmodule/KeycloakFilter.java b/security/keycloak/src/main/java/org/apache/isis/security/keycloak/webmodule/KeycloakFilter.java
index 7bfd6e0..711eff8 100644
--- a/security/keycloak/src/main/java/org/apache/isis/security/keycloak/webmodule/KeycloakFilter.java
+++ b/security/keycloak/src/main/java/org/apache/isis/security/keycloak/webmodule/KeycloakFilter.java
@@ -16,7 +16,7 @@ import javax.servlet.http.HttpServletResponse;
import org.apache.isis.security.api.authentication.AuthenticationSession;
import org.apache.isis.security.api.authentication.standard.SimpleSession;
-import org.apache.isis.webapp.wormhole.AuthenticationSessionWormhole;
+import org.apache.isis.core.webapp.wormhole.AuthenticationSessionWormhole;
import lombok.val;
diff --git a/security/keycloak/src/main/java/org/apache/isis/security/keycloak/webmodule/WebModuleKeycloak.java b/security/keycloak/src/main/java/org/apache/isis/security/keycloak/webmodule/WebModuleKeycloak.java
index c4419b4..181fb90 100644
--- a/security/keycloak/src/main/java/org/apache/isis/security/keycloak/webmodule/WebModuleKeycloak.java
+++ b/security/keycloak/src/main/java/org/apache/isis/security/keycloak/webmodule/WebModuleKeycloak.java
@@ -31,7 +31,7 @@ import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.core.commons.collections.Can;
-import org.apache.isis.webapp.modules.WebModuleAbstract;
+import org.apache.isis.core.webapp.modules.WebModuleAbstract;
import lombok.Getter;
diff --git a/security/shiro/src/main/java/org/apache/isis/security/shiro/IsisModuleSecurityShiro.java b/security/shiro/src/main/java/org/apache/isis/security/shiro/IsisModuleSecurityShiro.java
index 7e1a9c1..6057631 100644
--- a/security/shiro/src/main/java/org/apache/isis/security/shiro/IsisModuleSecurityShiro.java
+++ b/security/shiro/src/main/java/org/apache/isis/security/shiro/IsisModuleSecurityShiro.java
@@ -25,7 +25,7 @@ import org.apache.isis.core.runtimeservices.IsisModuleCoreRuntimeServices;
import org.apache.isis.security.shiro.authentication.AuthenticatorShiro;
import org.apache.isis.security.shiro.authorization.AuthorizorShiro;
import org.apache.isis.security.shiro.webmodule.WebModuleShiro;
-import org.apache.isis.webapp.IsisModuleWebapp;
+import org.apache.isis.core.webapp.IsisModuleWebapp;
/**
* Configuration Bean to support Isis Security using Shiro.
diff --git a/security/shiro/src/main/java/org/apache/isis/security/shiro/webmodule/WebModuleShiro.java b/security/shiro/src/main/java/org/apache/isis/security/shiro/webmodule/WebModuleShiro.java
index c194969..a925d34 100644
--- a/security/shiro/src/main/java/org/apache/isis/security/shiro/webmodule/WebModuleShiro.java
+++ b/security/shiro/src/main/java/org/apache/isis/security/shiro/webmodule/WebModuleShiro.java
@@ -47,8 +47,8 @@ import org.apache.isis.core.commons.collections.Can;
import org.apache.isis.core.commons.internal._Constants;
import org.apache.isis.core.commons.internal.base._Strings;
import org.apache.isis.core.commons.internal.exceptions._Exceptions;
-import org.apache.isis.webapp.modules.WebModuleAbstract;
-import org.apache.isis.webapp.modules.WebModuleContext;
+import org.apache.isis.core.webapp.modules.WebModuleAbstract;
+import org.apache.isis.core.webapp.modules.WebModuleContext;
import lombok.Getter;
import lombok.NoArgsConstructor;
diff --git a/starters/src/main/doc/modules/simpleapp/pages/about.adoc b/starters/src/main/doc/modules/simpleapp/pages/about.adoc
index 2f2a6bf..2bad5cd 100644
--- a/starters/src/main/doc/modules/simpleapp/pages/about.adoc
+++ b/starters/src/main/doc/modules/simpleapp/pages/about.adoc
@@ -532,7 +532,7 @@ The files in `src/main/jettyconsole` provide a splash image (if not run in headl
This uses the Dockerfile residing in `docker/Dockerfile` (under `src/main/resources`).
// FIXME: currently removed in v2, may reinstate
-//* also, the xref:refguide:mvn:about.adoc[Apache Isis Maven plugin] is also configured to generate a xref:refguide:mvn:swagger.adoc[swagger] spec file for the entire application, in the `xxx-webapp` module
+//* also, the xref:refguide:mvn:about.adoc[Apache Isis Maven plugin] is also configured to generate a xref:refguide:mvn:swagger.adoc[swagger] spec file for the entire application, in the `xxx-corewebapp` module
Under `src/main/resources` there is:
diff --git a/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/modules/ModuleWithFixtures.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/modules/ModuleWithFixtures.java
index 391e859..10a336d 100644
--- a/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/modules/ModuleWithFixtures.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/modules/ModuleWithFixtures.java
@@ -35,7 +35,7 @@ public interface ModuleWithFixtures {
*
* <p>
* These are automatically executed whenever running integration tests (but are ignored when bootstrapping the
- * runtime as a webapp).
+ * runtime as a corewebapp).
* </p>
*
* <p>
@@ -52,7 +52,7 @@ public interface ModuleWithFixtures {
*
* <p>
* These are automatically executed whenever running integration tests (but are ignored when bootstrapping the
- * runtime as a webapp).
+ * runtime as a corewebapp).
* </p>
*
* <p>
diff --git a/testing/h2console/ui/src/main/java/org/apache/isis/testing/h2console/ui/IsisModuleTestingH2ConsoleUi.java b/testing/h2console/ui/src/main/java/org/apache/isis/testing/h2console/ui/IsisModuleTestingH2ConsoleUi.java
index 7e5d48e..56e4272 100644
--- a/testing/h2console/ui/src/main/java/org/apache/isis/testing/h2console/ui/IsisModuleTestingH2ConsoleUi.java
+++ b/testing/h2console/ui/src/main/java/org/apache/isis/testing/h2console/ui/IsisModuleTestingH2ConsoleUi.java
@@ -22,7 +22,7 @@ import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
-import org.apache.isis.webapp.IsisModuleWebapp;
+import org.apache.isis.core.webapp.IsisModuleWebapp;
@Configuration
@Import({
diff --git a/testing/h2console/ui/src/main/java/org/apache/isis/testing/h2console/ui/webmodule/WebModuleH2Console.java b/testing/h2console/ui/src/main/java/org/apache/isis/testing/h2console/ui/webmodule/WebModuleH2Console.java
index 206c37d..9ca87ee 100644
--- a/testing/h2console/ui/src/main/java/org/apache/isis/testing/h2console/ui/webmodule/WebModuleH2Console.java
+++ b/testing/h2console/ui/src/main/java/org/apache/isis/testing/h2console/ui/webmodule/WebModuleH2Console.java
@@ -36,8 +36,8 @@ import org.apache.isis.core.commons.collections.Can;
import org.apache.isis.core.commons.internal.base._Strings;
import org.apache.isis.core.commons.internal.environment.IsisSystemEnvironment;
import org.apache.isis.core.config.IsisConfiguration;
-import org.apache.isis.webapp.modules.WebModuleAbstract;
-import org.apache.isis.webapp.modules.WebModuleContext;
+import org.apache.isis.core.webapp.modules.WebModuleAbstract;
+import org.apache.isis.core.webapp.modules.WebModuleContext;
import lombok.Getter;
import lombok.val;
diff --git a/testing/hsqldbmgr/ui/src/main/java/org/apache/isis/extensions/hsqldbmgr/dom/IsisModuleExtHsqldbMgr.java b/testing/hsqldbmgr/ui/src/main/java/org/apache/isis/extensions/hsqldbmgr/dom/IsisModuleExtHsqldbMgr.java
index beb3e7e..70be418 100644
--- a/testing/hsqldbmgr/ui/src/main/java/org/apache/isis/extensions/hsqldbmgr/dom/IsisModuleExtHsqldbMgr.java
+++ b/testing/hsqldbmgr/ui/src/main/java/org/apache/isis/extensions/hsqldbmgr/dom/IsisModuleExtHsqldbMgr.java
@@ -22,7 +22,7 @@ import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
-import org.apache.isis.webapp.IsisModuleWebapp;
+import org.apache.isis.core.webapp.IsisModuleWebapp;
@Configuration
@Import({
diff --git a/valuetypes/sse/ui/src/main/java/org/apache/isis/valuetypes/sse/ui/webmodule/WebModuleServerSentEvents.java b/valuetypes/sse/ui/src/main/java/org/apache/isis/valuetypes/sse/ui/webmodule/WebModuleServerSentEvents.java
index 4432340..f6ce156 100644
--- a/valuetypes/sse/ui/src/main/java/org/apache/isis/valuetypes/sse/ui/webmodule/WebModuleServerSentEvents.java
+++ b/valuetypes/sse/ui/src/main/java/org/apache/isis/valuetypes/sse/ui/webmodule/WebModuleServerSentEvents.java
@@ -31,7 +31,7 @@ import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.core.commons.collections.Can;
-import org.apache.isis.webapp.modules.WebModuleAbstract;
+import org.apache.isis.core.webapp.modules.WebModuleAbstract;
import lombok.Getter;
diff --git a/viewers/restfulobjects/jaxrs-resteasy-4/src/main/java/org/apache/isis/viewer/restfulobjects/jaxrsresteasy4/webmodule/WebModuleJaxrsResteasy4.java b/viewers/restfulobjects/jaxrs-resteasy-4/src/main/java/org/apache/isis/viewer/restfulobjects/jaxrsresteasy4/webmodule/WebModuleJaxrsResteasy4.java
index 04ee46e..c99e269 100644
--- a/viewers/restfulobjects/jaxrs-resteasy-4/src/main/java/org/apache/isis/viewer/restfulobjects/jaxrsresteasy4/webmodule/WebModuleJaxrsResteasy4.java
+++ b/viewers/restfulobjects/jaxrs-resteasy-4/src/main/java/org/apache/isis/viewer/restfulobjects/jaxrsresteasy4/webmodule/WebModuleJaxrsResteasy4.java
@@ -37,8 +37,8 @@ import org.apache.isis.core.config.RestEasyConfiguration;
import org.apache.isis.viewer.restfulobjects.viewer.webmodule.IsisRestfulObjectsSessionFilter;
import org.apache.isis.viewer.restfulobjects.viewer.webmodule.IsisTransactionFilterForRestfulObjects;
import org.apache.isis.viewer.restfulobjects.viewer.webmodule.auth.AuthenticationSessionStrategyBasicAuth;
-import org.apache.isis.webapp.modules.WebModuleAbstract;
-import org.apache.isis.webapp.modules.WebModuleContext;
+import org.apache.isis.core.webapp.modules.WebModuleAbstract;
+import org.apache.isis.core.webapp.modules.WebModuleContext;
import lombok.Getter;
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/IsisModuleRestfulObjectsViewer.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/IsisModuleRestfulObjectsViewer.java
index e030782..f8a5ae6 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/IsisModuleRestfulObjectsViewer.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/IsisModuleRestfulObjectsViewer.java
@@ -36,7 +36,7 @@ import org.apache.isis.viewer.restfulobjects.viewer.resources.MenuBarsResourceSe
import org.apache.isis.viewer.restfulobjects.viewer.resources.SwaggerSpecResource;
import org.apache.isis.viewer.restfulobjects.viewer.resources.UserResourceServerside;
import org.apache.isis.viewer.restfulobjects.viewer.resources.VersionResourceServerside;
-import org.apache.isis.webapp.IsisModuleWebapp;
+import org.apache.isis.core.webapp.IsisModuleWebapp;
/**
*
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/IsisRestfulObjectsSessionFilter.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/IsisRestfulObjectsSessionFilter.java
index 90601c0..241ca7d 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/IsisRestfulObjectsSessionFilter.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/IsisRestfulObjectsSessionFilter.java
@@ -49,7 +49,7 @@ import org.apache.isis.core.metamodel.specloader.validator.MetaModelInvalidExcep
import org.apache.isis.core.runtime.session.IsisSessionFactory;
import org.apache.isis.viewer.restfulobjects.viewer.webmodule.auth.AuthenticationSessionStrategy;
import org.apache.isis.viewer.restfulobjects.viewer.webmodule.auth.AuthenticationSessionStrategyDefault;
-import org.apache.isis.webapp.modules.templresources.TemplateResourceCachingFilter;
+import org.apache.isis.core.webapp.modules.templresources.TemplateResourceCachingFilter;
import static org.apache.isis.core.commons.internal.base._With.requires;
@@ -134,7 +134,7 @@ public class IsisRestfulObjectsSessionFilter implements Filter {
/**
* Init parameter key for which extensions should be ignored (typically,
- * mappings for other viewers within the webapp context).
+ * mappings for other viewers within the corewebapp context).
*
* <p>
* It can also be used to specify ignored static resources (though putting
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/IsisModuleWicketModel.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/IsisModuleWicketModel.java
index 9cefcde..05683d0 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/IsisModuleWicketModel.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/IsisModuleWicketModel.java
@@ -3,7 +3,7 @@ package org.apache.isis.viewer.wicket.model;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
-import org.apache.isis.webapp.IsisModuleWebapp;
+import org.apache.isis.core.webapp.IsisModuleWebapp;
@Configuration
@Import({
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/common/CommonContextUtils.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/common/CommonContextUtils.java
index 06a0dd9..900c335 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/common/CommonContextUtils.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/common/CommonContextUtils.java
@@ -20,7 +20,7 @@ package org.apache.isis.viewer.wicket.model.common;
import org.apache.wicket.Session;
-import org.apache.isis.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
import lombok.val;
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/AboutModel.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/AboutModel.java
index 4612b64..bdc2d71 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/AboutModel.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/AboutModel.java
@@ -19,7 +19,7 @@
package org.apache.isis.viewer.wicket.model.models;
-import org.apache.isis.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
/**
* Model providing welcome text.
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java
index 08ec6f9..5c2c99d 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java
@@ -73,7 +73,7 @@ import org.apache.isis.viewer.wicket.model.common.PageParametersUtils;
import org.apache.isis.viewer.wicket.model.mementos.ActionMemento;
import org.apache.isis.viewer.wicket.model.mementos.ActionParameterMemento;
import org.apache.isis.viewer.wicket.model.mementos.PageParameterNames;
-import org.apache.isis.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
import lombok.val;
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkableModel.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkableModel.java
index 405833a..0753fdb 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkableModel.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkableModel.java
@@ -21,7 +21,7 @@ package org.apache.isis.viewer.wicket.model.models;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.apache.isis.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
public abstract class BookmarkableModel<T> extends ModelAbstract<T> {
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkedPagesModel.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkedPagesModel.java
index 092e62c..0f6af9e 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkedPagesModel.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkedPagesModel.java
@@ -28,7 +28,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.isis.core.commons.internal.collections._Lists;
import org.apache.isis.core.metamodel.adapter.oid.RootOid;
-import org.apache.isis.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
public class BookmarkedPagesModel extends ModelAbstract<List<BookmarkTreeNode>> {
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityCollectionModel.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityCollectionModel.java
index af8f49e..f342aeb 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityCollectionModel.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityCollectionModel.java
@@ -54,9 +54,9 @@ import org.apache.isis.viewer.wicket.model.links.LinkAndLabel;
import org.apache.isis.viewer.wicket.model.links.LinksProvider;
import org.apache.isis.viewer.wicket.model.mementos.CollectionMemento;
import org.apache.isis.viewer.wicket.model.models.Util.LowestCommonSuperclassFinder;
-import org.apache.isis.webapp.context.IsisWebAppCommonContext;
-import org.apache.isis.webapp.context.memento.ObjectMemento;
-import org.apache.isis.webapp.context.memento.ObjectMementoService;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.memento.ObjectMemento;
+import org.apache.isis.core.webapp.context.memento.ObjectMementoService;
import static org.apache.isis.core.commons.internal.base._NullSafe.stream;
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModel.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModel.java
index 4df593c..0fe60f8 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModel.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModel.java
@@ -45,8 +45,8 @@ import org.apache.isis.viewer.wicket.model.hints.UiHintContainer;
import org.apache.isis.viewer.wicket.model.mementos.PageParameterNames;
import org.apache.isis.viewer.wicket.model.mementos.PropertyMemento;
import org.apache.isis.viewer.wicket.model.util.ComponentHintKey;
-import org.apache.isis.webapp.context.IsisWebAppCommonContext;
-import org.apache.isis.webapp.context.memento.ObjectMemento;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.memento.ObjectMemento;
import static org.apache.isis.core.commons.internal.base._With.requires;
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModelForReference.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModelForReference.java
index 64f51e8..23d591f 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModelForReference.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModelForReference.java
@@ -23,7 +23,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.isis.applib.services.hint.HintStore;
import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.webapp.context.memento.ObjectMemento;
+import org.apache.isis.core.webapp.context.memento.ObjectMemento;
import static org.apache.isis.viewer.wicket.model.models.EntityModel.createPageParameters;
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/HintPageParameterSerializer.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/HintPageParameterSerializer.java
index 7c87d58..e4e5281 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/HintPageParameterSerializer.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/HintPageParameterSerializer.java
@@ -26,7 +26,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.isis.applib.services.bookmark.Bookmark;
import org.apache.isis.applib.services.hint.HintStore;
import org.apache.isis.viewer.wicket.model.util.ComponentHintKey;
-import org.apache.isis.webapp.context.memento.ObjectMemento;
+import org.apache.isis.core.webapp.context.memento.ObjectMemento;
import lombok.val;
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ModelAbstract.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ModelAbstract.java
index a620dff..8fd7a49 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ModelAbstract.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ModelAbstract.java
@@ -22,7 +22,7 @@ package org.apache.isis.viewer.wicket.model.models;
import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.isis.viewer.wicket.model.common.CommonContextUtils;
-import org.apache.isis.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
import lombok.NonNull;
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ObjectAdapterModel.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ObjectAdapterModel.java
index 5b3595d..b74adef 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ObjectAdapterModel.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ObjectAdapterModel.java
@@ -23,7 +23,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.webapp.context.memento.ObjectMemento;
+import org.apache.isis.core.webapp.context.memento.ObjectMemento;
public interface ObjectAdapterModel extends IModel<ManagedObject> {
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java
index 4b3a89a..97e49ec 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java
@@ -54,7 +54,7 @@ import org.apache.isis.viewer.wicket.model.links.LinkAndLabel;
import org.apache.isis.viewer.wicket.model.links.LinksProvider;
import org.apache.isis.viewer.wicket.model.mementos.ActionParameterMemento;
import org.apache.isis.viewer.wicket.model.mementos.PropertyMemento;
-import org.apache.isis.webapp.context.memento.ObjectMemento;
+import org.apache.isis.core.webapp.context.memento.ObjectMemento;
import lombok.Getter;
import lombok.Setter;
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModelWithMultiPending.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModelWithMultiPending.java
index 7484538..495fb04 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModelWithMultiPending.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModelWithMultiPending.java
@@ -25,7 +25,7 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
-import org.apache.isis.webapp.context.memento.ObjectMemento;
+import org.apache.isis.core.webapp.context.memento.ObjectMemento;
import lombok.val;
import lombok.extern.log4j.Log4j2;
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModelWithPending.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModelWithPending.java
index e6ae447..2e1b001 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModelWithPending.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModelWithPending.java
@@ -23,7 +23,7 @@ import java.io.Serializable;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
-import org.apache.isis.webapp.context.memento.ObjectMemento;
+import org.apache.isis.core.webapp.context.memento.ObjectMemento;
import lombok.extern.log4j.Log4j2;
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ServiceActionsModel.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ServiceActionsModel.java
index 5c3d465..74a5461 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ServiceActionsModel.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ServiceActionsModel.java
@@ -26,7 +26,7 @@ import java.util.stream.Collectors;
import org.apache.isis.applib.annotation.DomainServiceLayout;
import org.apache.isis.core.metamodel.facets.object.domainservicelayout.DomainServiceLayoutFacet;
import org.apache.isis.core.metamodel.spec.ManagedObject;
-import org.apache.isis.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
import lombok.val;
/**
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ToggledMementosProvider.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ToggledMementosProvider.java
index b388ef7..5b0dae6 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ToggledMementosProvider.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ToggledMementosProvider.java
@@ -23,7 +23,7 @@ import java.io.Serializable;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.isis.core.commons.collections.Can;
-import org.apache.isis.webapp.context.memento.ObjectMemento;
+import org.apache.isis.core.webapp.context.memento.ObjectMemento;
public interface ToggledMementosProvider extends Serializable {
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ValueModel.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ValueModel.java
index 6fdc662..0c8a6d9 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ValueModel.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ValueModel.java
@@ -21,8 +21,8 @@ package org.apache.isis.viewer.wicket.model.models;
import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
-import org.apache.isis.webapp.context.IsisWebAppCommonContext;
-import org.apache.isis.webapp.context.memento.ObjectMemento;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.memento.ObjectMemento;
/**
* Represents a standalone value.
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/VoidModel.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/VoidModel.java
index 7f7bd82..6c4cab8 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/VoidModel.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/VoidModel.java
@@ -20,7 +20,7 @@
package org.apache.isis.viewer.wicket.model.models;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
-import org.apache.isis.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
/**
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/WelcomeModel.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/WelcomeModel.java
index e061d4f..9d891ba 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/WelcomeModel.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/WelcomeModel.java
@@ -19,7 +19,7 @@
package org.apache.isis.viewer.wicket.model.models;
-import org.apache.isis.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
/**
* Model providing welcome text.
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/whereami/WhereAmIModelDefault.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/whereami/WhereAmIModelDefault.java
index c9ccdd5..d369246 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/whereami/WhereAmIModelDefault.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/whereami/WhereAmIModelDefault.java
@@ -24,7 +24,7 @@ import java.util.stream.Stream;
import org.apache.isis.core.metamodel.util.pchain.ParentChain;
import org.apache.isis.viewer.wicket.model.models.EntityModel;
-import org.apache.isis.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
import lombok.val;
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/util/ComponentHintKey.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/util/ComponentHintKey.java
index 39bbd55..f1505be 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/util/ComponentHintKey.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/util/ComponentHintKey.java
@@ -28,7 +28,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.isis.applib.services.bookmark.Bookmark;
import org.apache.isis.applib.services.hint.HintStore;
import org.apache.isis.viewer.wicket.model.hints.UiHintContainer;
-import org.apache.isis.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
import lombok.AccessLevel;
import lombok.Getter;
diff --git a/viewers/wicket/model/src/test/java/org/apache/isis/viewer/wicket/model/models/EntityModel_hintsTest.java b/viewers/wicket/model/src/test/java/org/apache/isis/viewer/wicket/model/models/EntityModel_hintsTest.java
index 48d5d2d..f47979a 100644
--- a/viewers/wicket/model/src/test/java/org/apache/isis/viewer/wicket/model/models/EntityModel_hintsTest.java
+++ b/viewers/wicket/model/src/test/java/org/apache/isis/viewer/wicket/model/models/EntityModel_hintsTest.java
@@ -34,7 +34,7 @@ import static org.junit.Assert.assertThat;
import org.apache.isis.core.metamodel.MetaModelContext_forTesting;
import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
import lombok.val;
diff --git a/viewers/wicket/model/src/test/java/org/apache/isis/viewer/wicket/model/models/ScalarModel_isScalarSubtypingAnyOf_Test.java b/viewers/wicket/model/src/test/java/org/apache/isis/viewer/wicket/model/models/ScalarModel_isScalarSubtypingAnyOf_Test.java
index 948bae0..5130849 100644
--- a/viewers/wicket/model/src/test/java/org/apache/isis/viewer/wicket/model/models/ScalarModel_isScalarSubtypingAnyOf_Test.java
+++ b/viewers/wicket/model/src/test/java/org/apache/isis/viewer/wicket/model/models/ScalarModel_isScalarSubtypingAnyOf_Test.java
@@ -33,8 +33,8 @@ import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.metamodel.objectmanager.ObjectManager;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.webapp.context.IsisWebAppCommonContext;
-import org.apache.isis.webapp.context.memento.ObjectMementoService;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.memento.ObjectMementoService;
import lombok.val;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/ComponentFactoryAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/ComponentFactoryAbstract.java
index 9ebe3a6..fb5e645 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/ComponentFactoryAbstract.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/ComponentFactoryAbstract.java
@@ -24,7 +24,7 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.request.resource.CssResourceReference;
import org.apache.isis.viewer.wicket.ui.panels.PanelUtil;
-import org.apache.isis.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
import lombok.Getter;
import lombok.Setter;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponseHandlingStrategy.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponseHandlingStrategy.java
index 2354d0d..85ed34c 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponseHandlingStrategy.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponseHandlingStrategy.java
@@ -33,7 +33,7 @@ import org.apache.wicket.util.time.Duration;
import org.apache.isis.viewer.wicket.model.models.VoidModel;
import org.apache.isis.viewer.wicket.ui.pages.voidreturn.VoidReturnPage;
-import org.apache.isis.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
public enum ActionResultResponseHandlingStrategy {
REDIRECT_TO_VOID {
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponseType.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponseType.java
index 4fa2099..719a866 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponseType.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponseType.java
@@ -39,7 +39,7 @@ import org.apache.isis.viewer.wicket.ui.pages.entity.EntityPage;
import org.apache.isis.viewer.wicket.ui.pages.standalonecollection.StandaloneCollectionPage;
import org.apache.isis.viewer.wicket.ui.pages.value.ValuePage;
import org.apache.isis.viewer.wicket.ui.pages.voidreturn.VoidReturnPage;
-import org.apache.isis.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
import lombok.val;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/JarManifestModel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/JarManifestModel.java
index 7e92545..e93a667 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/JarManifestModel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/JarManifestModel.java
@@ -36,7 +36,7 @@ import org.apache.isis.core.commons.internal.collections._Lists;
import org.apache.isis.core.commons.internal.context._Context;
import org.apache.isis.core.metamodel.commons.CloseableExtensions;
import org.apache.isis.viewer.wicket.model.models.ModelAbstract;
-import org.apache.isis.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
public class JarManifestModel extends ModelAbstract<JarManifestModel> {
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/CssMenuItem.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/CssMenuItem.java
index 0b74d5f..7472a73 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/CssMenuItem.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/CssMenuItem.java
@@ -46,7 +46,7 @@ import org.apache.isis.viewer.wicket.ui.pages.PageAbstract;
import org.apache.isis.viewer.wicket.ui.util.Components;
import org.apache.isis.viewer.wicket.ui.util.CssClassAppender;
import org.apache.isis.viewer.wicket.ui.util.Tooltips;
-import org.apache.isis.webapp.context.memento.ObjectMemento;
+import org.apache.isis.core.webapp.context.memento.ObjectMemento;
import lombok.val;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionUtil.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionUtil.java
index 4b198da..93dd5cd 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionUtil.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionUtil.java
@@ -44,7 +44,7 @@ import org.apache.isis.viewer.wicket.model.models.ServiceActionsModel;
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 org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
import lombok.val;
import lombok.extern.log4j.Log4j2;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryActionsPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryActionsPanel.java
index dbfa734..7b1db1a 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryActionsPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryActionsPanel.java
@@ -39,7 +39,7 @@ import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistry;
import org.apache.isis.viewer.wicket.ui.panels.PanelBase;
import org.apache.isis.viewer.wicket.ui.util.CssClassAppender;
import org.apache.isis.viewer.wicket.ui.util.Tooltips;
-import org.apache.isis.webapp.wormhole.AuthenticationSessionWormhole;
+import org.apache.isis.core.webapp.wormhole.AuthenticationSessionWormhole;
/**
* A panel responsible to render the application actions as menu in a navigation bar.
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/AssociatedWithActionsHelper.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/AssociatedWithActionsHelper.java
index aaa4e89..a9520ea 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/AssociatedWithActionsHelper.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/AssociatedWithActionsHelper.java
@@ -32,7 +32,7 @@ import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.viewer.wicket.model.models.EntityCollectionModel;
-import org.apache.isis.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
import lombok.val;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/CollectionPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/CollectionPanel.java
index aa322f7..ee2b0f5 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/CollectionPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/CollectionPanel.java
@@ -46,7 +46,7 @@ import org.apache.isis.viewer.wicket.ui.components.collectioncontents.ajaxtable.
import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelAbstract2;
import org.apache.isis.viewer.wicket.ui.components.widgets.checkbox.ContainedToggleboxPanel;
import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
-import org.apache.isis.webapp.context.memento.ObjectMemento;
+import org.apache.isis.core.webapp.context.memento.ObjectMemento;
import lombok.val;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java
index 14da8e5..f3c4649 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java
@@ -56,7 +56,7 @@ import org.apache.isis.viewer.wicket.ui.components.collectioncontents.ajaxtable.
import org.apache.isis.viewer.wicket.ui.components.collectioncontents.ajaxtable.columns.ObjectAdapterTitleColumn;
import org.apache.isis.viewer.wicket.ui.components.collectioncontents.ajaxtable.columns.ObjectAdapterToggleboxColumn;
import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
-import org.apache.isis.webapp.context.memento.ObjectMemento;
+import org.apache.isis.core.webapp.context.memento.ObjectMemento;
import static org.apache.isis.core.commons.internal.base._With.mapIfPresentElse;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ColumnAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ColumnAbstract.java
index becca30..5109ce8 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ColumnAbstract.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ColumnAbstract.java
@@ -31,7 +31,7 @@ import org.apache.isis.viewer.wicket.ui.ComponentType;
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.collectioncontents.ajaxtable.CollectionContentsAsAjaxTablePanel;
-import org.apache.isis.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
import lombok.val;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ObjectAdapterPropertyColumn.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ObjectAdapterPropertyColumn.java
index cb229f4..15de3d7 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ObjectAdapterPropertyColumn.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ObjectAdapterPropertyColumn.java
@@ -38,7 +38,7 @@ import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistry;
import org.apache.isis.viewer.wicket.ui.components.collectioncontents.ajaxtable.CollectionContentsAsAjaxTablePanel;
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 org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
import lombok.val;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ObjectAdapterTitleColumn.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ObjectAdapterTitleColumn.java
index 6300b7f..7b2a18c 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ObjectAdapterTitleColumn.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ObjectAdapterTitleColumn.java
@@ -30,8 +30,8 @@ import org.apache.isis.viewer.wicket.model.models.EntityModel.RenderingHint;
import org.apache.isis.viewer.wicket.model.models.ValueModel;
import org.apache.isis.viewer.wicket.ui.ComponentType;
import org.apache.isis.viewer.wicket.ui.util.CssClassAppender;
-import org.apache.isis.webapp.context.IsisWebAppCommonContext;
-import org.apache.isis.webapp.context.memento.ObjectMemento;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.memento.ObjectMemento;
import lombok.val;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ObjectAdapterToggleboxColumn.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ObjectAdapterToggleboxColumn.java
index 0614765..e545c40 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ObjectAdapterToggleboxColumn.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ObjectAdapterToggleboxColumn.java
@@ -34,7 +34,7 @@ import org.apache.isis.viewer.wicket.model.common.OnSelectionHandler;
import org.apache.isis.viewer.wicket.model.models.EntityModel;
import org.apache.isis.viewer.wicket.ui.components.widgets.checkbox.ContainedToggleboxPanel;
import org.apache.isis.viewer.wicket.ui.util.CssClassAppender;
-import org.apache.isis.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
import lombok.val;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanel.java
index f66e4f0..8019f1d 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanel.java
@@ -39,7 +39,7 @@ import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
import org.apache.isis.viewer.wicket.ui.util.Components;
import org.apache.isis.viewer.wicket.ui.util.CssClassAppender;
import org.apache.isis.viewer.wicket.ui.util.Tooltips;
-import org.apache.isis.webapp.context.memento.ObjectMemento;
+import org.apache.isis.core.webapp.context.memento.ObjectMemento;
import lombok.val;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelSelect2Abstract.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelSelect2Abstract.java
index c1d307f..7b2e948 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelSelect2Abstract.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelSelect2Abstract.java
@@ -40,7 +40,7 @@ import org.apache.isis.viewer.wicket.ui.components.widgets.select2.Select2;
import org.apache.isis.viewer.wicket.ui.components.widgets.select2.providers.ObjectAdapterMementoProviderAbstract;
import org.apache.isis.viewer.wicket.ui.util.CssClassAppender;
import org.apache.isis.viewer.wicket.ui.util.Tooltips;
-import org.apache.isis.webapp.context.memento.ObjectMemento;
+import org.apache.isis.core.webapp.context.memento.ObjectMemento;
import lombok.val;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/TextFieldWithDateTimePicker.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/TextFieldWithDateTimePicker.java
index 8325175..e0cd072 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/TextFieldWithDateTimePicker.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/TextFieldWithDateTimePicker.java
@@ -32,7 +32,7 @@ import org.apache.wicket.request.resource.JavaScriptResourceReference;
import org.apache.wicket.util.convert.IConverter;
import org.apache.isis.viewer.wicket.ui.components.scalars.DateConverter;
-import org.apache.isis.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
import de.agilecoders.wicket.core.util.Attributes;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java
index 077562d..775f380 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java
@@ -55,7 +55,7 @@ import org.apache.isis.viewer.wicket.ui.components.widgets.select2.providers.Obj
import org.apache.isis.viewer.wicket.ui.util.Components;
import org.apache.isis.viewer.wicket.ui.util.CssClassAppender;
import org.apache.isis.viewer.wicket.ui.util.Tooltips;
-import org.apache.isis.webapp.context.memento.ObjectMemento;
+import org.apache.isis.core.webapp.context.memento.ObjectMemento;
import lombok.val;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/valuechoices/ValueChoicesSelect2Panel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/valuechoices/ValueChoicesSelect2Panel.java
index 21b2da9..9c33827 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/valuechoices/ValueChoicesSelect2Panel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/valuechoices/ValueChoicesSelect2Panel.java
@@ -37,7 +37,7 @@ import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelSelect2Abs
import org.apache.isis.viewer.wicket.ui.components.widgets.select2.Select2;
import org.apache.isis.viewer.wicket.ui.components.widgets.select2.providers.ObjectAdapterMementoProviderForValueChoices;
import org.apache.isis.viewer.wicket.ui.util.Tooltips;
-import org.apache.isis.webapp.context.memento.ObjectMemento;
+import org.apache.isis.core.webapp.context.memento.ObjectMemento;
import lombok.val;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/IsisToWicketTreeAdapter.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/IsisToWicketTreeAdapter.java
index 060baae..8449ecd 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/IsisToWicketTreeAdapter.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/IsisToWicketTreeAdapter.java
@@ -54,7 +54,7 @@ import org.apache.isis.viewer.wicket.model.models.ModelAbstract;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.model.models.ValueModel;
import org.apache.isis.viewer.wicket.ui.components.entity.icontitle.EntityIconAndTitlePanel;
-import org.apache.isis.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
import static org.apache.isis.core.commons.internal.base._With.requires;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/welcome/WelcomePanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/welcome/WelcomePanelFactory.java
index d41d3bd..4be85b8 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/welcome/WelcomePanelFactory.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/welcome/WelcomePanelFactory.java
@@ -38,7 +38,7 @@ public class WelcomePanelFactory extends ComponentFactoryAbstract {
private static final String DEFAULT_MESSAGE =
"Apache Isis' Wicket Viewer combines the power of Apache Wicket " +
"for web UIs with Apache Isis for domain modelling. " +
- "Out-of-the box you get a fully-functional webapp just from " +
+ "Out-of-the box you get a fully-functional corewebapp just from " +
"your domain objects; you can then customize the UI by " +
"writing custom Wicket components, replacing the page layouts or " +
"simply by altering the CSS";
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbModel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbModel.java
index 2b39114..5b0a012 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbModel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbModel.java
@@ -33,7 +33,7 @@ import org.apache.isis.core.metamodel.adapter.oid.Oid.Factory;
import org.apache.isis.core.metamodel.adapter.oid.RootOid;
import org.apache.isis.viewer.wicket.model.mementos.PageParameterNames;
import org.apache.isis.viewer.wicket.model.models.EntityModel;
-import org.apache.isis.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
import lombok.val;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/ActionLink.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/ActionLink.java
index a68eeea..5c9b8cc 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/ActionLink.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/ActionLink.java
@@ -38,7 +38,7 @@ import org.apache.isis.viewer.wicket.model.isis.WicketViewerSettings;
import org.apache.isis.viewer.wicket.model.isis.WicketViewerSettingsAccessor;
import org.apache.isis.viewer.wicket.model.models.ActionModel;
import org.apache.isis.viewer.wicket.ui.panels.PanelUtil;
-import org.apache.isis.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
import lombok.Getter;
import lombok.val;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/ActionLinkFactoryAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/ActionLinkFactoryAbstract.java
index 5bb80db..5f2f7e8 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/ActionLinkFactoryAbstract.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/ActionLinkFactoryAbstract.java
@@ -60,7 +60,7 @@ import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistryAccessor;
import org.apache.isis.viewer.wicket.ui.pages.entity.EntityPage;
import org.apache.isis.viewer.wicket.ui.panels.FormExecutorDefault;
import org.apache.isis.viewer.wicket.ui.util.CssClassAppender;
-import org.apache.isis.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
import lombok.val;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/ChoiceExt.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/ChoiceExt.java
index 3079653..8adf772 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/ChoiceExt.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/ChoiceExt.java
@@ -24,7 +24,7 @@ import org.wicketstuff.select2.Select2MultiChoice;
import org.wicketstuff.select2.Settings;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
-import org.apache.isis.webapp.context.memento.ObjectMemento;
+import org.apache.isis.core.webapp.context.memento.ObjectMemento;
/**
* Represents functionality that is common to both {@link Select2Choice} and {@link Select2MultiChoice}, but for
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2.java
index 5ddf28e..05da7b6 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2.java
@@ -35,7 +35,7 @@ import org.wicketstuff.select2.Settings;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.model.models.ScalarModelWithMultiPending;
import org.apache.isis.viewer.wicket.model.models.ScalarModelWithPending;
-import org.apache.isis.webapp.context.memento.ObjectMemento;
+import org.apache.isis.core.webapp.context.memento.ObjectMemento;
/**
* Wrapper around either a {@link Select2Choice} or a {@link Select2MultiChoice}.
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2ChoiceExt.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2ChoiceExt.java
index c566764..b32b8ce 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2ChoiceExt.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2ChoiceExt.java
@@ -24,7 +24,7 @@ import org.wicketstuff.select2.Select2Choice;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.ui.components.widgets.select2.providers.EmptyChoiceProvider;
-import org.apache.isis.webapp.context.memento.ObjectMemento;
+import org.apache.isis.core.webapp.context.memento.ObjectMemento;
public class Select2ChoiceExt extends Select2Choice<ObjectMemento> implements ChoiceExt {
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2MultiChoiceExt.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2MultiChoiceExt.java
index 4bac1ed..de50859 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2MultiChoiceExt.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2MultiChoiceExt.java
@@ -27,7 +27,7 @@ import org.wicketstuff.select2.Select2MultiChoice;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.ui.components.widgets.select2.providers.EmptyChoiceProvider;
-import org.apache.isis.webapp.context.memento.ObjectMemento;
+import org.apache.isis.core.webapp.context.memento.ObjectMemento;
public class Select2MultiChoiceExt
extends Select2MultiChoice<ObjectMemento>
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/EmptyChoiceProvider.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/EmptyChoiceProvider.java
index b50a097..a4b28c7 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/EmptyChoiceProvider.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/EmptyChoiceProvider.java
@@ -23,7 +23,7 @@ import java.util.Collection;
import org.wicketstuff.select2.ChoiceProvider;
import org.wicketstuff.select2.Response;
-import org.apache.isis.webapp.context.memento.ObjectMemento;
+import org.apache.isis.core.webapp.context.memento.ObjectMemento;
public class EmptyChoiceProvider extends ChoiceProvider<ObjectMemento> {
private static final long serialVersionUID = 1L;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderAbstract.java
index 034b376..77241d3 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderAbstract.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderAbstract.java
@@ -37,8 +37,8 @@ import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.viewer.wicket.model.isis.WicketViewerSettings;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.ui.components.scalars.IsisConverterLocator;
-import org.apache.isis.webapp.context.IsisWebAppCommonContext;
-import org.apache.isis.webapp.context.memento.ObjectMemento;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.memento.ObjectMemento;
import lombok.Getter;
import lombok.val;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForChoices.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForChoices.java
index ff26e8c..49c2245 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForChoices.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForChoices.java
@@ -38,7 +38,7 @@ package org.apache.isis.viewer.wicket.ui.components.widgets.select2.providers;
import java.util.List;
-import org.apache.isis.webapp.context.memento.ObjectMemento;
+import org.apache.isis.core.webapp.context.memento.ObjectMemento;
public interface ObjectAdapterMementoProviderForChoices {
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForReferenceChoices.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForReferenceChoices.java
index d88269b..c42a68b 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForReferenceChoices.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForReferenceChoices.java
@@ -21,7 +21,7 @@ package org.apache.isis.viewer.wicket.ui.components.widgets.select2.providers;
import java.util.List;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
-import org.apache.isis.webapp.context.memento.ObjectMemento;
+import org.apache.isis.core.webapp.context.memento.ObjectMemento;
import lombok.Getter;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForReferenceObjectAutoComplete.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForReferenceObjectAutoComplete.java
index e04bcf4..f5203b5 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForReferenceObjectAutoComplete.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForReferenceObjectAutoComplete.java
@@ -24,7 +24,7 @@ import org.apache.isis.core.commons.internal.collections._Lists;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.core.metamodel.facets.object.autocomplete.AutoCompleteFacet;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
-import org.apache.isis.webapp.context.memento.ObjectMemento;
+import org.apache.isis.core.webapp.context.memento.ObjectMemento;
import lombok.val;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForReferenceParamOrPropertyAutoComplete.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForReferenceParamOrPropertyAutoComplete.java
index 6366fc5..df3926e 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForReferenceParamOrPropertyAutoComplete.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForReferenceParamOrPropertyAutoComplete.java
@@ -25,7 +25,7 @@ import org.apache.isis.core.commons.internal.base._NullSafe;
import org.apache.isis.core.commons.internal.collections._Lists;
import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
-import org.apache.isis.webapp.context.memento.ObjectMemento;
+import org.apache.isis.core.webapp.context.memento.ObjectMemento;
import lombok.val;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForValueChoices.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForValueChoices.java
index 9413b5c..b24f275 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForValueChoices.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForValueChoices.java
@@ -24,7 +24,7 @@ import java.util.function.Predicate;
import org.apache.isis.core.commons.internal.collections._Lists;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
-import org.apache.isis.webapp.context.memento.ObjectMemento;
+import org.apache.isis.core.webapp.context.memento.ObjectMemento;
import lombok.Getter;
import lombok.val;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/ExceptionModel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/ExceptionModel.java
index 8e9cfba..e9e3f02 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/ExceptionModel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/ExceptionModel.java
@@ -28,7 +28,7 @@ import org.apache.isis.core.commons.internal.collections._Lists;
import org.apache.isis.core.commons.internal.exceptions._Exceptions;
import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
import org.apache.isis.viewer.wicket.model.models.ModelAbstract;
-import org.apache.isis.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
public class ExceptionModel extends ModelAbstract<List<StackTraceDetail>> {
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/JGrowlBehaviour.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/JGrowlBehaviour.java
index b4011dd..a03c0dd 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/JGrowlBehaviour.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/JGrowlBehaviour.java
@@ -29,7 +29,7 @@ import org.apache.wicket.request.resource.JavaScriptResourceReference;
import org.apache.isis.applib.RecoverableException;
import org.apache.isis.core.commons.internal.base._Strings;
import org.apache.isis.security.api.authentication.MessageBroker;
-import org.apache.isis.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
/**
* Attach to any Ajax button that might trigger a notification (ie calls
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/WebPageBase.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/WebPageBase.java
index 16c093e..ba4130e 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/WebPageBase.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/WebPageBase.java
@@ -25,7 +25,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.isis.core.config.viewer.wicket.WebAppConfiguration;
import org.apache.isis.core.runtime.session.IsisSessionFactory;
import org.apache.isis.viewer.wicket.model.common.CommonContextUtils;
-import org.apache.isis.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
/**
* Provides all the system dependencies for sub-classes.
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/EmailAvailableValidator.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/EmailAvailableValidator.java
index 97a7200..662dbb0 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/EmailAvailableValidator.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/EmailAvailableValidator.java
@@ -24,7 +24,7 @@ import org.apache.wicket.validation.ValidationError;
import org.apache.isis.applib.services.userreg.UserRegistrationService;
import org.apache.isis.core.runtime.session.IsisSessionFactory;
import org.apache.isis.viewer.wicket.ui.validation.ValidatorBase;
-import org.apache.isis.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
import lombok.val;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/UsernameAvailableValidator.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/UsernameAvailableValidator.java
index 9040699..47ab96d 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/UsernameAvailableValidator.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/UsernameAvailableValidator.java
@@ -24,7 +24,7 @@ import org.apache.wicket.validation.ValidationError;
import org.apache.isis.applib.services.userreg.UserRegistrationService;
import org.apache.isis.core.runtime.session.IsisSessionFactory;
import org.apache.isis.viewer.wicket.ui.validation.ValidatorBase;
-import org.apache.isis.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
import lombok.val;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/actionprompt/ActionPromptPage.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/actionprompt/ActionPromptPage.java
index 1a7e97a..f7ab184 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/actionprompt/ActionPromptPage.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/actionprompt/ActionPromptPage.java
@@ -25,7 +25,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.isis.viewer.wicket.model.models.ActionModel;
import org.apache.isis.viewer.wicket.ui.ComponentType;
import org.apache.isis.viewer.wicket.ui.pages.PageAbstract;
-import org.apache.isis.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
import lombok.val;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.java
index dc42651..ab29733 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.java
@@ -48,7 +48,7 @@ import org.apache.isis.viewer.wicket.ui.components.widgets.breadcrumbs.Breadcrum
import org.apache.isis.viewer.wicket.ui.components.widgets.breadcrumbs.BreadcrumbModelProvider;
import org.apache.isis.viewer.wicket.ui.pages.PageAbstract;
import org.apache.isis.viewer.wicket.ui.util.CssClassAppender;
-import org.apache.isis.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
import lombok.val;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java
index a560c14..fa8a763 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java
@@ -31,7 +31,7 @@ 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.pages.PageClassRegistry;
import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistryAccessor;
-import org.apache.isis.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
public abstract class FormAbstract<T> extends Form<T>
implements ComponentFactoryRegistryAccessor, PageClassRegistryAccessor {
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormExecutorDefault.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormExecutorDefault.java
index f63422b..5576a39 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormExecutorDefault.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormExecutorDefault.java
@@ -62,8 +62,8 @@ import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.ui.components.scalars.isisapplib.IsisBlobOrClobPanelAbstract;
import org.apache.isis.viewer.wicket.ui.errors.JGrowlUtil;
import org.apache.isis.viewer.wicket.ui.util.Components;
-import org.apache.isis.webapp.context.IsisWebAppCommonContext;
-import org.apache.isis.webapp.context.memento.ObjectMemento;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.memento.ObjectMemento;
import lombok.val;
import lombok.extern.log4j.Log4j2;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelBase.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelBase.java
index 995c50a..df6d846 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelBase.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelBase.java
@@ -43,7 +43,7 @@ import org.apache.isis.viewer.wicket.ui.components.tree.themes.TreeThemeProvider
import org.apache.isis.viewer.wicket.ui.pages.EmailVerificationUrlService;
import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistry;
import org.apache.isis.viewer.wicket.ui.pages.PageNavigationService;
-import org.apache.isis.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
/**
* Provides the <em>common context</em> for all implementing sub-classes.
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/validation/ValidatorBase.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/validation/ValidatorBase.java
index 8af99e9..5239aee 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/validation/ValidatorBase.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/validation/ValidatorBase.java
@@ -20,7 +20,7 @@ package org.apache.isis.viewer.wicket.ui.validation;
import org.apache.wicket.validation.IValidator;
-import org.apache.isis.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
import lombok.Getter;
diff --git a/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/ComponentFactoryAbstractTest_init.java b/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/ComponentFactoryAbstractTest_init.java
index 255b847..9738c50 100644
--- a/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/ComponentFactoryAbstractTest_init.java
+++ b/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/ComponentFactoryAbstractTest_init.java
@@ -27,7 +27,7 @@ import org.junit.rules.ExpectedException;
import org.apache.isis.core.metamodel.MetaModelContext_forTesting;
import org.apache.isis.core.metamodel.context.MetaModelContext;
-import org.apache.isis.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
public class ComponentFactoryAbstractTest_init {
diff --git a/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/collection/selector/CollectionContentsSelectorDropdownPanelTest.java b/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/collection/selector/CollectionContentsSelectorDropdownPanelTest.java
index dcca4dc..1b8ef3a 100644
--- a/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/collection/selector/CollectionContentsSelectorDropdownPanelTest.java
+++ b/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/collection/selector/CollectionContentsSelectorDropdownPanelTest.java
@@ -35,7 +35,7 @@ import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
import org.apache.isis.viewer.wicket.ui.ComponentFactory;
import org.apache.isis.viewer.wicket.ui.components.collectioncontents.ajaxtable.CollectionContentsAsAjaxTablePanelFactory;
-import org.apache.isis.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
import lombok.val;
diff --git a/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ObjectAdapterMementoProviderForValueChoicesTest.java b/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ObjectAdapterMementoProviderForValueChoicesTest.java
index cd8049e..02b3459 100644
--- a/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ObjectAdapterMementoProviderForValueChoicesTest.java
+++ b/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ObjectAdapterMementoProviderForValueChoicesTest.java
@@ -39,8 +39,8 @@ import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.viewer.wicket.model.isis.WicketViewerSettings;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.ui.components.widgets.select2.providers.ObjectAdapterMementoProviderForValueChoices;
-import org.apache.isis.webapp.context.IsisWebAppCommonContext;
-import org.apache.isis.webapp.context.memento.ObjectMemento;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.memento.ObjectMemento;
public class ObjectAdapterMementoProviderForValueChoicesTest {
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis.java
index 60a8662..ca1da89 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis.java
@@ -39,8 +39,8 @@ import org.apache.isis.viewer.wicket.model.models.BookmarkedPagesModel;
import org.apache.isis.viewer.wicket.ui.components.widgets.breadcrumbs.BreadcrumbModel;
import org.apache.isis.viewer.wicket.ui.components.widgets.breadcrumbs.BreadcrumbModelProvider;
import org.apache.isis.viewer.wicket.ui.pages.BookmarkedPagesModelProvider;
-import org.apache.isis.webapp.context.IsisWebAppCommonContext;
-import org.apache.isis.webapp.wormhole.AuthenticationSessionWormhole;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.wormhole.AuthenticationSessionWormhole;
import lombok.Getter;
import lombok.val;
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/ConverterForObjectAdapterMemento.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/ConverterForObjectAdapterMemento.java
index db961ee..e6ac2a8 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/ConverterForObjectAdapterMemento.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/ConverterForObjectAdapterMemento.java
@@ -27,8 +27,8 @@ import org.apache.isis.core.commons.internal.base._Strings;
import org.apache.isis.core.metamodel.adapter.oid.Oid;
import org.apache.isis.core.metamodel.adapter.oid.RootOid;
import org.apache.isis.core.metamodel.spec.ManagedObject;
-import org.apache.isis.webapp.context.IsisWebAppCommonContext;
-import org.apache.isis.webapp.context.memento.ObjectMemento;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.memento.ObjectMemento;
import lombok.RequiredArgsConstructor;
import lombok.val;
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/WebRequestCycleForIsis.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/WebRequestCycleForIsis.java
index 816edf4..a353e06 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/WebRequestCycleForIsis.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/WebRequestCycleForIsis.java
@@ -66,7 +66,7 @@ import org.apache.isis.viewer.wicket.ui.pages.error.ErrorPage;
import org.apache.isis.viewer.wicket.ui.pages.login.WicketSignInPage;
import org.apache.isis.viewer.wicket.ui.pages.mmverror.MmvErrorPage;
import org.apache.isis.viewer.wicket.ui.panels.PromptFormAbstract;
-import org.apache.isis.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
import lombok.val;
import lombok.extern.log4j.Log4j2;
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistryDefault.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistryDefault.java
index e34009c..4241680 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistryDefault.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistryDefault.java
@@ -48,7 +48,7 @@ import org.apache.isis.viewer.wicket.ui.ComponentType;
import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistrar;
import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistrar.ComponentFactoryList;
import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistry;
-import org.apache.isis.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
import lombok.val;
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/mementos/ObjectMementoServiceWicket.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/mementos/ObjectMementoServiceWicket.java
index ff2e6ed..c259ee9 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/mementos/ObjectMementoServiceWicket.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/mementos/ObjectMementoServiceWicket.java
@@ -38,9 +38,9 @@ import org.apache.isis.core.metamodel.objectmanager.ObjectManager;
import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.webapp.context.memento.ObjectMemento;
-import org.apache.isis.webapp.context.memento.ObjectMementoCollection;
-import org.apache.isis.webapp.context.memento.ObjectMementoService;
+import org.apache.isis.core.webapp.context.memento.ObjectMemento;
+import org.apache.isis.core.webapp.context.memento.ObjectMementoCollection;
+import org.apache.isis.core.webapp.context.memento.ObjectMementoService;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/webmodule/WebModuleWicket.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/webmodule/WebModuleWicket.java
index 8c8432a..7db2a14 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/webmodule/WebModuleWicket.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/webmodule/WebModuleWicket.java
@@ -36,8 +36,8 @@ import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.core.commons.collections.Can;
import org.apache.isis.core.commons.internal.environment.IsisSystemEnvironment;
import org.apache.isis.core.config.IsisConfiguration;
-import org.apache.isis.webapp.modules.WebModuleAbstract;
-import org.apache.isis.webapp.modules.WebModuleContext;
+import org.apache.isis.core.webapp.modules.WebModuleAbstract;
+import org.apache.isis.core.webapp.modules.WebModuleContext;
import lombok.Getter;
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication.java
index 684894f..a5c3168 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication.java
@@ -91,8 +91,8 @@ import org.apache.isis.viewer.wicket.viewer.integration.ConverterForObjectAdapte
import org.apache.isis.viewer.wicket.viewer.integration.ConverterForObjectAdapterMemento;
import org.apache.isis.viewer.wicket.viewer.integration.IsisResourceSettings;
import org.apache.isis.viewer.wicket.viewer.integration.WebRequestCycleForIsis;
-import org.apache.isis.webapp.context.IsisWebAppCommonContext;
-import org.apache.isis.webapp.context.memento.ObjectMemento;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.memento.ObjectMemento;
import static org.apache.isis.core.commons.internal.base._With.requires;
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication_newPageFactory.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication_newPageFactory.java
index f509d16..50a2518 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication_newPageFactory.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication_newPageFactory.java
@@ -26,7 +26,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.isis.core.commons.internal.base._Casts;
import org.apache.isis.viewer.wicket.model.models.PageType;
import org.apache.isis.viewer.wicket.ui.pages.entity.EntityPage;
-import org.apache.isis.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
import lombok.RequiredArgsConstructor;
import lombok.val;
diff --git a/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_Authenticate.java b/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_Authenticate.java
index 345fbaa..8a419c1 100644
--- a/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_Authenticate.java
+++ b/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_Authenticate.java
@@ -45,7 +45,7 @@ import org.apache.isis.security.api.authentication.standard.Authenticator;
import org.apache.isis.security.api.authentication.standard.RandomCodeGeneratorDefault;
import org.apache.isis.security.api.authentication.standard.SimpleSession;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
public class AuthenticatedWebSessionForIsis_Authenticate {
diff --git a/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_SignIn.java b/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_SignIn.java
index 7590839..771366a 100644
--- a/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_SignIn.java
+++ b/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_SignIn.java
@@ -42,7 +42,7 @@ import org.apache.isis.security.api.authentication.manager.AuthenticationManager
import org.apache.isis.security.api.authentication.standard.Authenticator;
import org.apache.isis.security.api.authentication.standard.RandomCodeGeneratorDefault;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
public class AuthenticatedWebSessionForIsis_SignIn {
diff --git a/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_TestAbstract.java b/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_TestAbstract.java
index f1731f3..e7eda88 100644
--- a/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_TestAbstract.java
+++ b/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_TestAbstract.java
@@ -33,7 +33,7 @@ import org.apache.isis.core.runtime.session.IsisSessionFactory;
import org.apache.isis.security.api.authentication.manager.AuthenticationManager;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
-import org.apache.isis.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
public abstract class AuthenticatedWebSessionForIsis_TestAbstract {
diff --git a/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication_Defaults.java b/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication_Defaults.java
index c44913b..2deab61 100644
--- a/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication_Defaults.java
+++ b/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication_Defaults.java
@@ -36,7 +36,7 @@ import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
import org.apache.isis.viewer.wicket.viewer.integration.AuthenticatedWebSessionForIsis;
-import org.apache.isis.webapp.context.memento.ObjectMemento;
+import org.apache.isis.core.webapp.context.memento.ObjectMemento;
public class IsisWicketApplication_Defaults {