You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2019/12/05 08:47:00 UTC

[isis] 01/06: ISIS-2213: renames isis-viewer-restfulobjects-server to isis-viewer-restfulobjects-viewer

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 a812bc7c04ee963aa228bfe02fc86768de64bd58
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Dec 5 08:08:31 2019 +0000

    ISIS-2213: renames <artifactId>isis-viewer-restfulobjects-server</artifactId> to <artifactId>isis-viewer-restfulobjects-viewer</artifactId>
---
 antora/components/userguide/modules/btb/pages/web-xml.adoc            | 2 +-
 .../src/main/java/org/apache/isis/config/IsisConfiguration.java       | 2 +-
 core/pom.xml                                                          | 4 ++--
 core/viewers/restfulobjects/jaxrs-resteasy-4/pom.xml                  | 4 ++--
 core/viewers/restfulobjects/server/pom.xml                            | 2 +-
 .../org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.java     | 2 +-
 mavendeps/webapp/pom.xml                                              | 2 +-
 migration-notes.adoc                                                  | 2 +-
 8 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/antora/components/userguide/modules/btb/pages/web-xml.adoc b/antora/components/userguide/modules/btb/pages/web-xml.adoc
index 860de20..aac1eb1 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.wicketapp.IsisWicketApplication</param-value>
+        <param-value>org.apache.isis.viewer.wicket.viewer.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 3a21198..cb6b863 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.wicketapp.IsisWicketApplication";
+            private String app = "org.apache.isis.viewer.wicket.viewer.IsisWicketApplication";
 
             /**
              * Whether the Ajax debug should be shown.
diff --git a/core/pom.xml b/core/pom.xml
index 77c6d83..f340c0a 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -837,12 +837,12 @@
 			</dependency>
 			<dependency>
 				<groupId>org.apache.isis.core</groupId>
-				<artifactId>isis-viewer-restfulobjects-server</artifactId>
+				<artifactId>isis-viewer-restfulobjects-viewer</artifactId>
 				<version>2.0.0-M3-SNAPSHOT</version>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.isis.core</groupId>
-				<artifactId>isis-viewer-restfulobjects-server</artifactId>
+				<artifactId>isis-viewer-restfulobjects-viewer</artifactId>
 				<version>2.0.0-M3-SNAPSHOT</version>
 				<type>test-jar</type>
 				<scope>test</scope>
diff --git a/core/viewers/restfulobjects/jaxrs-resteasy-4/pom.xml b/core/viewers/restfulobjects/jaxrs-resteasy-4/pom.xml
index 2564841..d55a04d 100644
--- a/core/viewers/restfulobjects/jaxrs-resteasy-4/pom.xml
+++ b/core/viewers/restfulobjects/jaxrs-resteasy-4/pom.xml
@@ -69,7 +69,7 @@
 
 		<dependency>
 			<groupId>org.apache.isis.core</groupId>
-			<artifactId>isis-viewer-restfulobjects-server</artifactId>
+			<artifactId>isis-viewer-restfulobjects-viewer</artifactId>
 		</dependency>
 
 		<dependency>
@@ -185,7 +185,7 @@
 
 		<dependency>
 			<groupId>org.apache.isis.core</groupId>
-			<artifactId>isis-viewer-restfulobjects-server</artifactId>
+			<artifactId>isis-viewer-restfulobjects-viewer</artifactId>
 			<type>test-jar</type>
 			<scope>test</scope>
 		</dependency>
diff --git a/core/viewers/restfulobjects/server/pom.xml b/core/viewers/restfulobjects/server/pom.xml
index d62bc63..d319b48 100644
--- a/core/viewers/restfulobjects/server/pom.xml
+++ b/core/viewers/restfulobjects/server/pom.xml
@@ -27,7 +27,7 @@
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
-    <artifactId>isis-viewer-restfulobjects-server</artifactId>
+    <artifactId>isis-viewer-restfulobjects-viewer</artifactId>
 
 	<name>Apache Isis Viewer - RO (Server)</name>
 
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 2901098..13e1c5a 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.wicketapp.IsisWicketApplication_newPageFactory}
+     * Specifically handled by {@link org.apache.isis.viewer.wicket.viewer.IsisWicketApplication_newPageFactory}
      */
     public static EntityPage bookmarked(
             IsisWebAppCommonContext commonContext, 
diff --git a/mavendeps/webapp/pom.xml b/mavendeps/webapp/pom.xml
index 09a1c10..60ce72b 100644
--- a/mavendeps/webapp/pom.xml
+++ b/mavendeps/webapp/pom.xml
@@ -102,7 +102,7 @@
 
 		<dependency>
 			<groupId>org.apache.isis.core</groupId>
-			<artifactId>isis-viewer-restfulobjects-server</artifactId>
+			<artifactId>isis-viewer-restfulobjects-viewer</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.isis.core</groupId>
diff --git a/migration-notes.adoc b/migration-notes.adoc
index 11d0e15..16926c0 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.wicketapp.IsisWicketApplication' -->
+	<!-- optional for overriding default 'org.apache.isis.viewer.wicket.viewer.IsisWicketApplication' -->
 	<context-param>
 		<param-name>isis.viewer.wicket.app</param-name>
 		<param-value>domainapp.webapp.MyDomainApplication</param-value>