X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=server%2Fruntime%2Forg.argeo.server.jackrabbit%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fjcr%2FJcrUtils.java;h=d3174a1cace4427be061598273b2039b529968c7;hb=bc3dd777a21dbf4d6522c46de12064f2254dfa2b;hp=8792a36de3aeb3e79d02f2376c68aaf9baee4660;hpb=3c169a3fd8516288d846d53652b873a0d7dab2fc;p=lgpl%2Fargeo-commons.git

diff --git a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jcr/JcrUtils.java b/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jcr/JcrUtils.java
index 8792a36de..d3174a1ca 100644
--- a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jcr/JcrUtils.java
+++ b/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jcr/JcrUtils.java
@@ -3,6 +3,7 @@ package org.argeo.jcr;
 import java.util.Calendar;
 import java.util.StringTokenizer;
 
+import javax.jcr.NamespaceRegistry;
 import javax.jcr.Node;
 import javax.jcr.NodeIterator;
 import javax.jcr.Property;
@@ -38,10 +39,10 @@ public class JcrUtils {
 			throw new ArgeoException("Query returned more than one node.");
 		return node;
 	}
-	
-	public static String removeForbiddenCharacters(String str){
-		return str.replace('[', '_').replace(']', '_')
-		.replace('/', '_').replace('*', '_');
+
+	public static String removeForbiddenCharacters(String str) {
+		return str.replace('[', '_').replace(']', '_').replace('/', '_')
+				.replace('*', '_');
 
 	}
 
@@ -59,18 +60,19 @@ public class JcrUtils {
 	}
 
 	public static String dateAsPath(Calendar cal) {
-		StringBuffer buf = new StringBuffer(11);
-		buf.append(cal.get(Calendar.YEAR));// 4
+		StringBuffer buf = new StringBuffer(14);
+		buf.append('Y').append(cal.get(Calendar.YEAR));// 5
 		buf.append('/');// 1
 		int month = cal.get(Calendar.MONTH) + 1;
+		buf.append('M');
 		if (month < 10)
 			buf.append(0);
-		buf.append(month);// 2
+		buf.append(month);// 3
 		buf.append('/');// 1
 		int day = cal.get(Calendar.DAY_OF_MONTH);
 		if (day < 10)
 			buf.append(0);
-		buf.append(day);// 2
+		buf.append('D').append(day);// 3
 		buf.append('/');// 1
 		return buf.toString();
 
@@ -128,6 +130,39 @@ public class JcrUtils {
 		}
 	}
 
+	public static void registerNamespaceSafely(Session session, String prefix,
+			String uri) {
+		try {
+			registerNamespaceSafely(session.getWorkspace()
+					.getNamespaceRegistry(), prefix, uri);
+		} catch (RepositoryException e) {
+			throw new ArgeoException("Cannot find namespace registry", e);
+		}
+	}
+
+	public static void registerNamespaceSafely(NamespaceRegistry nr,
+			String prefix, String uri) {
+		try {
+			String[] prefixes = nr.getPrefixes();
+			for (String pref : prefixes)
+				if (pref.equals(prefix)) {
+					String registeredUri = nr.getURI(pref);
+					if (!registeredUri.equals(uri))
+						throw new ArgeoException("Prefix " + pref
+								+ " already registered for URI "
+								+ registeredUri
+								+ " which is different from provided URI "
+								+ uri);
+					else
+						return;// skip
+				}
+			nr.registerNamespace(prefix, uri);
+		} catch (RepositoryException e) {
+			throw new ArgeoException("Cannot register namespace " + uri
+					+ " under prefix " + prefix, e);
+		}
+	}
+
 	/** Recursively outputs the contents of the given node. */
 	public static void debug(Node node) throws RepositoryException {
 		// First output the node path
@@ -146,8 +181,8 @@ public class JcrUtils {
 
 		// Then output the properties
 		PropertyIterator properties = node.getProperties();
-		//log.debug("Property are : ");
-		
+		// log.debug("Property are : ");
+
 		while (properties.hasNext()) {
 			Property property = properties.nextProperty();
 			if (property.getDefinition().isMultiple()) {