X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc.repo%2Fsrc%2Forg%2Fargeo%2Fslc%2Frepo%2Fosgi%2FOsgiFactoryImpl.java;h=e372afdfea0a5d5b3409024e8c71500cb4b70e0f;hb=3b8a833c8df0b5cd0ee4992a9185aa25faaf015a;hp=92389339eba8817284724865f1e75d49d4a01443;hpb=8d1f46ed8783aa1985fac1acf6ef6ef6cdad1314;p=gpl%2Fargeo-slc.git 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 92389339e..e372afdfe 100644 --- 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> mirrors = new HashMap>(); private List mavenRepositories = new ArrayList(); - 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 {