[43/50] [abbrv] isis git commit: ISIS-1441: removes AuthenticationManagerStandardForDfltRuntime, instead use AuthenticationManagerStandard.

[da...@apache.org]

http://git-wip-us.apache.org/repos/asf/isis/blob/364e5b9b/core/security/src/main/java/org/apache/isis/core/security/authorization/AuthorizorBypass.java
----------------------------------------------------------------------
diff --git a/core/security/src/main/java/org/apache/isis/core/security/authorization/AuthorizorBypass.java b/core/security/src/main/java/org/apache/isis/core/security/authorization/AuthorizorBypass.java
index 011415c..6a73ce4 100644
--- a/core/security/src/main/java/org/apache/isis/core/security/authorization/AuthorizorBypass.java
+++ b/core/security/src/main/java/org/apache/isis/core/security/authorization/AuthorizorBypass.java
@@ -20,12 +20,13 @@
 package org.apache.isis.core.security.authorization;
 
 import org.apache.isis.applib.Identifier;
+import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
 import org.apache.isis.core.runtime.authorization.standard.Authorizor;
 
 public class AuthorizorBypass implements Authorizor {
 
     @Override
-    public void init() {
+    public void init(final DeploymentCategory deploymentCategory) {
         // does nothing
     }
 

http://git-wip-us.apache.org/repos/asf/isis/blob/364e5b9b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/UserResourceServerside.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/UserResourceServerside.java b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/UserResourceServerside.java
index 17c4b54..32f7c41 100644
--- a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/UserResourceServerside.java
+++ b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/UserResourceServerside.java
@@ -26,6 +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.core.commons.authentication.AuthenticationSession;
 import org.apache.isis.core.webapp.IsisSessionFilter;
 import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
 import org.apache.isis.viewer.restfulobjects.applib.RepresentationType;
@@ -79,7 +80,10 @@ public class UserResourceServerside extends ResourceAbstract implements UserReso
         renderer.includesSelf();
 
         // we do the logout (removes this session from those valid)
-        getAuthenticationManager().closeSession(getResourceContext().getAuthenticationSession());
+        final AuthenticationSession authenticationSession = getResourceContext().getAuthenticationSession();
+        getAuthenticationManager().closeSession(authenticationSession);
+
+        getIsisSessionFactory().closeSession();
 
         // we also redirect to home page with special query string; this allows the session filter
         // to clear out any cookies/headers (eg if BASIC auth in use).