X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=server%2Fruntime%2Forg.argeo.server.jcr%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fjcr%2FDefaultRepositoryRegister.java;fp=server%2Fruntime%2Forg.argeo.server.jcr%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fjcr%2FDefaultRepositoryRegister.java;h=a39ab8751af77e6bfb819b2dfccbfb4ea4f498f9;hb=a9e4e6bdc775333bc89ca1c9a5bcb0a199c5e7ca;hp=fc2fb529dc1fd854c1ba282af5d4a065421fcedb;hpb=057d80065bad948930426f87b9a2eb1d4cab3e14;p=lgpl%2Fargeo-commons.git

diff --git a/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/DefaultRepositoryRegister.java b/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/DefaultRepositoryRegister.java
index fc2fb529d..a39ab8751 100644
--- a/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/DefaultRepositoryRegister.java
+++ b/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/DefaultRepositoryRegister.java
@@ -1,10 +1,8 @@
 package org.argeo.jcr;
 
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.Map;
 import java.util.Observable;
-import java.util.SortedMap;
 import java.util.TreeMap;
 
 import javax.jcr.Repository;
@@ -25,15 +23,15 @@ public class DefaultRepositoryRegister extends Observable implements
 	@SuppressWarnings("rawtypes")
 	public synchronized Repository getRepository(Map parameters)
 			throws RepositoryException {
-		if (!parameters.containsKey(JCR_REPOSITORY_NAME))
-			throw new RepositoryException("Parameter " + JCR_REPOSITORY_NAME
+		if (!parameters.containsKey(ArgeoJcrConstants.JCR_REPOSITORY_ALIAS))
+			throw new RepositoryException("Parameter " + ArgeoJcrConstants.JCR_REPOSITORY_ALIAS
 					+ " has to be defined.");
-		String name = parameters.get(JCR_REPOSITORY_NAME).toString();
-		if (!repositories.containsKey(name))
-			throw new RepositoryException("No repository registered with name "
-					+ name);
+		String alias = parameters.get(ArgeoJcrConstants.JCR_REPOSITORY_ALIAS).toString();
+		if (!repositories.containsKey(alias))
+			throw new RepositoryException(
+					"No repository registered with alias " + alias);
 
-		return repositories.get(name);
+		return repositories.get(alias);
 	}
 
 	/** Access to the read-only map */
@@ -45,37 +43,37 @@ public class DefaultRepositoryRegister extends Observable implements
 	@SuppressWarnings("rawtypes")
 	public synchronized void register(Repository repository, Map properties) {
 		// TODO: also check bean name?
-		if (properties == null || !properties.containsKey(JCR_REPOSITORY_NAME)) {
+		if (properties == null || !properties.containsKey(ArgeoJcrConstants.JCR_REPOSITORY_ALIAS)) {
 			log.warn("Cannot register a repository without property "
-					+ JCR_REPOSITORY_NAME);
+					+ ArgeoJcrConstants.JCR_REPOSITORY_ALIAS);
 			return;
 		}
 
-		String name = properties.get(JCR_REPOSITORY_NAME).toString();
+		String alias = properties.get(ArgeoJcrConstants.JCR_REPOSITORY_ALIAS).toString();
 		Map<String, Repository> map = new TreeMap<String, Repository>(
 				repositories);
-		map.put(name, repository);
+		map.put(alias, repository);
 		repositories = Collections.unmodifiableMap(map);
 		setChanged();
-		notifyObservers(repository);
+		notifyObservers(alias);
 	}
 
 	/** Unregisters a service, typically called when OSGi services are unbound. */
 	@SuppressWarnings("rawtypes")
 	public synchronized void unregister(Repository repository, Map properties) {
 		// TODO: also check bean name?
-		if (properties == null || !properties.containsKey(JCR_REPOSITORY_NAME)) {
+		if (properties == null || !properties.containsKey(ArgeoJcrConstants.JCR_REPOSITORY_ALIAS)) {
 			log.warn("Cannot unregister a repository without property "
-					+ JCR_REPOSITORY_NAME);
+					+ ArgeoJcrConstants.JCR_REPOSITORY_ALIAS);
 			return;
 		}
 
-		String name = properties.get(JCR_REPOSITORY_NAME).toString();
+		String alias = properties.get(ArgeoJcrConstants.JCR_REPOSITORY_ALIAS).toString();
 		Map<String, Repository> map = new TreeMap<String, Repository>(
 				repositories);
-		map.put(name, repository);
+		map.put(alias, repository);
 		repositories = Collections.unmodifiableMap(map);
 		setChanged();
-		notifyObservers(repository);
+		notifyObservers(alias);
 	}
 }