incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fmesc...@apache.org
Subject svn commit: r1202128 - in /sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/impl: LoginServlet.java LogoutServlet.java
Date Tue, 15 Nov 2011 11:04:28 GMT
Author: fmeschbe
Date: Tue Nov 15 11:04:27 2011
New Revision: 1202128

URL: http://svn.apache.org/viewvc?rev=1202128&view=rev
Log:
SLING-2287 Don't use the servlet context path as the default login resource because the actual
redirect will automatically prefix the servlet context path

Modified:
    sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/impl/LoginServlet.java
    sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/impl/LogoutServlet.java

Modified: sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/impl/LoginServlet.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/impl/LoginServlet.java?rev=1202128&r1=1202127&r2=1202128&view=diff
==============================================================================
--- sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/impl/LoginServlet.java
(original)
+++ sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/impl/LoginServlet.java
Tue Nov 15 11:04:27 2011
@@ -96,8 +96,7 @@ public class LoginServlet extends SlingA
             try {
 
                 // set the login resource to select the authenticator
-                AbstractAuthenticationHandler.setLoginResourceAttribute(
-                    request, request.getContextPath());
+                AbstractAuthenticationHandler.setLoginResourceAttribute(request, null);
                 authenticator.login(request, response);
                 return;
 

Modified: sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/impl/LogoutServlet.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/impl/LogoutServlet.java?rev=1202128&r1=1202127&r2=1202128&view=diff
==============================================================================
--- sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/impl/LogoutServlet.java
(original)
+++ sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/impl/LogoutServlet.java
Tue Nov 15 11:04:27 2011
@@ -71,8 +71,7 @@ public class LogoutServlet extends Sling
         final Authenticator authenticator = this.authenticator;
         if (authenticator != null) {
             try {
-                AbstractAuthenticationHandler.setLoginResourceAttribute(
-                    request, request.getContextPath());
+                AbstractAuthenticationHandler.setLoginResourceAttribute(request, null);
                 authenticator.logout(request, response);
                 return;
             } catch (IllegalStateException ise) {



Mime
View raw message