Make user/anonymous semantics more consistent with Authorization

[lgpl/argeo-commons.git] / org.argeo.cms / src / org / argeo / cms / internal / kernel / RepositoryServiceFactory.java

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/RepositoryServiceFactory.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/RepositoryServiceFactory.java
index 7e8b1c07e6c9562572b130d7d046cc102c19364f..b718043d99c6bfbf160a323d249cffeeacae7485 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/RepositoryServiceFactory.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/RepositoryServiceFactory.java
@@ -7,8 +7,8 @@ import java.util.Map;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.jackrabbit.core.RepositoryContext;
-import org.argeo.ArgeoException;
-import org.argeo.jcr.ArgeoJcrConstants;
+import org.argeo.cms.CmsException;
+import org.argeo.cms.internal.jcr.RepositoryBuilder;
 import org.argeo.node.NodeConstants;
 import org.argeo.util.LangUtils;
 import org.osgi.framework.BundleContext;
@@ -32,7 +32,7 @@ class RepositoryServiceFactory implements ManagedServiceFactory {
        @Override
        public void updated(String pid, Dictionary<String, ?> properties) throws ConfigurationException {
                if (repositories.containsKey(pid))
-                       throw new ArgeoException("Already a repository registered for " + pid);
+                       throw new CmsException("Already a repository registered for " + pid);
 
                if (properties == null)
                        return;
@@ -46,18 +46,18 @@ class RepositoryServiceFactory implements ManagedServiceFactory {
                        RepositoryBuilder repositoryBuilder = new RepositoryBuilder();
                        RepositoryContext repositoryContext = repositoryBuilder.createRepositoryContext(properties);
                        repositories.put(pid, repositoryContext);
-                       Dictionary<String, Object> props = LangUtils.init(Constants.SERVICE_PID, pid);
+                       Dictionary<String, Object> props = LangUtils.dico(Constants.SERVICE_PID, pid);
                        // props.put(ArgeoJcrConstants.JCR_REPOSITORY_URI,
                        // properties.get(RepoConf.labeledUri.name()));
                        Object cn = properties.get(NodeConstants.CN);
                        if (cn != null) {
                                props.put(NodeConstants.CN, cn);
-                               props.put(ArgeoJcrConstants.JCR_REPOSITORY_ALIAS, cn);
+//                             props.put(NodeConstants.JCR_REPOSITORY_ALIAS, cn);
                                pidToCn.put(pid, cn);
                        }
                        bc.registerService(RepositoryContext.class, repositoryContext, props);
                } catch (Exception e) {
-                       throw new ArgeoException("Cannot create Jackrabbit repository " + pid, e);
+                       throw new CmsException("Cannot create Jackrabbit repository " + pid, e);
                }
 
        }