X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=server%2Fruntime%2Forg.argeo.server.jcr.mvc%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fjcr%2Fmvc%2FResourceProxyServlet.java;h=c821be05418f229f31cb6708f94be3ce8dd34daa;hb=3a3d316af102ba410d1d9e6de349d0c8f7ac044f;hp=8735e869e27f600d78b320821d3ba86fb199a65b;hpb=2d4dd736ab07b1ef3aaec0a9e5d29f30c551de9c;p=lgpl%2Fargeo-commons.git diff --git a/server/runtime/org.argeo.server.jcr.mvc/src/main/java/org/argeo/jcr/mvc/ResourceProxyServlet.java b/server/runtime/org.argeo.server.jcr.mvc/src/main/java/org/argeo/jcr/mvc/ResourceProxyServlet.java index 8735e869e..c821be054 100644 --- a/server/runtime/org.argeo.server.jcr.mvc/src/main/java/org/argeo/jcr/mvc/ResourceProxyServlet.java +++ b/server/runtime/org.argeo.server.jcr.mvc/src/main/java/org/argeo/jcr/mvc/ResourceProxyServlet.java @@ -1,3 +1,18 @@ +/* + * Copyright (C) 2007-2012 Argeo GmbH + * + * Licensed 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. + */ package org.argeo.jcr.mvc; import java.io.IOException; @@ -5,8 +20,9 @@ import java.io.InputStream; import javax.jcr.Binary; import javax.jcr.Node; +import javax.jcr.PathNotFoundException; import javax.jcr.Property; -import javax.jcr.Session; +import javax.jcr.RepositoryException; import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; @@ -17,12 +33,11 @@ import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.argeo.ArgeoException; -import org.argeo.jcr.ArgeoNames; import org.argeo.jcr.JcrUtils; import org.argeo.jcr.proxy.ResourceProxy; /** Wraps a proxy via HTTP */ -public class ResourceProxyServlet extends HttpServlet implements ArgeoNames { +public class ResourceProxyServlet extends HttpServlet { private static final long serialVersionUID = -8886549549223155801L; private final static Log log = LogFactory @@ -30,7 +45,6 @@ public class ResourceProxyServlet extends HttpServlet implements ArgeoNames { private ResourceProxy proxy; - private Session jcrSession; private String contentTypeCharset = "UTF-8"; @Override @@ -38,20 +52,37 @@ public class ResourceProxyServlet extends HttpServlet implements ArgeoNames { HttpServletResponse response) throws ServletException, IOException { String path = request.getPathInfo(); - String nodePath = proxy.getNodePath(path); - if (log.isTraceEnabled()) - log.trace("path=" + path + ", nodePath=" + nodePath); + if (log.isTraceEnabled()) { + log.trace("path=" + path); + log.trace("UserPrincipal = " + request.getUserPrincipal().getName()); + log.trace("SessionID = " + request.getSession().getId()); + log.trace("ContextPath = " + request.getContextPath()); + log.trace("ServletPath = " + request.getServletPath()); + log.trace("PathInfo = " + request.getPathInfo()); + log.trace("Method = " + request.getMethod()); + log.trace("User-Agent = " + request.getHeader("User-Agent")); + } + + Node node = null; + try { + node = proxy.proxy(path); + if (node == null) + response.sendError(404); + else + processResponse(node, response); + } finally { + if (node != null) + try { + JcrUtils.logoutQuietly(node.getSession()); + } catch (RepositoryException e) { + // silent + } + } - Node node = proxy.proxy(jcrSession, path); - if (node == null) - response.sendError(404); - else - processResponse(nodePath, node, response); } /** Retrieve the content of the node. */ - protected void processResponse(String path, Node node, - HttpServletResponse response) { + protected void processResponse(Node node, HttpServletResponse response) { Binary binary = null; InputStream in = null; try { @@ -69,8 +100,12 @@ public class ResourceProxyServlet extends HttpServlet implements ArgeoNames { contentType = "application/zip"; else if ("gz".equals(ext)) contentType = "application/x-gzip"; + else if ("bz2".equals(ext)) + contentType = "application/x-bzip2"; else if ("tar".equals(ext)) contentType = "application/x-tar"; + else if ("rpm".equals(ext)) + contentType = "application/x-redhat-package-manager"; else contentType = "application/octet-stream"; contentType = contentType + ";name=\"" + fileName + "\""; @@ -82,8 +117,13 @@ public class ResourceProxyServlet extends HttpServlet implements ArgeoNames { response.setContentType(contentType); - binary = node.getNode(Property.JCR_CONTENT) - .getProperty(Property.JCR_DATA).getBinary(); + try { + binary = node.getNode(Property.JCR_CONTENT) + .getProperty(Property.JCR_DATA).getBinary(); + } catch (PathNotFoundException e) { + log.error("Node " + node + " as no data under content"); + throw e; + } in = binary.getStream(); IOUtils.copy(in, response.getOutputStream()); } catch (Exception e) { @@ -94,10 +134,6 @@ public class ResourceProxyServlet extends HttpServlet implements ArgeoNames { } } - public void setJcrSession(Session jcrSession) { - this.jcrSession = jcrSession; - } - public void setProxy(ResourceProxy resourceProxy) { this.proxy = resourceProxy; }