X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms.ui%2Fsrc%2Forg%2Fargeo%2Fcms%2Futil%2FCmsUtils.java;h=7864dde8b645999e094529dce4facb70bfdf441e;hb=d53071455192a97322935a911c9fbbfd92084912;hp=665c4c6140f960eee4a418fb879c6871f9f36b51;hpb=fd8f2c91e47d38445ba9702b40559939162f666d;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms.ui/src/org/argeo/cms/util/CmsUtils.java b/org.argeo.cms.ui/src/org/argeo/cms/util/CmsUtils.java
index 665c4c614..7864dde8b 100644
--- a/org.argeo.cms.ui/src/org/argeo/cms/util/CmsUtils.java
+++ b/org.argeo.cms.ui/src/org/argeo/cms/util/CmsUtils.java
@@ -4,22 +4,19 @@ import java.io.InputStream;
 import java.net.MalformedURLException;
 import java.net.URL;
 
-import javax.jcr.Item;
 import javax.jcr.Node;
-import javax.jcr.Property;
 import javax.jcr.RepositoryException;
 import javax.servlet.http.HttpServletRequest;
 
 import org.apache.commons.io.IOUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.argeo.cms.CmsException;
 import org.argeo.cms.ui.CmsConstants;
 import org.argeo.cms.ui.CmsView;
 import org.argeo.eclipse.ui.specific.UiContext;
 import org.argeo.jcr.JcrUtils;
-import org.argeo.node.NodeAuthenticated;
 import org.argeo.node.NodeConstants;
+import org.argeo.node.NodeUtils;
+import org.argeo.node.security.NodeAuthenticated;
 import org.eclipse.rap.rwt.RWT;
 import org.eclipse.rap.rwt.service.ResourceManager;
 import org.eclipse.swt.SWT;
