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:03 UTC
[isis] 04/06: ISIS-2213: moves classes under
o.a.i.viewer.restfulobjects.viewer (instead of ...server)
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 99760eb448a406e6f524d93b267c6a8c3508cd1b
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Dec 5 08:15:26 2019 +0000
ISIS-2213: moves classes under o.a.i.viewer.restfulobjects.viewer (instead of ...server)
---
.../jaxrsresteasy4/IsisResteasy4Plugin.java | 2 +-
...er.restfulobjects.viewer.IsisJaxrsServerPlugin} | 0
...eContext_ensureCompatibleAcceptHeader_Test.java | 2 +-
...tfulObjectsApplicationExceptionMapper_Test.java | 2 +-
.../IsisBootViewerRestfulObjects.java | 2 +-
.../{server => viewer}/IsisJaxrsServerPlugin.java | 2 +-
.../context/ResourceContext.java | 2 +-
.../jaxrsapp/AbstractJaxRsApplication.java | 2 +-
.../jaxrsapp/RestfulObjectsApplication.java | 30 +++++++++++-----------
.../mappers/ExceptionMapperAbstract.java | 10 ++++----
.../mappers/ExceptionMapperForObjectNotFound.java | 2 +-
...xceptionMapperForRestfulObjectsApplication.java | 2 +-
.../ExceptionMapperForRuntimeException.java | 2 +-
.../mappers/entity/ExceptionDetail.java | 2 +-
.../mappers/entity/ExceptionPojo.java | 2 +-
.../resources/DomainObjectResourceServerside.java | 4 +--
.../resources/DomainResourceHelper.java | 4 +--
.../resources/DomainServiceResourceServerside.java | 2 +-
.../resources/DomainServicesListReprRenderer.java | 2 +-
.../resources/DomainTypeResourceServerside.java | 6 ++---
.../resources/HealthReprRenderer.java | 2 +-
.../resources/HealthResourceServerside.java | 2 +-
.../resources/HomePageReprRenderer.java | 2 +-
.../resources/HomePageResourceServerside.java | 2 +-
.../resources/ImageResourceServerside.java | 2 +-
.../resources/JsonParserHelper.java | 2 +-
.../resources/MenuBarsResourceServerside.java | 4 +--
.../resources/ObjectActionArgHelper.java | 2 +-
.../resources/ObjectAdapterAccessHelper.java | 2 +-
.../resources/ObjectAdapterUpdateHelper.java | 4 +--
.../resources/ResourceAbstract.java | 4 +--
.../resources/SwaggerSpecResource.java | 2 +-
.../resources/UserReprRenderer.java | 2 +-
.../resources/UserResourceServerside.java | 4 +--
.../resources/VersionReprRenderer.java | 4 +--
.../resources/VersionResourceServerside.java | 2 +-
.../serialization/SerializationStrategy.java | 2 +-
.../{server => viewer}/util/UrlParserUtils.java | 2 +-
.../webmodule/IsisRestfulObjectsSessionFilter.java | 6 ++---
.../IsisTransactionFilterForRestfulObjects.java | 2 +-
.../webmodule/WebModuleRestfulObjects.java | 6 ++---
.../auth/AuthenticationSessionStrategy.java | 2 +-
.../AuthenticationSessionStrategyAbstract.java | 2 +-
.../AuthenticationSessionStrategyBasicAuth.java | 2 +-
.../auth/AuthenticationSessionStrategyDefault.java | 2 +-
..._ensureCompatibleAcceptHeader_ContractTest.java | 4 +--
.../context/ResourceContext_getArg_Test.java | 4 +--
.../context/ResourceContext_stripQuotes_Test.java | 4 +--
...tsApplicationExceptionMapper_Test_Contract.java | 3 ++-
.../DomainResourceHelper_readBodyAsMap_Test.java | 22 ++++++++--------
.../resources/JsonParserHelper_Test.java | 5 ++--
.../util/UrlParserUtils_Test.java | 3 ++-
...ulObjectsSessionFilter_lookupPassThru_Test.java | 4 +--
.../java/demoapp/application/DemoAppManifest.java | 2 +-
.../isis/testdomain/rest/RestServiceTest.java | 2 +-
.../shiro/ShiroSecmanLdap_restfulStressTest.java | 2 +-
56 files changed, 104 insertions(+), 101 deletions(-)
diff --git a/core/viewers/restfulobjects/jaxrs-resteasy-4/src/main/java/org/apache/isis/viewer/restfulobjects/jaxrsresteasy4/IsisResteasy4Plugin.java b/core/viewers/restfulobjects/jaxrs-resteasy-4/src/main/java/org/apache/isis/viewer/restfulobjects/jaxrsresteasy4/IsisResteasy4Plugin.java
index f233568..8099760 100644
--- a/core/viewers/restfulobjects/jaxrs-resteasy-4/src/main/java/org/apache/isis/viewer/restfulobjects/jaxrsresteasy4/IsisResteasy4Plugin.java
+++ b/core/viewers/restfulobjects/jaxrs-resteasy-4/src/main/java/org/apache/isis/viewer/restfulobjects/jaxrsresteasy4/IsisResteasy4Plugin.java
@@ -26,7 +26,7 @@ import org.jboss.resteasy.spi.Failure;
import org.apache.isis.viewer.restfulobjects.applib.client.RestfulResponse;
import org.apache.isis.viewer.restfulobjects.applib.client.RestfulResponse.HttpStatusCode;
import org.apache.isis.viewer.restfulobjects.applib.client.UriBuilderPlugin;
-import org.apache.isis.viewer.restfulobjects.server.IsisJaxrsServerPlugin;
+import org.apache.isis.viewer.restfulobjects.viewer.IsisJaxrsServerPlugin;
import org.apache.isis.viewer.restfulobjects.jaxrsresteasy4.conneg.RestfulObjectsJaxbWriterForXml;
public class IsisResteasy4Plugin implements UriBuilderPlugin, IsisJaxrsServerPlugin {
diff --git a/core/viewers/restfulobjects/jaxrs-resteasy-4/src/main/resources/META-INF/services/org.apache.isis.viewer.restfulobjects.server.IsisJaxrsServerPlugin b/core/viewers/restfulobjects/jaxrs-resteasy-4/src/main/resources/META-INF/services/org.apache.isis.viewer.restfulobjects.viewer.IsisJaxrsServerPlugin
similarity index 100%
rename from core/viewers/restfulobjects/jaxrs-resteasy-4/src/main/resources/META-INF/services/org.apache.isis.viewer.restfulobjects.server.IsisJaxrsServerPlugin
rename to core/viewers/restfulobjects/jaxrs-resteasy-4/src/main/resources/META-INF/services/org.apache.isis.viewer.restfulobjects.viewer.IsisJaxrsServerPlugin
diff --git a/core/viewers/restfulobjects/jaxrs-resteasy-4/src/test/java/org/apache/isis/viewer/restfulobjects/jaxrsresteasy4/context/ResourceContext_ensureCompatibleAcceptHeader_Test.java b/core/viewers/restfulobjects/jaxrs-resteasy-4/src/test/java/org/apache/isis/viewer/restfulobjects/jaxrsresteasy4/context/ResourceContext_ensureCompatibleAcceptHeader_Test.java
index dd85ba4..9de5305 100644
--- a/core/viewers/restfulobjects/jaxrs-resteasy-4/src/test/java/org/apache/isis/viewer/restfulobjects/jaxrsresteasy4/context/ResourceContext_ensureCompatibleAcceptHeader_Test.java
+++ b/core/viewers/restfulobjects/jaxrs-resteasy-4/src/test/java/org/apache/isis/viewer/restfulobjects/jaxrsresteasy4/context/ResourceContext_ensureCompatibleAcceptHeader_Test.java
@@ -18,7 +18,7 @@
*/
package org.apache.isis.viewer.restfulobjects.jaxrsresteasy4.context;
-import org.apache.isis.viewer.restfulobjects.server.context.ResourceContext_ensureCompatibleAcceptHeader_ContractTest;
+import org.apache.isis.viewer.restfulobjects.viewer.context.ResourceContext_ensureCompatibleAcceptHeader_ContractTest;
public class ResourceContext_ensureCompatibleAcceptHeader_Test extends
ResourceContext_ensureCompatibleAcceptHeader_ContractTest {
diff --git a/core/viewers/restfulobjects/jaxrs-resteasy-4/src/test/java/org/apache/isis/viewer/restfulobjects/jaxrsresteasy4/mappers/RestfulObjectsApplicationExceptionMapper_Test.java b/core/viewers/restfulobjects/jaxrs-resteasy-4/src/test/java/org/apache/isis/viewer/restfulobjects/jaxrsresteasy4/mappers/RestfulObjectsApplicationExceptionMapper_Test.java
index 8258daa..b7204b7 100644
--- a/core/viewers/restfulobjects/jaxrs-resteasy-4/src/test/java/org/apache/isis/viewer/restfulobjects/jaxrsresteasy4/mappers/RestfulObjectsApplicationExceptionMapper_Test.java
+++ b/core/viewers/restfulobjects/jaxrs-resteasy-4/src/test/java/org/apache/isis/viewer/restfulobjects/jaxrsresteasy4/mappers/RestfulObjectsApplicationExceptionMapper_Test.java
@@ -18,7 +18,7 @@
*/
package org.apache.isis.viewer.restfulobjects.jaxrsresteasy4.mappers;
-import org.apache.isis.viewer.restfulobjects.server.mappers.RestfulObjectsApplicationExceptionMapper_Test_Contract;
+import org.apache.isis.viewer.restfulobjects.viewer.mappers.RestfulObjectsApplicationExceptionMapper_Test_Contract;
public class RestfulObjectsApplicationExceptionMapper_Test extends
RestfulObjectsApplicationExceptionMapper_Test_Contract {
diff --git a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/IsisBootViewerRestfulObjects.java b/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/IsisBootViewerRestfulObjects.java
similarity index 95%
rename from core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/IsisBootViewerRestfulObjects.java
rename to core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/IsisBootViewerRestfulObjects.java
index 1b044c5..5c98b0d 100644
--- a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/IsisBootViewerRestfulObjects.java
+++ b/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/IsisBootViewerRestfulObjects.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.viewer.restfulobjects.server;
+package org.apache.isis.viewer.restfulobjects.viewer;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
diff --git a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/IsisJaxrsServerPlugin.java b/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/IsisJaxrsServerPlugin.java
similarity index 96%
rename from core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/IsisJaxrsServerPlugin.java
rename to core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/IsisJaxrsServerPlugin.java
index c590e50..a2a04e1 100644
--- a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/IsisJaxrsServerPlugin.java
+++ b/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/IsisJaxrsServerPlugin.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.restfulobjects.server;
+package org.apache.isis.viewer.restfulobjects.viewer;
import org.apache.isis.commons.internal.context._Plugin;
import org.apache.isis.viewer.restfulobjects.applib.client.RestfulResponse.HttpStatusCode;
diff --git a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/context/ResourceContext.java b/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext.java
similarity index 99%
rename from core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/context/ResourceContext.java
rename to core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext.java
index db20e90..2c6e8bd 100644
--- a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/context/ResourceContext.java
+++ b/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.restfulobjects.server.context;
+package org.apache.isis.viewer.restfulobjects.viewer.context;
import java.util.Collections;
import java.util.List;
diff --git a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/jaxrsapp/AbstractJaxRsApplication.java b/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/jaxrsapp/AbstractJaxRsApplication.java
similarity index 96%
rename from core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/jaxrsapp/AbstractJaxRsApplication.java
rename to core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/jaxrsapp/AbstractJaxRsApplication.java
index 47c41f6..0bfe35b 100644
--- a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/jaxrsapp/AbstractJaxRsApplication.java
+++ b/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/jaxrsapp/AbstractJaxRsApplication.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.restfulobjects.server.jaxrsapp;
+package org.apache.isis.viewer.restfulobjects.viewer.jaxrsapp;
import java.util.Collections;
import java.util.LinkedHashSet;
diff --git a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/jaxrsapp/RestfulObjectsApplication.java b/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/jaxrsapp/RestfulObjectsApplication.java
similarity index 75%
rename from core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/jaxrsapp/RestfulObjectsApplication.java
rename to core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/jaxrsapp/RestfulObjectsApplication.java
index d7a664e..b0ab198 100644
--- a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/jaxrsapp/RestfulObjectsApplication.java
+++ b/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/jaxrsapp/RestfulObjectsApplication.java
@@ -16,24 +16,24 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.restfulobjects.server.jaxrsapp;
+package org.apache.isis.viewer.restfulobjects.viewer.jaxrsapp;
import org.apache.isis.commons.internal.context._Context;
import org.apache.isis.viewer.restfulobjects.rendering.service.acceptheader.AcceptHeaderServiceForRest;
-import org.apache.isis.viewer.restfulobjects.server.IsisJaxrsServerPlugin;
-import org.apache.isis.viewer.restfulobjects.server.mappers.ExceptionMapperForObjectNotFound;
-import org.apache.isis.viewer.restfulobjects.server.mappers.ExceptionMapperForRestfulObjectsApplication;
-import org.apache.isis.viewer.restfulobjects.server.mappers.ExceptionMapperForRuntimeException;
-import org.apache.isis.viewer.restfulobjects.server.resources.DomainObjectResourceServerside;
-import org.apache.isis.viewer.restfulobjects.server.resources.DomainServiceResourceServerside;
-import org.apache.isis.viewer.restfulobjects.server.resources.DomainTypeResourceServerside;
-import org.apache.isis.viewer.restfulobjects.server.resources.HealthResourceServerside;
-import org.apache.isis.viewer.restfulobjects.server.resources.HomePageResourceServerside;
-import org.apache.isis.viewer.restfulobjects.server.resources.ImageResourceServerside;
-import org.apache.isis.viewer.restfulobjects.server.resources.MenuBarsResourceServerside;
-import org.apache.isis.viewer.restfulobjects.server.resources.SwaggerSpecResource;
-import org.apache.isis.viewer.restfulobjects.server.resources.UserResourceServerside;
-import org.apache.isis.viewer.restfulobjects.server.resources.VersionResourceServerside;
+import org.apache.isis.viewer.restfulobjects.viewer.IsisJaxrsServerPlugin;
+import org.apache.isis.viewer.restfulobjects.viewer.mappers.ExceptionMapperForObjectNotFound;
+import org.apache.isis.viewer.restfulobjects.viewer.mappers.ExceptionMapperForRestfulObjectsApplication;
+import org.apache.isis.viewer.restfulobjects.viewer.mappers.ExceptionMapperForRuntimeException;
+import org.apache.isis.viewer.restfulobjects.viewer.resources.DomainObjectResourceServerside;
+import org.apache.isis.viewer.restfulobjects.viewer.resources.DomainServiceResourceServerside;
+import org.apache.isis.viewer.restfulobjects.viewer.resources.DomainTypeResourceServerside;
+import org.apache.isis.viewer.restfulobjects.viewer.resources.HealthResourceServerside;
+import org.apache.isis.viewer.restfulobjects.viewer.resources.HomePageResourceServerside;
+import org.apache.isis.viewer.restfulobjects.viewer.resources.ImageResourceServerside;
+import org.apache.isis.viewer.restfulobjects.viewer.resources.MenuBarsResourceServerside;
+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;
public class RestfulObjectsApplication extends AbstractJaxRsApplication {
diff --git a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/mappers/ExceptionMapperAbstract.java b/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/ExceptionMapperAbstract.java
similarity index 95%
rename from core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/mappers/ExceptionMapperAbstract.java
rename to core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/ExceptionMapperAbstract.java
index d93b008..696fb7e 100644
--- a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/mappers/ExceptionMapperAbstract.java
+++ b/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/ExceptionMapperAbstract.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.restfulobjects.server.mappers;
+package org.apache.isis.viewer.restfulobjects.viewer.mappers;
import java.util.List;
import java.util.Optional;
@@ -35,10 +35,10 @@ import org.apache.isis.viewer.restfulobjects.applib.RepresentationType;
import org.apache.isis.viewer.restfulobjects.applib.client.RestfulResponse;
import org.apache.isis.viewer.restfulobjects.rendering.ExceptionWithBody;
import org.apache.isis.viewer.restfulobjects.rendering.ExceptionWithHttpStatusCode;
-import org.apache.isis.viewer.restfulobjects.server.IsisJaxrsServerPlugin;
-import org.apache.isis.viewer.restfulobjects.server.mappers.entity.ExceptionDetail;
-import org.apache.isis.viewer.restfulobjects.server.mappers.entity.ExceptionPojo;
-import org.apache.isis.viewer.restfulobjects.server.resources.serialization.SerializationStrategy;
+import org.apache.isis.viewer.restfulobjects.viewer.IsisJaxrsServerPlugin;
+import org.apache.isis.viewer.restfulobjects.viewer.mappers.entity.ExceptionDetail;
+import org.apache.isis.viewer.restfulobjects.viewer.mappers.entity.ExceptionPojo;
+import org.apache.isis.viewer.restfulobjects.viewer.resources.serialization.SerializationStrategy;
import static org.apache.isis.commons.internal.base._NullSafe.stream;
diff --git a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/mappers/ExceptionMapperForObjectNotFound.java b/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/ExceptionMapperForObjectNotFound.java
similarity index 95%
rename from core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/mappers/ExceptionMapperForObjectNotFound.java
rename to core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/ExceptionMapperForObjectNotFound.java
index 0c3cdda..f3d19d0 100644
--- a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/mappers/ExceptionMapperForObjectNotFound.java
+++ b/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/ExceptionMapperForObjectNotFound.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.restfulobjects.server.mappers;
+package org.apache.isis.viewer.restfulobjects.viewer.mappers;
import javax.ws.rs.core.Response;
import javax.ws.rs.ext.Provider;
diff --git a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/mappers/ExceptionMapperForRestfulObjectsApplication.java b/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/ExceptionMapperForRestfulObjectsApplication.java
similarity index 95%
rename from core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/mappers/ExceptionMapperForRestfulObjectsApplication.java
rename to core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/ExceptionMapperForRestfulObjectsApplication.java
index 7b49d00..6b1f390 100644
--- a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/mappers/ExceptionMapperForRestfulObjectsApplication.java
+++ b/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/ExceptionMapperForRestfulObjectsApplication.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.restfulobjects.server.mappers;
+package org.apache.isis.viewer.restfulobjects.viewer.mappers;
import javax.ws.rs.core.Response;
import javax.ws.rs.ext.Provider;
diff --git a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/mappers/ExceptionMapperForRuntimeException.java b/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/ExceptionMapperForRuntimeException.java
similarity index 96%
rename from core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/mappers/ExceptionMapperForRuntimeException.java
rename to core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/ExceptionMapperForRuntimeException.java
index c75d95c..8997518 100644
--- a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/mappers/ExceptionMapperForRuntimeException.java
+++ b/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/ExceptionMapperForRuntimeException.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.restfulobjects.server.mappers;
+package org.apache.isis.viewer.restfulobjects.viewer.mappers;
import javax.ws.rs.core.Response;
import javax.ws.rs.ext.Provider;
diff --git a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/mappers/entity/ExceptionDetail.java b/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/entity/ExceptionDetail.java
similarity index 97%
rename from core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/mappers/entity/ExceptionDetail.java
rename to core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/entity/ExceptionDetail.java
index ffe034d..783f93c 100644
--- a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/mappers/entity/ExceptionDetail.java
+++ b/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/entity/ExceptionDetail.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.restfulobjects.server.mappers.entity;
+package org.apache.isis.viewer.restfulobjects.viewer.mappers.entity;
import java.util.List;
diff --git a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/mappers/entity/ExceptionPojo.java b/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/entity/ExceptionPojo.java
similarity index 96%
rename from core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/mappers/entity/ExceptionPojo.java
rename to core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/entity/ExceptionPojo.java
index c0cb4d4..0992d42 100644
--- a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/mappers/entity/ExceptionPojo.java
+++ b/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/entity/ExceptionPojo.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.restfulobjects.server.mappers.entity;
+package org.apache.isis.viewer.restfulobjects.viewer.mappers.entity;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainObjectResourceServerside.java b/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainObjectResourceServerside.java
similarity index 99%
rename from core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainObjectResourceServerside.java
rename to core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainObjectResourceServerside.java
index be82e13..dc3f639 100644
--- a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainObjectResourceServerside.java
+++ b/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainObjectResourceServerside.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.restfulobjects.server.resources;
+package org.apache.isis.viewer.restfulobjects.viewer.resources;
import java.io.IOException;
import java.io.InputStream;
@@ -67,7 +67,7 @@ import org.apache.isis.viewer.restfulobjects.rendering.RestfulObjectsApplication
import org.apache.isis.viewer.restfulobjects.rendering.domainobjects.MemberReprMode;
import org.apache.isis.viewer.restfulobjects.rendering.service.RepresentationService;
import org.apache.isis.viewer.restfulobjects.rendering.util.Util;
-import org.apache.isis.viewer.restfulobjects.server.resources.serialization.SerializationStrategy;
+import org.apache.isis.viewer.restfulobjects.viewer.resources.serialization.SerializationStrategy;
import lombok.extern.log4j.Log4j2;
diff --git a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainResourceHelper.java b/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainResourceHelper.java
similarity index 98%
rename from core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainResourceHelper.java
rename to core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainResourceHelper.java
index 6c7c086..9dc3e4c 100644
--- a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainResourceHelper.java
+++ b/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainResourceHelper.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.restfulobjects.server.resources;
+package org.apache.isis.viewer.restfulobjects.viewer.resources;
import java.util.List;
@@ -43,7 +43,7 @@ import org.apache.isis.viewer.restfulobjects.rendering.domainobjects.ObjectAndAc
import org.apache.isis.viewer.restfulobjects.rendering.domainobjects.ObjectAndCollection2;
import org.apache.isis.viewer.restfulobjects.rendering.domainobjects.ObjectAndProperty2;
import org.apache.isis.viewer.restfulobjects.rendering.service.RepresentationService;
-import org.apache.isis.viewer.restfulobjects.server.context.ResourceContext;
+import org.apache.isis.viewer.restfulobjects.viewer.context.ResourceContext;
class DomainResourceHelper {
diff --git a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainServiceResourceServerside.java b/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainServiceResourceServerside.java
similarity index 99%
rename from core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainServiceResourceServerside.java
rename to core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainServiceResourceServerside.java
index 988f6d3..1cf08f2 100644
--- a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainServiceResourceServerside.java
+++ b/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainServiceResourceServerside.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.restfulobjects.server.resources;
+package org.apache.isis.viewer.restfulobjects.viewer.resources;
import java.io.InputStream;
import java.util.function.Predicate;
diff --git a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainServicesListReprRenderer.java b/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainServicesListReprRenderer.java
similarity index 97%
rename from core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainServicesListReprRenderer.java
rename to core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainServicesListReprRenderer.java
index 8a055b4..8d536ab 100644
--- a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainServicesListReprRenderer.java
+++ b/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainServicesListReprRenderer.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.restfulobjects.server.resources;
+package org.apache.isis.viewer.restfulobjects.viewer.resources;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.Rel;
diff --git a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainTypeResourceServerside.java b/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainTypeResourceServerside.java
similarity index 98%
rename from core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainTypeResourceServerside.java
rename to core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainTypeResourceServerside.java
index 6a6d727..c718f19 100644
--- a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainTypeResourceServerside.java
+++ b/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainTypeResourceServerside.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.restfulobjects.server.resources;
+package org.apache.isis.viewer.restfulobjects.viewer.resources;
import java.util.Collection;
@@ -63,8 +63,8 @@ import org.apache.isis.viewer.restfulobjects.rendering.domaintypes.TypeActionRes
import org.apache.isis.viewer.restfulobjects.rendering.domaintypes.TypeListReprRenderer;
import org.apache.isis.viewer.restfulobjects.rendering.service.RepresentationService;
import org.apache.isis.viewer.restfulobjects.rendering.util.Util;
-import org.apache.isis.viewer.restfulobjects.server.resources.serialization.SerializationStrategy;
-import org.apache.isis.viewer.restfulobjects.server.util.UrlParserUtils;
+import org.apache.isis.viewer.restfulobjects.viewer.resources.serialization.SerializationStrategy;
+import org.apache.isis.viewer.restfulobjects.viewer.util.UrlParserUtils;
/**
* Implementation note: it seems to be necessary to annotate the implementation
diff --git a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/HealthReprRenderer.java b/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/HealthReprRenderer.java
similarity index 96%
rename from core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/HealthReprRenderer.java
rename to core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/HealthReprRenderer.java
index 7af317a..19c23f7 100644
--- a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/HealthReprRenderer.java
+++ b/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/HealthReprRenderer.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.restfulobjects.server.resources;
+package org.apache.isis.viewer.restfulobjects.viewer.resources;
import org.apache.isis.applib.services.health.Health;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
diff --git a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/HealthResourceServerside.java b/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/HealthResourceServerside.java
similarity index 98%
rename from core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/HealthResourceServerside.java
rename to core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/HealthResourceServerside.java
index e56231e..a743056 100644
--- a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/HealthResourceServerside.java
+++ b/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/HealthResourceServerside.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.restfulobjects.server.resources;
+package org.apache.isis.viewer.restfulobjects.viewer.resources;
import javax.inject.Inject;
import javax.ws.rs.GET;
diff --git a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/HomePageReprRenderer.java b/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/HomePageReprRenderer.java
similarity index 99%
rename from core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/HomePageReprRenderer.java
rename to core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/HomePageReprRenderer.java
index bbbad4b..159c731 100644
--- a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/HomePageReprRenderer.java
+++ b/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/HomePageReprRenderer.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.restfulobjects.server.resources;
+package org.apache.isis.viewer.restfulobjects.viewer.resources;
import java.util.Collection;
import java.util.stream.Stream;
diff --git a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/HomePageResourceServerside.java b/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/HomePageResourceServerside.java
similarity index 98%
rename from core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/HomePageResourceServerside.java
rename to core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/HomePageResourceServerside.java
index 9ef51fa..53d6843 100644
--- a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/HomePageResourceServerside.java
+++ b/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/HomePageResourceServerside.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.restfulobjects.server.resources;
+package org.apache.isis.viewer.restfulobjects.viewer.resources;
import javax.ws.rs.GET;
import javax.ws.rs.Path;
diff --git a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ImageResourceServerside.java b/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/ImageResourceServerside.java
similarity index 96%
rename from core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ImageResourceServerside.java
rename to core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/ImageResourceServerside.java
index 764ddf9..b73efc6 100644
--- a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ImageResourceServerside.java
+++ b/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/ImageResourceServerside.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.restfulobjects.server.resources;
+package org.apache.isis.viewer.restfulobjects.viewer.resources;
import java.io.IOException;
import java.io.InputStream;
diff --git a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/JsonParserHelper.java b/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/JsonParserHelper.java
similarity index 99%
rename from core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/JsonParserHelper.java
rename to core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/JsonParserHelper.java
index a8500a4..497a36e 100644
--- a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/JsonParserHelper.java
+++ b/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/JsonParserHelper.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.restfulobjects.server.resources;
+package org.apache.isis.viewer.restfulobjects.viewer.resources;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
diff --git a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/MenuBarsResourceServerside.java b/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/MenuBarsResourceServerside.java
similarity index 97%
rename from core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/MenuBarsResourceServerside.java
rename to core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/MenuBarsResourceServerside.java
index 5b0f0f7..c72d614 100644
--- a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/MenuBarsResourceServerside.java
+++ b/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/MenuBarsResourceServerside.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.restfulobjects.server.resources;
+package org.apache.isis.viewer.restfulobjects.viewer.resources;
import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
@@ -36,7 +36,7 @@ import org.apache.isis.viewer.restfulobjects.applib.client.RestfulResponse;
import org.apache.isis.viewer.restfulobjects.applib.menubars.MenuBarsResource;
import org.apache.isis.viewer.restfulobjects.rendering.RestfulObjectsApplicationException;
import org.apache.isis.viewer.restfulobjects.rendering.service.RepresentationService;
-import org.apache.isis.viewer.restfulobjects.server.resources.serialization.SerializationStrategy;
+import org.apache.isis.viewer.restfulobjects.viewer.resources.serialization.SerializationStrategy;
public class MenuBarsResourceServerside extends ResourceAbstract implements MenuBarsResource {
diff --git a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ObjectActionArgHelper.java b/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/ObjectActionArgHelper.java
similarity index 99%
rename from core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ObjectActionArgHelper.java
rename to core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/ObjectActionArgHelper.java
index 795afc4..38e50c6 100644
--- a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ObjectActionArgHelper.java
+++ b/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/ObjectActionArgHelper.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.restfulobjects.server.resources;
+package org.apache.isis.viewer.restfulobjects.viewer.resources;
import java.util.List;
import java.util.Map;
diff --git a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ObjectAdapterAccessHelper.java b/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/ObjectAdapterAccessHelper.java
similarity index 98%
rename from core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ObjectAdapterAccessHelper.java
rename to core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/ObjectAdapterAccessHelper.java
index 525f5fd..0b8214d 100644
--- a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ObjectAdapterAccessHelper.java
+++ b/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/ObjectAdapterAccessHelper.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.restfulobjects.server.resources;
+package org.apache.isis.viewer.restfulobjects.viewer.resources;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.metamodel.consent.Consent;
diff --git a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ObjectAdapterUpdateHelper.java b/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/ObjectAdapterUpdateHelper.java
similarity index 98%
rename from core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ObjectAdapterUpdateHelper.java
rename to core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/ObjectAdapterUpdateHelper.java
index 954f411..cab68e2 100644
--- a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ObjectAdapterUpdateHelper.java
+++ b/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/ObjectAdapterUpdateHelper.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.restfulobjects.server.resources;
+package org.apache.isis.viewer.restfulobjects.viewer.resources;
import java.util.stream.Stream;
@@ -28,7 +28,7 @@ import org.apache.isis.metamodel.spec.feature.Contributed;
import org.apache.isis.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.metamodel.spec.feature.OneToOneAssociation;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
-import org.apache.isis.viewer.restfulobjects.server.context.ResourceContext;
+import org.apache.isis.viewer.restfulobjects.viewer.context.ResourceContext;
/**
* Utility class that encapsulates the logic for updating an
diff --git a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ResourceAbstract.java b/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/ResourceAbstract.java
similarity index 98%
rename from core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ResourceAbstract.java
rename to core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/ResourceAbstract.java
index 29a45d0..43c7a45 100644
--- a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ResourceAbstract.java
+++ b/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/ResourceAbstract.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.restfulobjects.server.resources;
+package org.apache.isis.viewer.restfulobjects.viewer.resources;
import java.io.InputStream;
@@ -44,7 +44,7 @@ import org.apache.isis.viewer.restfulobjects.applib.client.RestfulResponse.HttpS
import org.apache.isis.viewer.restfulobjects.rendering.RestfulObjectsApplicationException;
import org.apache.isis.viewer.restfulobjects.rendering.service.RepresentationService;
import org.apache.isis.viewer.restfulobjects.rendering.util.Util;
-import org.apache.isis.viewer.restfulobjects.server.context.ResourceContext;
+import org.apache.isis.viewer.restfulobjects.viewer.context.ResourceContext;
import lombok.val;
diff --git a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/SwaggerSpecResource.java b/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/SwaggerSpecResource.java
similarity index 98%
rename from core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/SwaggerSpecResource.java
rename to core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/SwaggerSpecResource.java
index c8f870c..3863628 100644
--- a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/SwaggerSpecResource.java
+++ b/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/SwaggerSpecResource.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.restfulobjects.server.resources;
+package org.apache.isis.viewer.restfulobjects.viewer.resources;
import java.util.List;
import java.util.concurrent.Callable;
diff --git a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/UserReprRenderer.java b/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/UserReprRenderer.java
similarity index 98%
rename from core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/UserReprRenderer.java
rename to core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/UserReprRenderer.java
index dc65c01..e5189f9 100644
--- a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/UserReprRenderer.java
+++ b/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/UserReprRenderer.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.restfulobjects.server.resources;
+package org.apache.isis.viewer.restfulobjects.viewer.resources;
import org.apache.isis.security.api.authentication.AuthenticationSession;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
diff --git a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/UserResourceServerside.java b/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/UserResourceServerside.java
similarity index 96%
rename from core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/UserResourceServerside.java
rename to core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/UserResourceServerside.java
index 174747c..f814aad 100644
--- a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/UserResourceServerside.java
+++ b/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/UserResourceServerside.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.restfulobjects.server.resources;
+package org.apache.isis.viewer.restfulobjects.viewer.resources;
import java.net.URI;
import java.net.URISyntaxException;
@@ -26,7 +26,7 @@ import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import org.apache.isis.applib.annotation.Where;
-import org.apache.isis.viewer.restfulobjects.server.webmodule.IsisRestfulObjectsSessionFilter;
+import org.apache.isis.viewer.restfulobjects.viewer.webmodule.IsisRestfulObjectsSessionFilter;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.RepresentationType;
import org.apache.isis.viewer.restfulobjects.applib.RestfulMediaType;
diff --git a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/VersionReprRenderer.java b/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/VersionReprRenderer.java
similarity index 97%
rename from core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/VersionReprRenderer.java
rename to core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/VersionReprRenderer.java
index c6634b7..7009211 100644
--- a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/VersionReprRenderer.java
+++ b/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/VersionReprRenderer.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.restfulobjects.server.resources;
+package org.apache.isis.viewer.restfulobjects.viewer.resources;
import java.io.InputStream;
import java.util.Properties;
@@ -29,7 +29,7 @@ import org.apache.isis.viewer.restfulobjects.rendering.LinkBuilder;
import org.apache.isis.viewer.restfulobjects.rendering.LinkFollowSpecs;
import org.apache.isis.viewer.restfulobjects.rendering.IResourceContext;
import org.apache.isis.viewer.restfulobjects.rendering.ReprRendererAbstract;
-import org.apache.isis.viewer.restfulobjects.server.jaxrsapp.RestfulObjectsApplication;
+import org.apache.isis.viewer.restfulobjects.viewer.jaxrsapp.RestfulObjectsApplication;
public class VersionReprRenderer extends ReprRendererAbstract<VersionReprRenderer, Void> {
diff --git a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/VersionResourceServerside.java b/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/VersionResourceServerside.java
similarity index 98%
rename from core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/VersionResourceServerside.java
rename to core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/VersionResourceServerside.java
index 6541a3b..830eb66 100644
--- a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/VersionResourceServerside.java
+++ b/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/VersionResourceServerside.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.restfulobjects.server.resources;
+package org.apache.isis.viewer.restfulobjects.viewer.resources;
import java.util.List;
diff --git a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/serialization/SerializationStrategy.java b/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/serialization/SerializationStrategy.java
similarity index 98%
rename from core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/serialization/SerializationStrategy.java
rename to core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/serialization/SerializationStrategy.java
index 9f8fd54..6ebbaee 100644
--- a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/serialization/SerializationStrategy.java
+++ b/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/serialization/SerializationStrategy.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.restfulobjects.server.resources.serialization;
+package org.apache.isis.viewer.restfulobjects.viewer.resources.serialization;
import java.util.List;
diff --git a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/util/UrlParserUtils.java b/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/util/UrlParserUtils.java
similarity index 96%
rename from core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/util/UrlParserUtils.java
rename to core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/util/UrlParserUtils.java
index 66e8c70..5e0153c 100644
--- a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/util/UrlParserUtils.java
+++ b/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/util/UrlParserUtils.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.restfulobjects.server.util;
+package org.apache.isis.viewer.restfulobjects.viewer.util;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
diff --git a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/webmodule/IsisRestfulObjectsSessionFilter.java b/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/IsisRestfulObjectsSessionFilter.java
similarity index 98%
rename from core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/webmodule/IsisRestfulObjectsSessionFilter.java
rename to core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/IsisRestfulObjectsSessionFilter.java
index 616c869..43487be 100644
--- a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/webmodule/IsisRestfulObjectsSessionFilter.java
+++ b/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/IsisRestfulObjectsSessionFilter.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.viewer.restfulobjects.server.webmodule;
+package org.apache.isis.viewer.restfulobjects.viewer.webmodule;
import java.io.IOException;
import java.util.Arrays;
@@ -46,8 +46,8 @@ import org.apache.isis.metamodel.specloader.SpecificationLoader;
import org.apache.isis.metamodel.specloader.validator.MetaModelInvalidException;
import org.apache.isis.runtime.system.session.IsisSessionFactory;
import org.apache.isis.webapp.util.IsisWebAppUtils;
-import org.apache.isis.viewer.restfulobjects.server.webmodule.auth.AuthenticationSessionStrategy;
-import org.apache.isis.viewer.restfulobjects.server.webmodule.auth.AuthenticationSessionStrategyDefault;
+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 static org.apache.isis.commons.internal.base._With.requires;
diff --git a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/webmodule/IsisTransactionFilterForRestfulObjects.java b/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/IsisTransactionFilterForRestfulObjects.java
similarity index 97%
rename from core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/webmodule/IsisTransactionFilterForRestfulObjects.java
rename to core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/IsisTransactionFilterForRestfulObjects.java
index 0f2e587..f10f639 100644
--- a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/webmodule/IsisTransactionFilterForRestfulObjects.java
+++ b/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/IsisTransactionFilterForRestfulObjects.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.restfulobjects.server.webmodule;
+package org.apache.isis.viewer.restfulobjects.viewer.webmodule;
import java.io.IOException;
diff --git a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/webmodule/WebModuleRestfulObjects.java b/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/WebModuleRestfulObjects.java
similarity index 96%
rename from core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/webmodule/WebModuleRestfulObjects.java
rename to core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/WebModuleRestfulObjects.java
index e05518c..3b62557 100644
--- a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/webmodule/WebModuleRestfulObjects.java
+++ b/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/WebModuleRestfulObjects.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.restfulobjects.server.webmodule;
+package org.apache.isis.viewer.restfulobjects.viewer.webmodule;
import javax.inject.Inject;
import javax.servlet.ServletContext;
@@ -24,7 +24,7 @@ import javax.servlet.ServletContextListener;
import javax.servlet.ServletException;
import org.apache.isis.config.IsisConfiguration;
-import org.apache.isis.viewer.restfulobjects.server.webmodule.auth.AuthenticationSessionStrategyBasicAuth;
+import org.apache.isis.viewer.restfulobjects.viewer.webmodule.auth.AuthenticationSessionStrategyBasicAuth;
import org.springframework.core.annotation.Order;
import org.apache.isis.applib.annotation.DomainService;
@@ -124,7 +124,7 @@ public final class WebModuleRestfulObjects implements WebModule {
// used by RestEasy to determine the JAX-RS resources and other related configuration
ctx.setInitParameter(
"javax.ws.rs.Application",
- "org.apache.isis.viewer.restfulobjects.server.jaxrsapp.RestfulObjectsApplication");
+ "org.apache.isis.viewer.restfulobjects.viewer.jaxrsapp.RestfulObjectsApplication");
ctx.setInitParameter("resteasy.servlet.mapping.prefix", getRestfulPath());
diff --git a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/webmodule/auth/AuthenticationSessionStrategy.java b/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/auth/AuthenticationSessionStrategy.java
similarity index 96%
rename from core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/webmodule/auth/AuthenticationSessionStrategy.java
rename to core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/auth/AuthenticationSessionStrategy.java
index 4fc98b1..5c8b5e2 100644
--- a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/webmodule/auth/AuthenticationSessionStrategy.java
+++ b/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/auth/AuthenticationSessionStrategy.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.viewer.restfulobjects.server.webmodule.auth;
+package org.apache.isis.viewer.restfulobjects.viewer.webmodule.auth;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
diff --git a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/webmodule/auth/AuthenticationSessionStrategyAbstract.java b/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/auth/AuthenticationSessionStrategyAbstract.java
similarity index 97%
rename from core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/webmodule/auth/AuthenticationSessionStrategyAbstract.java
rename to core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/auth/AuthenticationSessionStrategyAbstract.java
index a3ffdab..0051cdd 100644
--- a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/webmodule/auth/AuthenticationSessionStrategyAbstract.java
+++ b/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/auth/AuthenticationSessionStrategyAbstract.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.restfulobjects.server.webmodule.auth;
+package org.apache.isis.viewer.restfulobjects.viewer.webmodule.auth;
import javax.servlet.ServletContext;
import javax.servlet.ServletRequest;
diff --git a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/webmodule/auth/AuthenticationSessionStrategyBasicAuth.java b/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/auth/AuthenticationSessionStrategyBasicAuth.java
similarity index 98%
rename from core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/webmodule/auth/AuthenticationSessionStrategyBasicAuth.java
rename to core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/auth/AuthenticationSessionStrategyBasicAuth.java
index c7fa08c..374ad15 100644
--- a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/webmodule/auth/AuthenticationSessionStrategyBasicAuth.java
+++ b/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/auth/AuthenticationSessionStrategyBasicAuth.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.restfulobjects.server.webmodule.auth;
+package org.apache.isis.viewer.restfulobjects.viewer.webmodule.auth;
import java.nio.charset.StandardCharsets;
import java.util.Base64;
diff --git a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/webmodule/auth/AuthenticationSessionStrategyDefault.java b/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/auth/AuthenticationSessionStrategyDefault.java
similarity index 97%
rename from core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/webmodule/auth/AuthenticationSessionStrategyDefault.java
rename to core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/auth/AuthenticationSessionStrategyDefault.java
index 18a1bff..2f3f6e4 100644
--- a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/server/webmodule/auth/AuthenticationSessionStrategyDefault.java
+++ b/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/auth/AuthenticationSessionStrategyDefault.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.viewer.restfulobjects.server.webmodule.auth;
+package org.apache.isis.viewer.restfulobjects.viewer.webmodule.auth;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
diff --git a/core/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/server/context/ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java b/core/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java
similarity index 98%
rename from core/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/server/context/ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java
rename to core/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java
index f540423..be987b1 100644
--- a/core/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/server/context/ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java
+++ b/core/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.restfulobjects.server.context;
+package org.apache.isis.viewer.restfulobjects.viewer.context;
import java.util.Arrays;
import java.util.HashMap;
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.MediaType;
-import org.apache.isis.viewer.restfulobjects.server.context.ResourceContext;
+import org.apache.isis.viewer.restfulobjects.viewer.context.ResourceContext;
import org.jmock.Expectations;
import org.jmock.auto.Mock;
import org.junit.Before;
diff --git a/core/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/server/context/ResourceContext_getArg_Test.java b/core/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_getArg_Test.java
similarity index 98%
rename from core/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/server/context/ResourceContext_getArg_Test.java
rename to core/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_getArg_Test.java
index 256dbb1..4a6ed23 100644
--- a/core/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/server/context/ResourceContext_getArg_Test.java
+++ b/core/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_getArg_Test.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.restfulobjects.server.context;
+package org.apache.isis.viewer.restfulobjects.viewer.context;
import java.util.HashMap;
@@ -24,7 +24,7 @@ import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
import javax.ws.rs.core.HttpHeaders;
-import org.apache.isis.viewer.restfulobjects.server.context.ResourceContext;
+import org.apache.isis.viewer.restfulobjects.viewer.context.ResourceContext;
import org.jmock.Expectations;
import org.jmock.auto.Mock;
import org.junit.Before;
diff --git a/core/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/server/context/ResourceContext_stripQuotes_Test.java b/core/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_stripQuotes_Test.java
similarity index 94%
rename from core/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/server/context/ResourceContext_stripQuotes_Test.java
rename to core/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_stripQuotes_Test.java
index 3cbf24f..e61b7d6 100644
--- a/core/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/server/context/ResourceContext_stripQuotes_Test.java
+++ b/core/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_stripQuotes_Test.java
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.restfulobjects.server.context;
+package org.apache.isis.viewer.restfulobjects.viewer.context;
-import org.apache.isis.viewer.restfulobjects.server.context.ResourceContext;
+import org.apache.isis.viewer.restfulobjects.viewer.context.ResourceContext;
import org.junit.Test;
import static org.hamcrest.Matchers.is;
diff --git a/core/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/server/mappers/RestfulObjectsApplicationExceptionMapper_Test_Contract.java b/core/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/RestfulObjectsApplicationExceptionMapper_Test_Contract.java
similarity index 97%
rename from core/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/server/mappers/RestfulObjectsApplicationExceptionMapper_Test_Contract.java
rename to core/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/RestfulObjectsApplicationExceptionMapper_Test_Contract.java
index 4cf1cdd..de961de 100644
--- a/core/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/server/mappers/RestfulObjectsApplicationExceptionMapper_Test_Contract.java
+++ b/core/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/RestfulObjectsApplicationExceptionMapper_Test_Contract.java
@@ -16,11 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.restfulobjects.server.mappers;
+package org.apache.isis.viewer.restfulobjects.viewer.mappers;
import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.Response;
+import org.apache.isis.viewer.restfulobjects.viewer.mappers.ExceptionMapperForRestfulObjectsApplication;
import org.jmock.auto.Mock;
import org.junit.Before;
import org.junit.Rule;
diff --git a/core/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainResourceHelper_readBodyAsMap_Test.java b/core/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainResourceHelper_readBodyAsMap_Test.java
similarity index 71%
rename from core/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainResourceHelper_readBodyAsMap_Test.java
rename to core/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainResourceHelper_readBodyAsMap_Test.java
index 12738ec..0647d1e 100644
--- a/core/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainResourceHelper_readBodyAsMap_Test.java
+++ b/core/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainResourceHelper_readBodyAsMap_Test.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.restfulobjects.server.resources;
+package org.apache.isis.viewer.restfulobjects.viewer.resources;
import org.junit.Test;
@@ -35,40 +35,40 @@ public class DomainResourceHelper_readBodyAsMap_Test {
public void whenNull() throws Exception {
representation = Util.readAsMap(null);
- assertThat(representation.isMap(), is(true));
- assertThat(representation.size(), is(0));
+ Assert.assertThat(representation.isMap(), CoreMatchers.is(true));
+ Assert.assertThat(representation.size(), CoreMatchers.is(0));
}
@Test
public void whenEmptyString() throws Exception {
representation = Util.readAsMap("");
- assertThat(representation.isMap(), is(true));
- assertThat(representation.size(), is(0));
+ Assert.assertThat(representation.isMap(), CoreMatchers.is(true));
+ Assert.assertThat(representation.size(), CoreMatchers.is(0));
}
@Test
public void whenWhitespaceOnlyString() throws Exception {
representation = Util.readAsMap(" \t ");
- assertThat(representation.isMap(), is(true));
- assertThat(representation.size(), is(0));
+ Assert.assertThat(representation.isMap(), CoreMatchers.is(true));
+ Assert.assertThat(representation.size(), CoreMatchers.is(0));
}
@Test
public void emptyMap() throws Exception {
representation = Util.readAsMap("{}");
- assertThat(representation.isMap(), is(true));
- assertThat(representation.size(), is(0));
+ Assert.assertThat(representation.isMap(), CoreMatchers.is(true));
+ Assert.assertThat(representation.size(), CoreMatchers.is(0));
}
@Test
public void map() throws Exception {
representation = Util.readAsMap("{\"foo\":\"bar\"}");
- assertThat(representation.isMap(), is(true));
- assertThat(representation.size(), is(1));
+ Assert.assertThat(representation.isMap(), CoreMatchers.is(true));
+ Assert.assertThat(representation.size(), CoreMatchers.is(1));
}
@Test(expected = RestfulObjectsApplicationException.class)
diff --git a/core/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/server/resources/JsonParserHelper_Test.java b/core/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/resources/JsonParserHelper_Test.java
similarity index 86%
rename from core/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/server/resources/JsonParserHelper_Test.java
rename to core/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/resources/JsonParserHelper_Test.java
index f5b3aa7..11d3b03 100644
--- a/core/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/server/resources/JsonParserHelper_Test.java
+++ b/core/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/resources/JsonParserHelper_Test.java
@@ -16,8 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.restfulobjects.server.resources;
+package org.apache.isis.viewer.restfulobjects.viewer.resources;
+import org.apache.isis.viewer.restfulobjects.viewer.resources.JsonParserHelper;
import org.junit.Test;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
@@ -31,7 +32,7 @@ public class JsonParserHelper_Test {
final JsonRepresentation link = JsonRepresentation.newMap();
link.mapPut("href", "http://localhost/objects/OID/1");
final String oidFromHref = JsonParserHelper.encodedOidFromLink(link);
- assertEquals("OID:1", oidFromHref);
+ Assert.assertEquals("OID:1", oidFromHref);
}
}
diff --git a/core/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/server/util/UrlParserUtils_Test.java b/core/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/util/UrlParserUtils_Test.java
similarity index 94%
rename from core/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/server/util/UrlParserUtils_Test.java
rename to core/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/util/UrlParserUtils_Test.java
index f6d4b70..b825e0e 100644
--- a/core/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/server/util/UrlParserUtils_Test.java
+++ b/core/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/util/UrlParserUtils_Test.java
@@ -16,8 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.restfulobjects.server.util;
+package org.apache.isis.viewer.restfulobjects.viewer.util;
+import org.apache.isis.viewer.restfulobjects.viewer.util.UrlParserUtils;
import org.junit.Test;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
diff --git a/core/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/server/webmodule/IsisRestfulObjectsSessionFilter_lookupPassThru_Test.java b/core/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/IsisRestfulObjectsSessionFilter_lookupPassThru_Test.java
similarity index 96%
rename from core/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/server/webmodule/IsisRestfulObjectsSessionFilter_lookupPassThru_Test.java
rename to core/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/IsisRestfulObjectsSessionFilter_lookupPassThru_Test.java
index 5437336..219ed07 100644
--- a/core/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/server/webmodule/IsisRestfulObjectsSessionFilter_lookupPassThru_Test.java
+++ b/core/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/IsisRestfulObjectsSessionFilter_lookupPassThru_Test.java
@@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.restfulobjects.server.webmodule;
+package org.apache.isis.viewer.restfulobjects.viewer.webmodule;
import java.util.List;
import javax.servlet.FilterConfig;
-import org.apache.isis.viewer.restfulobjects.server.webmodule.IsisRestfulObjectsSessionFilter;
+import org.apache.isis.viewer.restfulobjects.viewer.webmodule.IsisRestfulObjectsSessionFilter;
import org.jmock.Expectations;
import org.jmock.auto.Mock;
import org.junit.Assert;
diff --git a/examples/demo/src/main/java/demoapp/application/DemoAppManifest.java b/examples/demo/src/main/java/demoapp/application/DemoAppManifest.java
index 8e181b0..de386db 100644
--- a/examples/demo/src/main/java/demoapp/application/DemoAppManifest.java
+++ b/examples/demo/src/main/java/demoapp/application/DemoAppManifest.java
@@ -40,7 +40,7 @@ import org.apache.isis.extensions.sse.IsisBootSse;
import org.apache.isis.persistence.jdo.datanucleus5.IsisBootDataNucleus;
import org.apache.isis.runtime.spring.IsisBoot;
import org.apache.isis.security.shiro.IsisBootSecurityShiro;
-import org.apache.isis.viewer.restfulobjects.server.IsisBootViewerRestfulObjects;
+import org.apache.isis.viewer.restfulobjects.viewer.IsisBootViewerRestfulObjects;
import org.apache.isis.viewer.wicket.viewer.IsisBootViewerWicket;
import demoapp.dom.DemoModule;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/rest/RestServiceTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/rest/RestServiceTest.java
index a8e02c2..bec2428 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/rest/RestServiceTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/rest/RestServiceTest.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Import;
import org.apache.isis.testdomain.conf.Configuration_usingJdo;
import org.apache.isis.testdomain.jdo.Book;
-import org.apache.isis.viewer.restfulobjects.server.IsisBootViewerRestfulObjects;
+import org.apache.isis.viewer.restfulobjects.viewer.IsisBootViewerRestfulObjects;
import lombok.val;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdap_restfulStressTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdap_restfulStressTest.java
index d523f25..c0e425c 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdap_restfulStressTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdap_restfulStressTest.java
@@ -44,7 +44,7 @@ import org.apache.isis.testdomain.conf.Configuration_usingJdoAndShiro;
import org.apache.isis.testdomain.jdo.JdoTestDomainPersona;
import org.apache.isis.testdomain.ldap.LdapServerService;
import org.apache.isis.testdomain.rest.RestEndpointService;
-import org.apache.isis.viewer.restfulobjects.server.IsisBootViewerRestfulObjects;
+import org.apache.isis.viewer.restfulobjects.viewer.IsisBootViewerRestfulObjects;
import static java.time.Duration.ofMillis;
import static org.junit.jupiter.api.Assertions.assertEquals;