Use /data for the images

git-svn-id: https://svn.argeo.org/commons/trunk@8545 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/ImageManagerImpl.java b/org.argeo.cms/src/org/argeo/cms/internal/ImageManagerImpl.java
index 8c55674b1d5b8322b30db70c35fbbdfc2c2741ff..7765ecdc3dc7491b9c4582726a3b25e6ca5d3710 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/internal/ImageManagerImpl.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/ImageManagerImpl.java
@@ -164,27 +164,27 @@ public class ImageManagerImpl implements CmsImageManager, CmsNames {
        /** @return null if not available */
        @Override
        public String getImageUrl(Node node) throws RepositoryException {
-//             String url = "/data/public/node/main"
-//                             + node.getPath();
-//             return url;
-               String name = getResourceName(node);
-               ResourceManager resourceManager = RWT.getResourceManager();
-               if (!resourceManager.isRegistered(name)) {
-                       InputStream inputStream = null;
-                       Binary binary = getImageBinary(node);
-                       if (binary == null)
-                               return null;
-                       try {
-                               inputStream = binary.getStream();
-                               resourceManager.register(name, inputStream);
-                       } finally {
-                               IOUtils.closeQuietly(inputStream);
-                               JcrUtils.closeQuietly(binary);
-                       }
-                       if (log.isTraceEnabled())
-                               log.trace("Registered image " + name);
-               }
-               return resourceManager.getLocation(name);
+               String url = "/data/public/node/"
+                               + node.getSession().getWorkspace().getName() + node.getPath();
+               return url;
+               // String name = getResourceName(node);
+               // ResourceManager resourceManager = RWT.getResourceManager();
+               // if (!resourceManager.isRegistered(name)) {
+               // InputStream inputStream = null;
+               // Binary binary = getImageBinary(node);
+               // if (binary == null)
+               // return null;
+               // try {
+               // inputStream = binary.getStream();
+               // resourceManager.register(name, inputStream);
+               // } finally {
+               // IOUtils.closeQuietly(inputStream);
+               // JcrUtils.closeQuietly(binary);
+               // }
+               // if (log.isTraceEnabled())
+               // log.trace("Registered image " + name);
+               // }
+               // return resourceManager.getLocation(name);
        }
 
        protected String getResourceName(Node node) throws RepositoryException {