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=e07ded4632e53f8b8869763bc1f1f4091361e76e;hp=bd4f4311ce94595120145ce67dfafb8ed58d1984;hpb=b9505fef5ba8186433e903e9de3c73c17bdf6562;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 bd4f4311c..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,13 +24,14 @@ 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.sonatype.aether.artifact.Artifact;
-import org.sonatype.aether.util.artifact.DefaultArtifact;
+import org.eclipse.aether.artifact.Artifact;
+import org.eclipse.aether.artifact.DefaultArtifact;
 
 /** Default implementation of {@link OsgiFactory}. */
 public class OsgiFactoryImpl implements OsgiFactory, SlcNames {
@@ -45,7 +47,8 @@ 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 mavenProxyBase = "/mavenProxy";
+	private String downloadBase = RepoConstants.DIST_DOWNLOAD_BASEPATH;
+	private String mavenProxyBase = downloadBase + "/maven";
 
 	public void init() {
 		if (workspace == null)
@@ -63,19 +66,14 @@ public class OsgiFactoryImpl implements OsgiFactory, SlcNames {
 		try {
 			// TODO rather user a JavaRepoManager that will also implicitely
 			// manage the indexing of newly created nodes.
-			javaSession = JcrUtils.loginOrCreateWorkspace(javaRepository,
-					workspace);
-			distSession = JcrUtils.loginOrCreateWorkspace(distRepository,
-					workspace);
+			javaSession = JcrUtils.loginOrCreateWorkspace(javaRepository, workspace);
+			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);
+			throw new SlcException("Cannot initialize OSGi Factory " + workspace, e);
 		} finally {
 			JcrUtils.logoutQuietly(javaSession);
 			JcrUtils.logoutQuietly(distSession);
@@ -100,19 +98,16 @@ public class OsgiFactoryImpl implements OsgiFactory, SlcNames {
 		}
 	}
 
-	public Node getMaven(Session distSession, String coords)
-			throws RepositoryException {
+	public Node getMaven(Session distSession, String coords) throws RepositoryException {
 		Artifact artifact = new DefaultArtifact(coords);
-		String path = MavenConventionsUtils.artifactPath(mavenProxyBase,
-				artifact);
+		String path = MavenConventionsUtils.artifactPath(mavenProxyBase, artifact);
 
 		// exists
 		if (distSession.itemExists(path))
 			return distSession.getNode(path);
 
 		for (String mavenRepo : mavenRepositories) {
-			String url = mavenRepo
-					+ MavenConventionsUtils.artifactPath("/", artifact);
+			String url = MavenConventionsUtils.artifactUrl(mavenRepo, artifact);
 			try {
 				Node node = loadUrlToPath(url, distSession, path);
 				if (node != null) {
@@ -123,8 +118,7 @@ public class OsgiFactoryImpl implements OsgiFactory, SlcNames {
 						// silent
 					}
 					try {
-						loadUrlToPath(url + ".sha1", distSession, path
-								+ ".sha1");
+						loadUrlToPath(url + ".sha1", distSession, path + ".sha1");
 					} catch (FileNotFoundException e) {
 						// silent
 					}
@@ -132,16 +126,14 @@ public class OsgiFactoryImpl implements OsgiFactory, SlcNames {
 				}
 			} catch (FileNotFoundException e) {
 				if (log.isDebugEnabled())
-					log.debug("Maven " + coords
-							+ " could not be downloaded from " + url);
+					log.debug("Maven " + coords + " could not be downloaded from " + url);
 			}
 		}
 		throw new SlcException("Could not download Maven " + coords);
 	}
 
-	public Node getDist(Session distSession, String uri)
-			throws RepositoryException {
-		String distPath = '/' + JcrUtils.urlAsPath(uri);
+	public Node getDist(Session distSession, String uri) throws RepositoryException {
+		String distPath = downloadBase + '/' + JcrUtils.urlAsPath(uri);
 
 		// already retrieved
 		if (distSession.itemExists(distPath))
@@ -174,8 +166,7 @@ public class OsgiFactoryImpl implements OsgiFactory, SlcNames {
 				return loadUrlToPath(url, distSession, distPath);
 			} catch (FileNotFoundException e) {
 				if (log.isDebugEnabled())
-					log.debug("Cannot download " + url
-							+ ", trying another mirror");
+					log.debug("Cannot download " + url + ", trying another mirror");
 			}
 		}
 
@@ -190,8 +181,7 @@ public class OsgiFactoryImpl implements OsgiFactory, SlcNames {
 
 		InputStream in = null;
 		URLConnection conn = null;
-		Node folderNode = JcrUtils.mkfolders(distSession,
-				JcrUtils.parentPath(path));
+		Node folderNode = JcrUtils.mkfolders(distSession, JcrUtils.parentPath(path));
 		try {
 			URL u = new URL(url);
 			conn = u.openConnection();
@@ -200,8 +190,7 @@ public class OsgiFactoryImpl implements OsgiFactory, SlcNames {
 			// byte[] arr = IOUtils.toByteArray(in);
 			// Node fileNode = JcrUtils.copyBytesAsFile(folderNode,
 			// JcrUtils.nodeNameFromPath(path), arr);
-			Node fileNode = JcrUtils.copyStreamAsFile(folderNode,
-					JcrUtils.nodeNameFromPath(path), in);
+			Node fileNode = JcrUtils.copyStreamAsFile(folderNode, JcrUtils.nodeNameFromPath(path), in);
 			fileNode.addMixin(SlcTypes.SLC_KNOWN_ORIGIN);
 			Node origin = fileNode.addNode(SLC_ORIGIN, SlcTypes.SLC_PROXIED);
 			JcrUtils.urlToAddressProperties(origin, url);