Update license headers

[lgpl/argeo-commons.git] / server / runtime / org.argeo.server.jcr / src / main / java / org / argeo / jcr / DefaultRepositoryRegister.java

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 fc2fb529dc1fd854c1ba282af5d4a065421fcedb..029f7afce45fcc15bcfe33bd423bbdf7d3b8abf9 100644 (file)
--- 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,23 @@
+/*
+ * Copyright (C) 2007-2012 Mathieu Baudier
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 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;
@@ -14,7 +27,7 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 public class DefaultRepositoryRegister extends Observable implements
-               RepositoryRegister {
+               RepositoryRegister, ArgeoJcrConstants {
        private final static Log log = LogFactory
                        .getLog(DefaultRepositoryRegister.class);
 
@@ -25,15 +38,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(JCR_REPOSITORY_ALIAS))
+                       throw new RepositoryException("Parameter " + 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(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 +58,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)) {
-                       log.warn("Cannot register a repository without property "
-                                       + JCR_REPOSITORY_NAME);
+               String alias;
+               if (properties == null || !properties.containsKey(JCR_REPOSITORY_ALIAS)) {
+                       log.warn("Cannot register a repository if no "
+                                       + JCR_REPOSITORY_ALIAS + " property is speecified.");
                        return;
                }
-
-               String name = properties.get(JCR_REPOSITORY_NAME).toString();
+               alias = properties.get(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(JCR_REPOSITORY_ALIAS)) {
                        log.warn("Cannot unregister a repository without property "
-                                       + JCR_REPOSITORY_NAME);
+                                       + JCR_REPOSITORY_ALIAS);
                        return;
                }
 
-               String name = properties.get(JCR_REPOSITORY_NAME).toString();
+               String alias = properties.get(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);
        }
 }