From: Mathieu Baudier <mbaudier@argeo.org>
Date: Fri, 6 Nov 2015 17:07:23 +0000 (+0000)
Subject: Use /data for the images
X-Git-Tag: argeo-commons-2.1.30~45
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=a4254b218ae9668a945ac7928b45466cb41b07d3;p=lgpl%2Fargeo-commons.git

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 8c55674b1..7765ecdc3 100644
--- 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 {