X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=server%2Fruntime%2Forg.argeo.server.jackrabbit%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fserver%2Fjackrabbit%2FJackrabbitContainer.java;h=f06163f34cfaaccc878cb4ecda9fbea3bca14fab;hb=7d9a472a54d841c064440bc5c81eed1cd18198ff;hp=6d7237a648a57af585c6c3d0a6011684bd75c89d;hpb=462f742349458e2bc907e0d7f6bb76012caf2a3b;p=lgpl%2Fargeo-commons.git

diff --git a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/server/jackrabbit/JackrabbitContainer.java b/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/server/jackrabbit/JackrabbitContainer.java
index 6d7237a64..f06163f34 100644
--- a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/server/jackrabbit/JackrabbitContainer.java
+++ b/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/server/jackrabbit/JackrabbitContainer.java
@@ -18,6 +18,8 @@ package org.argeo.server.jackrabbit;
 
 import java.io.File;
 import java.io.InputStream;
+import java.util.HashMap;
+import java.util.Map;
 
 import javax.jcr.Credentials;
 import javax.jcr.LoginException;
@@ -31,13 +33,19 @@ import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.jackrabbit.commons.NamespaceHelper;
 import org.apache.jackrabbit.core.RepositoryImpl;
 import org.apache.jackrabbit.core.TransientRepository;
 import org.apache.jackrabbit.core.config.RepositoryConfig;
+import org.argeo.ArgeoException;
 import org.springframework.beans.factory.DisposableBean;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.core.io.Resource;
 
+/**
+ * Wrapper around a Jackrabbit repository which allows to configure it in Spring
+ * and expose it as a {@link Repository}.
+ */
 public class JackrabbitContainer implements InitializingBean, DisposableBean,
 		Repository {
 	private Log log = LogFactory.getLog(JackrabbitContainer.class);
@@ -49,6 +57,9 @@ public class JackrabbitContainer implements InitializingBean, DisposableBean,
 
 	private Repository repository;
 
+	/** Namespaces to register: key is prefix, value namespace */
+	private Map<String, String> namespaces = new HashMap<String, String>();
+
 	public void afterPropertiesSet() throws Exception {
 		if (inMemory && homeDirectory.exists()) {
 			FileUtils.deleteDirectory(homeDirectory);
@@ -58,8 +69,8 @@ public class JackrabbitContainer implements InitializingBean, DisposableBean,
 		RepositoryConfig config;
 		InputStream in = configuration.getInputStream();
 		try {
-			config = RepositoryConfig.create(in, homeDirectory
-					.getCanonicalPath());
+			config = RepositoryConfig.create(in,
+					homeDirectory.getCanonicalPath());
 		} catch (Exception e) {
 			throw new RuntimeException("Cannot read configuration", e);
 		} finally {
@@ -104,43 +115,56 @@ public class JackrabbitContainer implements InitializingBean, DisposableBean,
 	}
 
 	public Session login() throws LoginException, RepositoryException {
-		return repository.login();
+		Session session = repository.login();
+		processNewSession(session);
+		return session;
 	}
 
 	public Session login(Credentials credentials, String workspaceName)
 			throws LoginException, NoSuchWorkspaceException,
 			RepositoryException {
-		return repository.login(credentials, workspaceName);
+		Session session = repository.login(credentials, workspaceName);
+		processNewSession(session);
+		return session;
 	}
 
 	public Session login(Credentials credentials) throws LoginException,
 			RepositoryException {
-		return repository.login(credentials);
+		Session session = repository.login(credentials);
+		processNewSession(session);
+		return session;
 	}
 
 	public Session login(String workspaceName) throws LoginException,
 			NoSuchWorkspaceException, RepositoryException {
-		return repository.login(workspaceName);
+		Session session = repository.login(workspaceName);
+		processNewSession(session);
+		return session;
+	}
+
+	protected synchronized void processNewSession(Session session) {
+		try {
+			NamespaceHelper namespaceHelper = new NamespaceHelper(session);
+			namespaceHelper.registerNamespaces(namespaces);
+		} catch (RepositoryException e) {
+			throw new ArgeoException("Cannot process new session", e);
+		}
 	}
 
 	public boolean isStandardDescriptor(String key) {
-		// TODO Auto-generated method stub
-		return false;
+		return repository.isStandardDescriptor(key);
 	}
 
 	public boolean isSingleValueDescriptor(String key) {
-		// TODO Auto-generated method stub
-		return false;
+		return repository.isSingleValueDescriptor(key);
 	}
 
 	public Value getDescriptorValue(String key) {
-		// TODO Auto-generated method stub
-		return null;
+		return repository.getDescriptorValue(key);
 	}
 
 	public Value[] getDescriptorValues(String key) {
-		// TODO Auto-generated method stub
-		return null;
+		return repository.getDescriptorValues(key);
 	}
 
 	// BEANS METHODS
@@ -156,4 +180,8 @@ public class JackrabbitContainer implements InitializingBean, DisposableBean,
 		this.inMemory = inMemory;
 	}
 
+	public void setNamespaces(Map<String, String> namespaces) {
+		this.namespaces = namespaces;
+	}
+
 }