You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2019/12/04 19:42:25 UTC
[isis] 02/02: ISIS-2213: reorganises classes under
o.a.i.viewer.restfulobjects.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 bbe2673377b83346065acf6f6d851481ca829059
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Dec 4 19:11:31 2019 +0000
ISIS-2213: reorganises classes under o.a.i.viewer.restfulobjects.server
(cherry picked from commit b744afe6753e1f8d87ff43a0e4eefdeb9d1ad3ae)
---
...eContext_ensureCompatibleAcceptHeader_Test.java | 2 +-
.../server/IsisJaxrsServerPlugin.java | 1 +
.../server/{ => context}/ResourceContext.java | 2 +-
.../{ => jaxrsapp}/AbstractJaxRsApplication.java | 2 +-
.../{ => jaxrsapp}/RestfulObjectsApplication.java | 3 ++-
.../server/mappers/entity/package-info.java | 28 ----------------------
.../server/resources/DomainResourceHelper.java | 2 +-
.../resources/ObjectAdapterUpdateHelper.java | 2 +-
.../server/resources/ResourceAbstract.java | 2 +-
.../server/resources/UserResourceServerside.java | 2 +-
.../server/resources/VersionReprRenderer.java | 2 +-
.../IsisRestfulObjectsSessionFilter.java | 6 ++---
.../IsisTransactionFilterForRestfulObjects.java | 2 +-
.../{ => webmodule}/WebModuleRestfulObjects.java | 7 +++---
.../auth/AuthenticationSessionStrategy.java | 2 +-
.../AuthenticationSessionStrategyAbstract.java | 2 +-
.../AuthenticationSessionStrategyBasicAuth.java | 2 +-
.../auth/AuthenticationSessionStrategyDefault.java | 2 +-
..._ensureCompatibleAcceptHeader_ContractTest.java | 3 ++-
.../ResourceContext_getArg_Test.java} | 5 ++--
.../ResourceContext_stripQuotes_Test.java} | 5 ++--
...> DomainResourceHelper_readBodyAsMap_Test.java} | 2 +-
...serHelpTest.java => JsonParserHelper_Test.java} | 2 +-
...rserUtilsTest.java => UrlParserUtils_Test.java} | 2 +-
...ulObjectsSessionFilter_lookupPassThru_Test.java | 4 ++--
25 files changed, 35 insertions(+), 59 deletions(-)
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 5a4bee3..dd85ba4 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.ResourceContext_ensureCompatibleAcceptHeader_ContractTest;
+import org.apache.isis.viewer.restfulobjects.server.context.ResourceContext_ensureCompatibleAcceptHeader_ContractTest;
public class ResourceContext_ensureCompatibleAcceptHeader_Test extends
ResourceContext_ensureCompatibleAcceptHeader_ContractTest {
diff --git a/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/IsisJaxrsServerPlugin.java b/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/IsisJaxrsServerPlugin.java
index cb2a727..c590e50 100644
--- a/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/IsisJaxrsServerPlugin.java
+++ b/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/IsisJaxrsServerPlugin.java
@@ -21,6 +21,7 @@ package org.apache.isis.viewer.restfulobjects.server;
import org.apache.isis.commons.internal.context._Plugin;
import org.apache.isis.viewer.restfulobjects.applib.client.RestfulResponse.HttpStatusCode;
+// TODO: v2: to remove.
public interface IsisJaxrsServerPlugin {
// -- INTERFACE
diff --git a/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/ResourceContext.java b/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/context/ResourceContext.java
similarity index 99%
rename from core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/ResourceContext.java
rename to core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/context/ResourceContext.java
index bb8794a..db20e90 100644
--- a/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/ResourceContext.java
+++ b/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/context/ResourceContext.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.server.context;
import java.util.Collections;
import java.util.List;
diff --git a/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/AbstractJaxRsApplication.java b/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/jaxrsapp/AbstractJaxRsApplication.java
similarity index 96%
rename from core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/AbstractJaxRsApplication.java
rename to core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/jaxrsapp/AbstractJaxRsApplication.java
index 3e462ce..47c41f6 100644
--- a/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/AbstractJaxRsApplication.java
+++ b/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/jaxrsapp/AbstractJaxRsApplication.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.server.jaxrsapp;
import java.util.Collections;
import java.util.LinkedHashSet;
diff --git a/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/RestfulObjectsApplication.java b/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/jaxrsapp/RestfulObjectsApplication.java
similarity index 96%
rename from core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/RestfulObjectsApplication.java
rename to core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/jaxrsapp/RestfulObjectsApplication.java
index 496a2f1..d7a664e 100644
--- a/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/RestfulObjectsApplication.java
+++ b/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/jaxrsapp/RestfulObjectsApplication.java
@@ -16,10 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.restfulobjects.server;
+package org.apache.isis.viewer.restfulobjects.server.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;
diff --git a/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/mappers/entity/package-info.java b/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/mappers/entity/package-info.java
deleted file mode 100644
index 8ee5e87..0000000
--- a/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/mappers/entity/package-info.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-@javax.xml.bind.annotation.XmlSchema(
- namespace = "http://isis.apache.org/viewer/restfulobjects/server/mappers/entity",
- elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED,
- xmlns = {
- @javax.xml.bind.annotation.XmlNs(
- namespaceURI = "http://isis.apache.org/viewer/restfulobjects/server/mappers/entity", prefix = "ro")
- }
- )
-package org.apache.isis.viewer.restfulobjects.server.mappers.entity;
\ No newline at end of file
diff --git a/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainResourceHelper.java b/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainResourceHelper.java
index 6c9f188..6c7c086 100644
--- a/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainResourceHelper.java
+++ b/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainResourceHelper.java
@@ -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.ResourceContext;
+import org.apache.isis.viewer.restfulobjects.server.context.ResourceContext;
class DomainResourceHelper {
diff --git a/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ObjectAdapterUpdateHelper.java b/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ObjectAdapterUpdateHelper.java
index 740fe66..954f411 100644
--- a/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ObjectAdapterUpdateHelper.java
+++ b/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ObjectAdapterUpdateHelper.java
@@ -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.ResourceContext;
+import org.apache.isis.viewer.restfulobjects.server.context.ResourceContext;
/**
* Utility class that encapsulates the logic for updating an
diff --git a/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ResourceAbstract.java b/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ResourceAbstract.java
index 0773275..29a45d0 100644
--- a/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ResourceAbstract.java
+++ b/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ResourceAbstract.java
@@ -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.ResourceContext;
+import org.apache.isis.viewer.restfulobjects.server.context.ResourceContext;
import lombok.val;
diff --git a/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/UserResourceServerside.java b/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/UserResourceServerside.java
index f80b2ce..174747c 100644
--- a/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/UserResourceServerside.java
+++ b/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/UserResourceServerside.java
@@ -26,7 +26,7 @@ import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import org.apache.isis.applib.annotation.Where;
-import org.apache.isis.viewer.restfulobjects.server.IsisRestfulObjectsSessionFilter;
+import org.apache.isis.viewer.restfulobjects.server.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/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/VersionReprRenderer.java b/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/VersionReprRenderer.java
index 9933777..c6634b7 100644
--- a/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/VersionReprRenderer.java
+++ b/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/VersionReprRenderer.java
@@ -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.RestfulObjectsApplication;
+import org.apache.isis.viewer.restfulobjects.server.jaxrsapp.RestfulObjectsApplication;
public class VersionReprRenderer extends ReprRendererAbstract<VersionReprRenderer, Void> {
diff --git a/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/IsisRestfulObjectsSessionFilter.java b/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/webmodule/IsisRestfulObjectsSessionFilter.java
similarity index 98%
rename from core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/IsisRestfulObjectsSessionFilter.java
rename to core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/webmodule/IsisRestfulObjectsSessionFilter.java
index 2663805..616c869 100644
--- a/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/IsisRestfulObjectsSessionFilter.java
+++ b/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/webmodule/IsisRestfulObjectsSessionFilter.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.viewer.restfulobjects.server;
+package org.apache.isis.viewer.restfulobjects.server.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.auth.AuthenticationSessionStrategy;
-import org.apache.isis.viewer.restfulobjects.server.auth.AuthenticationSessionStrategyDefault;
+import org.apache.isis.viewer.restfulobjects.server.webmodule.auth.AuthenticationSessionStrategy;
+import org.apache.isis.viewer.restfulobjects.server.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/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/webapp/IsisTransactionFilterForRestfulObjects.java b/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/webmodule/IsisTransactionFilterForRestfulObjects.java
similarity index 97%
rename from core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/webapp/IsisTransactionFilterForRestfulObjects.java
rename to core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/webmodule/IsisTransactionFilterForRestfulObjects.java
index f59fad6..0f2e587 100644
--- a/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/webapp/IsisTransactionFilterForRestfulObjects.java
+++ b/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/webmodule/IsisTransactionFilterForRestfulObjects.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.restfulobjects.server.webapp;
+package org.apache.isis.viewer.restfulobjects.server.webmodule;
import java.io.IOException;
diff --git a/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/WebModuleRestfulObjects.java b/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/webmodule/WebModuleRestfulObjects.java
similarity index 94%
rename from core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/WebModuleRestfulObjects.java
rename to core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/webmodule/WebModuleRestfulObjects.java
index c730a51..e05518c 100644
--- a/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/WebModuleRestfulObjects.java
+++ b/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/webmodule/WebModuleRestfulObjects.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.server.webmodule;
import javax.inject.Inject;
import javax.servlet.ServletContext;
@@ -24,8 +24,7 @@ import javax.servlet.ServletContextListener;
import javax.servlet.ServletException;
import org.apache.isis.config.IsisConfiguration;
-import org.apache.isis.viewer.restfulobjects.server.auth.AuthenticationSessionStrategyBasicAuth;
-import org.apache.isis.viewer.restfulobjects.server.webapp.IsisTransactionFilterForRestfulObjects;
+import org.apache.isis.viewer.restfulobjects.server.webmodule.auth.AuthenticationSessionStrategyBasicAuth;
import org.springframework.core.annotation.Order;
import org.apache.isis.applib.annotation.DomainService;
@@ -125,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.RestfulObjectsApplication");
+ "org.apache.isis.viewer.restfulobjects.server.jaxrsapp.RestfulObjectsApplication");
ctx.setInitParameter("resteasy.servlet.mapping.prefix", getRestfulPath());
diff --git a/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/auth/AuthenticationSessionStrategy.java b/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/webmodule/auth/AuthenticationSessionStrategy.java
similarity index 96%
rename from core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/auth/AuthenticationSessionStrategy.java
rename to core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/webmodule/auth/AuthenticationSessionStrategy.java
index 707a2b3..4fc98b1 100644
--- a/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/auth/AuthenticationSessionStrategy.java
+++ b/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/webmodule/auth/AuthenticationSessionStrategy.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.viewer.restfulobjects.server.auth;
+package org.apache.isis.viewer.restfulobjects.server.webmodule.auth;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
diff --git a/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/auth/AuthenticationSessionStrategyAbstract.java b/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/webmodule/auth/AuthenticationSessionStrategyAbstract.java
similarity index 97%
rename from core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/auth/AuthenticationSessionStrategyAbstract.java
rename to core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/webmodule/auth/AuthenticationSessionStrategyAbstract.java
index 269d669..a3ffdab 100644
--- a/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/auth/AuthenticationSessionStrategyAbstract.java
+++ b/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/webmodule/auth/AuthenticationSessionStrategyAbstract.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.restfulobjects.server.auth;
+package org.apache.isis.viewer.restfulobjects.server.webmodule.auth;
import javax.servlet.ServletContext;
import javax.servlet.ServletRequest;
diff --git a/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/auth/AuthenticationSessionStrategyBasicAuth.java b/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/webmodule/auth/AuthenticationSessionStrategyBasicAuth.java
similarity index 98%
rename from core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/auth/AuthenticationSessionStrategyBasicAuth.java
rename to core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/webmodule/auth/AuthenticationSessionStrategyBasicAuth.java
index d9d35dc..c7fa08c 100644
--- a/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/auth/AuthenticationSessionStrategyBasicAuth.java
+++ b/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/webmodule/auth/AuthenticationSessionStrategyBasicAuth.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.restfulobjects.server.auth;
+package org.apache.isis.viewer.restfulobjects.server.webmodule.auth;
import java.nio.charset.StandardCharsets;
import java.util.Base64;
diff --git a/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/auth/AuthenticationSessionStrategyDefault.java b/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/webmodule/auth/AuthenticationSessionStrategyDefault.java
similarity index 97%
rename from core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/auth/AuthenticationSessionStrategyDefault.java
rename to core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/webmodule/auth/AuthenticationSessionStrategyDefault.java
index c09880e..18a1bff 100644
--- a/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/auth/AuthenticationSessionStrategyDefault.java
+++ b/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/webmodule/auth/AuthenticationSessionStrategyDefault.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.viewer.restfulobjects.server.auth;
+package org.apache.isis.viewer.restfulobjects.server.webmodule.auth;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
diff --git a/core/viewers/restfulobjects/server/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java b/core/viewers/restfulobjects/server/src/test/java/org/apache/isis/viewer/restfulobjects/server/context/ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java
similarity index 98%
rename from core/viewers/restfulobjects/server/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java
rename to core/viewers/restfulobjects/server/src/test/java/org/apache/isis/viewer/restfulobjects/server/context/ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java
index 1ec4076..f540423 100644
--- a/core/viewers/restfulobjects/server/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java
+++ b/core/viewers/restfulobjects/server/src/test/java/org/apache/isis/viewer/restfulobjects/server/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;
+package org.apache.isis.viewer.restfulobjects.server.context;
import java.util.Arrays;
import java.util.HashMap;
@@ -27,6 +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.jmock.Expectations;
import org.jmock.auto.Mock;
import org.junit.Before;
diff --git a/core/viewers/restfulobjects/server/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContextTest_getArg.java b/core/viewers/restfulobjects/server/src/test/java/org/apache/isis/viewer/restfulobjects/server/context/ResourceContext_getArg_Test.java
similarity index 97%
rename from core/viewers/restfulobjects/server/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContextTest_getArg.java
rename to core/viewers/restfulobjects/server/src/test/java/org/apache/isis/viewer/restfulobjects/server/context/ResourceContext_getArg_Test.java
index 67db11c..256dbb1 100644
--- a/core/viewers/restfulobjects/server/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContextTest_getArg.java
+++ b/core/viewers/restfulobjects/server/src/test/java/org/apache/isis/viewer/restfulobjects/server/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;
+package org.apache.isis.viewer.restfulobjects.server.context;
import java.util.HashMap;
@@ -24,6 +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.jmock.Expectations;
import org.jmock.auto.Mock;
import org.junit.Before;
@@ -52,7 +53,7 @@ import org.apache.isis.viewer.restfulobjects.applib.util.UrlEncodingUtils;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.junit.Assert.assertThat;
-public class ResourceContextTest_getArg {
+public class ResourceContext_getArg_Test {
@Rule public JUnitRuleMockery2 context = JUnitRuleMockery2.createFor(Mode.INTERFACES_AND_CLASSES);
diff --git a/core/viewers/restfulobjects/server/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContextTest_stripQuotes.java b/core/viewers/restfulobjects/server/src/test/java/org/apache/isis/viewer/restfulobjects/server/context/ResourceContext_stripQuotes_Test.java
similarity index 92%
rename from core/viewers/restfulobjects/server/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContextTest_stripQuotes.java
rename to core/viewers/restfulobjects/server/src/test/java/org/apache/isis/viewer/restfulobjects/server/context/ResourceContext_stripQuotes_Test.java
index f2f0ec3..3cbf24f 100644
--- a/core/viewers/restfulobjects/server/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContextTest_stripQuotes.java
+++ b/core/viewers/restfulobjects/server/src/test/java/org/apache/isis/viewer/restfulobjects/server/context/ResourceContext_stripQuotes_Test.java
@@ -16,15 +16,16 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.restfulobjects.server;
+package org.apache.isis.viewer.restfulobjects.server.context;
+import org.apache.isis.viewer.restfulobjects.server.context.ResourceContext;
import org.junit.Test;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.nullValue;
import static org.junit.Assert.assertThat;
-public class ResourceContextTest_stripQuotes {
+public class ResourceContext_stripQuotes_Test {
@Test
public void whenQuotes() throws Exception {
diff --git a/core/viewers/restfulobjects/server/src/test/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainResourceHelperTest_readBodyAsMap.java b/core/viewers/restfulobjects/server/src/test/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainResourceHelper_readBodyAsMap_Test.java
similarity index 97%
rename from core/viewers/restfulobjects/server/src/test/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainResourceHelperTest_readBodyAsMap.java
rename to core/viewers/restfulobjects/server/src/test/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainResourceHelper_readBodyAsMap_Test.java
index 73d7b78..12738ec 100644
--- a/core/viewers/restfulobjects/server/src/test/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainResourceHelperTest_readBodyAsMap.java
+++ b/core/viewers/restfulobjects/server/src/test/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainResourceHelper_readBodyAsMap_Test.java
@@ -27,7 +27,7 @@ import org.apache.isis.viewer.restfulobjects.rendering.util.Util;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-public class DomainResourceHelperTest_readBodyAsMap {
+public class DomainResourceHelper_readBodyAsMap_Test {
private JsonRepresentation representation;
diff --git a/core/viewers/restfulobjects/server/src/test/java/org/apache/isis/viewer/restfulobjects/server/resources/JsonParserHelpTest.java b/core/viewers/restfulobjects/server/src/test/java/org/apache/isis/viewer/restfulobjects/server/resources/JsonParserHelper_Test.java
similarity index 97%
rename from core/viewers/restfulobjects/server/src/test/java/org/apache/isis/viewer/restfulobjects/server/resources/JsonParserHelpTest.java
rename to core/viewers/restfulobjects/server/src/test/java/org/apache/isis/viewer/restfulobjects/server/resources/JsonParserHelper_Test.java
index 12865e1..f5b3aa7 100644
--- a/core/viewers/restfulobjects/server/src/test/java/org/apache/isis/viewer/restfulobjects/server/resources/JsonParserHelpTest.java
+++ b/core/viewers/restfulobjects/server/src/test/java/org/apache/isis/viewer/restfulobjects/server/resources/JsonParserHelper_Test.java
@@ -24,7 +24,7 @@ import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
import static org.junit.Assert.assertEquals;
-public class JsonParserHelpTest {
+public class JsonParserHelper_Test {
@Test
public void oidFromLink() throws Exception {
diff --git a/core/viewers/restfulobjects/server/src/test/java/org/apache/isis/viewer/restfulobjects/server/util/UrlParserUtilsTest.java b/core/viewers/restfulobjects/server/src/test/java/org/apache/isis/viewer/restfulobjects/server/util/UrlParserUtils_Test.java
similarity index 98%
rename from core/viewers/restfulobjects/server/src/test/java/org/apache/isis/viewer/restfulobjects/server/util/UrlParserUtilsTest.java
rename to core/viewers/restfulobjects/server/src/test/java/org/apache/isis/viewer/restfulobjects/server/util/UrlParserUtils_Test.java
index 40830e0..f6d4b70 100644
--- a/core/viewers/restfulobjects/server/src/test/java/org/apache/isis/viewer/restfulobjects/server/util/UrlParserUtilsTest.java
+++ b/core/viewers/restfulobjects/server/src/test/java/org/apache/isis/viewer/restfulobjects/server/util/UrlParserUtils_Test.java
@@ -24,7 +24,7 @@ import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
import static org.junit.Assert.assertEquals;
-public class UrlParserUtilsTest {
+public class UrlParserUtils_Test {
@Test
public void domainTypeFromLink() throws Exception {
diff --git a/core/viewers/restfulobjects/server/src/test/java/org/apache/isis/viewer/restfulobjects/server/IsisRestfulObjectsSessionFilter_lookupPassThru_Test.java b/core/viewers/restfulobjects/server/src/test/java/org/apache/isis/viewer/restfulobjects/server/webmodule/IsisRestfulObjectsSessionFilter_lookupPassThru_Test.java
similarity index 95%
rename from core/viewers/restfulobjects/server/src/test/java/org/apache/isis/viewer/restfulobjects/server/IsisRestfulObjectsSessionFilter_lookupPassThru_Test.java
rename to core/viewers/restfulobjects/server/src/test/java/org/apache/isis/viewer/restfulobjects/server/webmodule/IsisRestfulObjectsSessionFilter_lookupPassThru_Test.java
index d133eaa..5437336 100644
--- a/core/viewers/restfulobjects/server/src/test/java/org/apache/isis/viewer/restfulobjects/server/IsisRestfulObjectsSessionFilter_lookupPassThru_Test.java
+++ b/core/viewers/restfulobjects/server/src/test/java/org/apache/isis/viewer/restfulobjects/server/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;
+package org.apache.isis.viewer.restfulobjects.server.webmodule;
import java.util.List;
import javax.servlet.FilterConfig;
-import org.apache.isis.viewer.restfulobjects.server.IsisRestfulObjectsSessionFilter;
+import org.apache.isis.viewer.restfulobjects.server.webmodule.IsisRestfulObjectsSessionFilter;
import org.jmock.Expectations;
import org.jmock.auto.Mock;
import org.junit.Assert;