Remove unused directory

[lgpl/argeo-commons.git] / org.argeo.cms / src / org / argeo / cms / internal / kernel / NodeHttp.java

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeHttp.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeHttp.java
index 09ca7ea771a6c9b2639c8ee65b1ca6fb1d7f68d8..bc74cf638722c3d8409e511f865ea28b34f0b442 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeHttp.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeHttp.java
@@ -1,6 +1,6 @@
 package org.argeo.cms.internal.kernel;
 
-import static org.argeo.cms.KernelHeader.ACCESS_CONTROL_CONTEXT;
+import static org.argeo.cms.auth.AuthConstants.ACCESS_CONTROL_CONTEXT;
 
 import java.io.IOException;
 import java.security.AccessControlContext;
@@ -31,7 +31,7 @@ import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.cms.CmsException;
-import org.argeo.cms.KernelHeader;
+import org.argeo.cms.auth.AuthConstants;
 import org.argeo.jackrabbit.servlet.OpenInViewSessionProvider;
 import org.argeo.jackrabbit.servlet.RemotingServlet;
 import org.argeo.jackrabbit.servlet.WebdavServlet;
@@ -43,6 +43,7 @@ import org.osgi.service.http.NamespaceException;
  * Intercepts and enriches http access, mainly focusing on security and
  * transactionality.
  */
+@Deprecated
 class NodeHttp implements KernelConstants, ArgeoJcrConstants {
        private final static Log log = LogFactory.getLog(NodeHttp.class);
 
@@ -64,7 +65,7 @@ class NodeHttp implements KernelConstants, ArgeoJcrConstants {
        // WebDav / JCR remoting
        private OpenInViewSessionProvider sessionProvider;
 
-       NodeHttp(ExtendedHttpService httpService, JackrabbitNode node) {
+       NodeHttp(ExtendedHttpService httpService, NodeRepository node) {
                // this.bundleContext = bundleContext;
                // this.authenticationManager = authenticationManager;
 
@@ -243,6 +244,7 @@ class NodeHttp implements KernelConstants, ArgeoJcrConstants {
                        int pathLength = path.length();
                        if (pathLength != 0 && (path.charAt(0) == '/')
                                        && !servletPath.endsWith("rwt-resources")
+                                       && !path.startsWith(KernelConstants.PATH_WORKBENCH)
                                        && path.lastIndexOf('/') != 0) {
                                String newLocation = request.getServletPath() + "#" + path;
                                response.setHeader("Location", newLocation);
@@ -336,7 +338,7 @@ class NodeHttp implements KernelConstants, ArgeoJcrConstants {
                                ServletException {
 
                        AccessControlContext acc = (AccessControlContext) httpSession
-                                       .getAttribute(KernelHeader.ACCESS_CONTROL_CONTEXT);
+                                       .getAttribute(AuthConstants.ACCESS_CONTROL_CONTEXT);
                        final Subject subject;
                        if (acc != null) {
                                subject = Subject.getSubject(acc);
@@ -347,7 +349,7 @@ class NodeHttp implements KernelConstants, ArgeoJcrConstants {
                                        CallbackHandler token = basicAuth(basicAuth);
                                        try {
                                                LoginContext lc = new LoginContext(
-                                                               KernelHeader.LOGIN_CONTEXT_USER, token);
+                                                               AuthConstants.LOGIN_CONTEXT_USER, token);
                                                lc.login();
                                                subject = lc.getSubject();
                                        } catch (LoginException e) {