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 13:03:45 UTC
[isis] 01/08: ISIS-2212: moves AuthenticationSessionStrategy and
its subtypes from runtime-web to 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 eab19bcda28ab97c2f382667c0d49f6ffa99ed60
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Dec 4 12:28:37 2019 +0000
ISIS-2212: moves AuthenticationSessionStrategy and its subtypes from runtime-web to restfulobjects.server
... since is only used there, nowhere else.
---
.../isis/viewer/restfulobjects/IsisRestfulObjectsSessionFilter.java | 4 ++--
.../apache/isis/viewer/restfulobjects/WebModuleRestfulObjects.java | 2 +-
.../restfulobjects/server}/auth/AuthenticationSessionStrategy.java | 2 +-
.../server}/auth/AuthenticationSessionStrategyAbstract.java | 2 +-
.../server}/auth/AuthenticationSessionStrategyBasicAuth.java | 2 +-
.../server}/auth/AuthenticationSessionStrategyDefault.java | 2 +-
6 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/IsisRestfulObjectsSessionFilter.java b/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/IsisRestfulObjectsSessionFilter.java
index 5b18714..488fd45 100644
--- a/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/IsisRestfulObjectsSessionFilter.java
+++ b/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/IsisRestfulObjectsSessionFilter.java
@@ -47,8 +47,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.IsisWebAppUtils;
-import org.apache.isis.webapp.auth.AuthenticationSessionStrategy;
-import org.apache.isis.webapp.auth.AuthenticationSessionStrategyDefault;
+import org.apache.isis.viewer.restfulobjects.server.auth.AuthenticationSessionStrategy;
+import org.apache.isis.viewer.restfulobjects.server.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/WebModuleRestfulObjects.java b/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/WebModuleRestfulObjects.java
index a09998a..fdf537e 100644
--- a/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/WebModuleRestfulObjects.java
+++ b/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/WebModuleRestfulObjects.java
@@ -97,7 +97,7 @@ public final class WebModuleRestfulObjects implements WebModule {
filter.setInitParameter(
"authenticationSessionStrategy",
- "org.apache.isis.webapp.auth.AuthenticationSessionStrategyBasicAuth");
+ "org.apache.isis.viewer.restfulobjects.server.auth.AuthenticationSessionStrategyBasicAuth");
filter.setInitParameter(
"whenNoSession", // what to do if no session was found ...
"auto"); // ... 401 and a basic authentication challenge if request originates from web browser
diff --git a/core/runtime-web/src/main/java/org/apache/isis/webapp/auth/AuthenticationSessionStrategy.java b/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/auth/AuthenticationSessionStrategy.java
similarity index 97%
rename from core/runtime-web/src/main/java/org/apache/isis/webapp/auth/AuthenticationSessionStrategy.java
rename to core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/auth/AuthenticationSessionStrategy.java
index b28d839..e39aaff 100644
--- a/core/runtime-web/src/main/java/org/apache/isis/webapp/auth/AuthenticationSessionStrategy.java
+++ b/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/auth/AuthenticationSessionStrategy.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.webapp.auth;
+package org.apache.isis.viewer.restfulobjects.server.auth;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
diff --git a/core/runtime-web/src/main/java/org/apache/isis/webapp/auth/AuthenticationSessionStrategyAbstract.java b/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/auth/AuthenticationSessionStrategyAbstract.java
similarity index 97%
rename from core/runtime-web/src/main/java/org/apache/isis/webapp/auth/AuthenticationSessionStrategyAbstract.java
rename to core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/auth/AuthenticationSessionStrategyAbstract.java
index 4a7f7ab..8bc8925 100644
--- a/core/runtime-web/src/main/java/org/apache/isis/webapp/auth/AuthenticationSessionStrategyAbstract.java
+++ b/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/auth/AuthenticationSessionStrategyAbstract.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.webapp.auth;
+package org.apache.isis.viewer.restfulobjects.server.auth;
import javax.servlet.ServletContext;
import javax.servlet.ServletRequest;
diff --git a/core/runtime-web/src/main/java/org/apache/isis/webapp/auth/AuthenticationSessionStrategyBasicAuth.java b/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/auth/AuthenticationSessionStrategyBasicAuth.java
similarity index 98%
rename from core/runtime-web/src/main/java/org/apache/isis/webapp/auth/AuthenticationSessionStrategyBasicAuth.java
rename to core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/auth/AuthenticationSessionStrategyBasicAuth.java
index 1dde6b9..137a5f8 100644
--- a/core/runtime-web/src/main/java/org/apache/isis/webapp/auth/AuthenticationSessionStrategyBasicAuth.java
+++ b/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/auth/AuthenticationSessionStrategyBasicAuth.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.webapp.auth;
+package org.apache.isis.viewer.restfulobjects.server.auth;
import java.nio.charset.StandardCharsets;
import java.util.Base64;
diff --git a/core/runtime-web/src/main/java/org/apache/isis/webapp/auth/AuthenticationSessionStrategyDefault.java b/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/auth/AuthenticationSessionStrategyDefault.java
similarity index 98%
rename from core/runtime-web/src/main/java/org/apache/isis/webapp/auth/AuthenticationSessionStrategyDefault.java
rename to core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/auth/AuthenticationSessionStrategyDefault.java
index 9413ec5..e96d0a2 100644
--- a/core/runtime-web/src/main/java/org/apache/isis/webapp/auth/AuthenticationSessionStrategyDefault.java
+++ b/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/auth/AuthenticationSessionStrategyDefault.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.webapp.auth;
+package org.apache.isis.viewer.restfulobjects.server.auth;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;