Refactor JCR exceptions.

[lgpl/argeo-commons.git] / org.argeo.jcr / src / org / argeo / jcr / proxy / ResourceProxyServlet.java

diff --git a/org.argeo.jcr/src/org/argeo/jcr/proxy/ResourceProxyServlet.java b/org.argeo.jcr/src/org/argeo/jcr/proxy/ResourceProxyServlet.java
index c29b13a796466b0e225141df15386ca3e5707738..d77bd49dca21fed2b7e2e1e827723fe4ba3055c2 100644 (file)
--- a/org.argeo.jcr/src/org/argeo/jcr/proxy/ResourceProxyServlet.java
+++ b/org.argeo.jcr/src/org/argeo/jcr/proxy/ResourceProxyServlet.java
@@ -1,18 +1,3 @@
-/*
- * 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.proxy;
 
 import java.io.IOException;
@@ -30,7 +15,7 @@ import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.argeo.jcr.ArgeoJcrException;
+import org.argeo.jcr.JcrException;
 import org.argeo.jcr.Bin;
 import org.argeo.jcr.JcrUtils;
 
@@ -116,20 +101,11 @@ public class ResourceProxyServlet extends HttpServlet {
 
                        response.setContentType(contentType);
 
-//                     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) {
-                       throw new ArgeoJcrException("Cannot download " + node, e);
-//             } finally {
-//                     IOUtils.closeQuietly(in);
-//                     JcrUtils.closeQuietly(binary);
+               } catch (RepositoryException e) {
+                       throw new JcrException("Cannot download " + node, e);
+               } catch (IOException e) {
+                       throw new RuntimeException("Cannot download " + node, e);
                }
        }