@@ -37,7 +34,7 @@ import org.eclipse.swt.widgets.Widget;
 
 /** Static utilities for the CMS framework. */
 public class CmsUtils implements CmsConstants {
-	private final static Log log = LogFactory.getLog(CmsUtils.class);
+	// private final static Log log = LogFactory.getLog(CmsUtils.class);
 
 	/**
 	 * The CMS view related to this display, or null if none is available from
@@ -59,7 +56,8 @@ public class CmsUtils implements CmsConstants {
 			throw new CmsException("Cannot extract server base URL from " + request.getRequestURL(), e);
 		}
 	}
-//
+
+	//
 	public static String getDataUrl(Node node, HttpServletRequest request) throws RepositoryException {
 		try {
 			StringBuilder buf = getServerBaseUrl(request);
@@ -69,37 +67,55 @@ public class CmsUtils implements CmsConstants {
 			throw new CmsException("Cannot build data URL for " + node, e);
 		}
 	}
-// FIXME
-	private final static String PATH_DATA = "/data";
-	private final static String WEBDAV_PUBLIC = PATH_DATA + "/public";
-	private final static String WEBDAV_PRIVATE = PATH_DATA + "/files";
+
+	// private final static String PATH_DATA = "/data";
+	// private final static String WEBDAV_PUBLIC = PATH_DATA + "/public";
+	// private final static String WEBDAV_PRIVATE = PATH_DATA + "/files";
+
+	/** A path in the node repository */
 	public static String getDataPath(Node node) throws RepositoryException {
-		assert node != null;
-		String userId = node.getSession().getUserID();
-		if (log.isTraceEnabled())
-			log.trace(userId + " : " + node.getPath());
-		StringBuilder buf = new StringBuilder();
-		boolean isAnonymous = userId.equalsIgnoreCase(NodeConstants.ROLE_ANONYMOUS);
-		if (isAnonymous)
-			buf.append(WEBDAV_PUBLIC);
-		else
-			buf.append(WEBDAV_PRIVATE);
-		// TODO convey repo alias vie repository properties
-		return buf.append('/').append(NodeConstants.ALIAS_NODE).append('/').append(node.getSession().getWorkspace().getName())
-				.append(node.getPath()).toString();
-	}
-//
-//	public static String getCanonicalUrl(Node node, HttpServletRequest request) throws RepositoryException {
-//		try {
-//			StringBuilder buf = getServerBaseUrl(request);
-//			buf.append('/').append('!').append(node.getPath());
-//			return new URL(buf.toString()).toString();
-//		} catch (MalformedURLException e) {
-//			throw new CmsException("Cannot build data URL for " + node, e);
-//		}
-//		// return request.getRequestURL().append('!').append(node.getPath())
-//		// .toString();
-//	}
+		return getDataPath(NodeConstants.NODE, node);
+	}
+
+	public static String getDataPath(String cn, Node node) throws RepositoryException {
+		return NodeUtils.getDataPath(cn, node);
+		// assert node != null;
+		// String userId = node.getSession().getUserID();
+		// if (log.isTraceEnabled())
+		// log.trace(userId + " : " + node.getPath());
+		// StringBuilder buf = new StringBuilder();
+		// boolean isAnonymous =
+		// userId.equalsIgnoreCase(NodeConstants.ROLE_ANONYMOUS);
+		// if (isAnonymous)
+		// buf.append(WEBDAV_PUBLIC);
+		// else
+		// buf.append(WEBDAV_PRIVATE);
+		// Session session = node.getSession();
+		// Repository repository = session.getRepository();
+		// String cn;
+		// if (repository.isSingleValueDescriptor(NodeConstants.CN)) {
+		// cn = repository.getDescriptor(NodeConstants.CN);
+		// } else {
+		// log.warn("No cn defined in repository, using " + NodeConstants.NODE);
+		// cn = NodeConstants.NODE;
+		// }
+		// return
+		// buf.append('/').append(cn).append('/').append(session.getWorkspace().getName()).append(node.getPath())
+		// .toString();
+	}
+	//
+	// public static String getCanonicalUrl(Node node, HttpServletRequest
+	// request) throws RepositoryException {
+	// try {
+	// StringBuilder buf = getServerBaseUrl(request);
+	// buf.append('/').append('!').append(node.getPath());
+	// return new URL(buf.toString()).toString();
+	// } catch (MalformedURLException e) {
+	// throw new CmsException("Cannot build data URL for " + node, e);
+	// }
+	// // return request.getRequestURL().append('!').append(node.getPath())
+	// // .toString();
+	// }
 
 	/** @deprecated Use rowData16px() instead. GridData should not be reused. */
 	@Deprecated
@@ -150,25 +166,27 @@ public class CmsUtils implements CmsConstants {
 		table.setData(CmsConstants.ITEM_HEIGHT, height);
 	}
 
-	/** @return the path or null if not instrumented */
-	public static String getDataPath(Widget widget) {
-		// JCR item
-		Object data = widget.getData();
-		if (data != null && data instanceof Item) {
-			try {
-				return ((Item) data).getPath();
-			} catch (RepositoryException e) {
-				throw new CmsException("Cannot find data path of " + data + " for " + widget);
-			}
-		}
-
-		// JCR path
-		data = widget.getData(Property.JCR_PATH);
-		if (data != null)
-			return data.toString();
-
-		return null;
-	}
+	// /** @return the path or null if not instrumented */
+	// @Deprecated
+	// public static String getDataPath(Widget widget) {
+	// // JCR item
+	// Object data = widget.getData();
+	// if (data != null && data instanceof Item) {
+	// try {
+	// return ((Item) data).getPath();
+	// } catch (RepositoryException e) {
+	// throw new CmsException("Cannot find data path of " + data + " for " +
+	// widget);
+	// }
+	// }
+	//
+	// // JCR path
+	// data = widget.getData(Property.JCR_PATH);
+	// if (data != null)
+	// return data.toString();
+	//
+	// return null;
+	// }
 
 	/** Dispose all children of a Composite */
 	public static void clear(Composite composite) {