X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=server%2Fruntime%2Forg.argeo.server.jcr%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fjcr%2FThreadBoundJcrSessionFactory.java;fp=server%2Fruntime%2Forg.argeo.server.jcr%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fjcr%2FThreadBoundJcrSessionFactory.java;h=8adbae78486d2e158382f21c370c9c7d11c47879;hb=01d5597f584ac37c81b5a9f6b3cdcf77a487c904;hp=003bcc69b552fd956e5db28b8efd27e72f81237b;hpb=70538e1286a2b47ecd58cb1cfb7ede8dddff5859;p=lgpl%2Fargeo-commons.git

diff --git a/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/ThreadBoundJcrSessionFactory.java b/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/ThreadBoundJcrSessionFactory.java
index 003bcc69b..8adbae784 100644
--- a/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/ThreadBoundJcrSessionFactory.java
+++ b/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/ThreadBoundJcrSessionFactory.java
@@ -43,6 +43,8 @@ public abstract class ThreadBoundJcrSessionFactory {
 			.getLog(ThreadBoundJcrSessionFactory.class);
 
 	private Repository repository;
+	/** can be injected as list, only used if repository is null */
+	private List<Repository> repositories;
 
 	private ThreadLocal<Session> session = new ThreadLocal<Session>();
 	private final Session proxiedSession;
@@ -88,7 +90,7 @@ public abstract class ThreadBoundJcrSessionFactory {
 		// Security)
 		if (!forceDefaultCredentials)
 			try {
-				newSession = repository.login(workspace);
+				newSession = repository().login(workspace);
 			} catch (LoginException e1) {
 				log.warn("Cannot login without credentials: " + e1.getMessage());
 				// invalid credentials, go to the next step
@@ -102,7 +104,7 @@ public abstract class ThreadBoundJcrSessionFactory {
 			try {
 				SimpleCredentials sc = new SimpleCredentials(defaultUsername,
 						defaultPassword.toCharArray());
-				newSession = repository.login(sc, workspace);
+				newSession = repository().login(sc, workspace);
 			} catch (RepositoryException e) {
 				throw new ArgeoException("Cannot log in to repository", e);
 			}
@@ -202,10 +204,36 @@ public abstract class ThreadBoundJcrSessionFactory {
 		return session;
 	}
 
+	protected Repository repository() {
+		if (repository != null)
+			return repository;
+		if (repositories != null) {
+			// hardened for OSGi dynamic services
+			Iterator<Repository> it = repositories.iterator();
+			if (it.hasNext())
+				return it.next();
+		}
+		throw new ArgeoException("No repository injected");
+	}
+
+	// /** Useful for declarative registration of OSGi services (blueprint) */
+	// public void register(Repository repository, Map<?, ?> params) {
+	// this.repository = repository;
+	// }
+	//
+	// /** Useful for declarative registration of OSGi services (blueprint) */
+	// public void unregister(Repository repository, Map<?, ?> params) {
+	// this.repository = null;
+	// }
+
 	public void setRepository(Repository repository) {
 		this.repository = repository;
 	}
 
+	public void setRepositories(List<Repository> repositories) {
+		this.repositories = repositories;
+	}
+
 	public void setDefaultUsername(String defaultUsername) {
 		this.defaultUsername = defaultUsername;
 	}