[isis] 01/02: ISIS-2213: fixes incorrect default package names in IsisConfiguration

[da...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git

commit 5581b16cb456e42b36ec2171d10d8e9964236841
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Dec 5 00:44:47 2019 +0000

    ISIS-2213: fixes incorrect default package names in IsisConfiguration
---
 antora/components/userguide/modules/btb/pages/web-xml.adoc              | 2 +-
 core/config/src/main/java/org/apache/isis/config/IsisConfiguration.java | 2 +-
 .../java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.java  | 2 +-
 migration-notes.adoc                                                    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/antora/components/userguide/modules/btb/pages/web-xml.adoc b/antora/components/userguide/modules/btb/pages/web-xml.adoc
index aac1eb1..860de20 100644
--- a/antora/components/userguide/modules/btb/pages/web-xml.adoc
+++ b/antora/components/userguide/modules/btb/pages/web-xml.adoc
@@ -362,7 +362,7 @@ Its definition is:
     <filter-class>org.apache.wicket.protocol.http.WicketFilter</filter-class>
     <init-param>
         <param-name>applicationClassName</param-name>
-        <param-value>org.apache.isis.viewer.wicket.viewer.IsisWicketApplication</param-value>
+        <param-value>org.apache.isis.viewer.wicket.viewer.wicketapp.IsisWicketApplication</param-value>
     </init-param>
 </filter>
 ----
diff --git a/core/config/src/main/java/org/apache/isis/config/IsisConfiguration.java b/core/config/src/main/java/org/apache/isis/config/IsisConfiguration.java
index cb6b863..3a21198 100644
--- a/core/config/src/main/java/org/apache/isis/config/IsisConfiguration.java
+++ b/core/config/src/main/java/org/apache/isis/config/IsisConfiguration.java
@@ -674,7 +674,7 @@ public class IsisConfiguration {
         @Data
         public static class Wicket {
 
-            private String app = "org.apache.isis.viewer.wicket.viewer.IsisWicketApplication";
+            private String app = "org.apache.isis.viewer.wicket.viewer.wicketapp.IsisWicketApplication";
 
             /**
              * Whether the Ajax debug should be shown.
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.java b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.java
index 13e1c5a..2901098 100644
--- a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.java
+++ b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.java
@@ -67,7 +67,7 @@ public class EntityPage extends PageAbstract {
 
     /**
      * Called reflectively, in support of {@link BookmarkablePageLink} links. 
-     * Specifically handled by {@link org.apache.isis.viewer.wicket.viewer.IsisWicketApplication_newPageFactory}
+     * Specifically handled by {@link org.apache.isis.viewer.wicket.viewer.wicketapp.IsisWicketApplication_newPageFactory}
      */
     public static EntityPage bookmarked(
             IsisWebAppCommonContext commonContext, 
diff --git a/migration-notes.adoc b/migration-notes.adoc
index 16926c0..11d0e15 100644
--- a/migration-notes.adoc
+++ b/migration-notes.adoc
@@ -412,7 +412,7 @@ We also introduced a SPI to customize this behavior. This issue is tracked by ht
 		<param-value>my-wicket</param-value>
 	</context-param>
 
-	<!-- optional for overriding default 'org.apache.isis.viewer.wicket.viewer.IsisWicketApplication' -->
+	<!-- optional for overriding default 'org.apache.isis.viewer.wicket.viewer.wicketapp.IsisWicketApplication' -->
 	<context-param>
 		<param-name>isis.viewer.wicket.app</param-name>
 		<param-value>domainapp.webapp.MyDomainApplication</param-value>