Improve logging in SLC Repo layer.

[gpl/argeo-slc.git] / org.argeo.slc.repo / src / org / argeo / slc / repo / osgi / OsgiFactoryImpl.java

diff --git a/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/OsgiFactoryImpl.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/OsgiFactoryImpl.java
index 92389339eba8817284724865f1e75d49d4a01443..e372afdfea0a5d5b3409024e8c71500cb4b70e0f 100644 (file)
--- a/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/OsgiFactoryImpl.java
+++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/OsgiFactoryImpl.java
@@ -16,6 +16,7 @@ import javax.jcr.Node;
 import javax.jcr.Repository;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
+import javax.jcr.security.Privilege;
 
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.logging.Log;
@@ -23,10 +24,11 @@ import org.apache.commons.logging.LogFactory;
 import org.argeo.jcr.JcrUtils;
 import org.argeo.slc.SlcConstants;
 import org.argeo.slc.SlcException;
-import org.argeo.slc.jcr.SlcNames;
-import org.argeo.slc.jcr.SlcTypes;
+import org.argeo.slc.SlcNames;
+import org.argeo.slc.SlcTypes;
 import org.argeo.slc.repo.NodeIndexer;
 import org.argeo.slc.repo.OsgiFactory;
+import org.argeo.slc.repo.RepoConstants;
 import org.argeo.slc.repo.maven.MavenConventionsUtils;
 import org.eclipse.aether.artifact.Artifact;
 import org.eclipse.aether.artifact.DefaultArtifact;
@@ -45,7 +47,7 @@ public class OsgiFactoryImpl implements OsgiFactory, SlcNames {
        private Map<String, List<String>> mirrors = new HashMap<String, List<String>>();
 
        private List<String> mavenRepositories = new ArrayList<String>();
-       private String downloadBase = "/download";
+       private String downloadBase = RepoConstants.DIST_DOWNLOAD_BASEPATH;
        private String mavenProxyBase = downloadBase + "/maven";
 
        public void init() {
@@ -68,8 +70,8 @@ public class OsgiFactoryImpl implements OsgiFactory, SlcNames {
                        distSession = JcrUtils.loginOrCreateWorkspace(distRepository, workspace);
 
                        // Privileges
-                       JcrUtils.addPrivilege(javaSession, "/", SlcConstants.ROLE_SLC, "jcr:all");
-                       JcrUtils.addPrivilege(distSession, "/", SlcConstants.ROLE_SLC, "jcr:all");
+                       JcrUtils.addPrivilege(javaSession, "/", SlcConstants.ROLE_SLC, Privilege.JCR_ALL);
+                       JcrUtils.addPrivilege(distSession, "/", SlcConstants.ROLE_SLC, Privilege.JCR_ALL);
                } catch (RepositoryException e) {
                        throw new SlcException("Cannot initialize OSGi Factory " + workspace, e);
                } finally {