X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=runtime%2Forg.argeo.slc.repo%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Frepo%2Fmaven%2Fproxy%2FMavenProxyServiceImpl.java;h=19df339a27b44b96c74c65853fcfb31be45e1e34;hb=912cf5554a61dc35fb61183da39673656b668467;hp=9e2cfd00a26c1db243c950f609b622e081d7c5fd;hpb=526a16fd6c547680d38fb553eed6b78b2a84d69f;p=gpl%2Fargeo-slc.git

diff --git a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/maven/proxy/MavenProxyServiceImpl.java b/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/maven/proxy/MavenProxyServiceImpl.java
index 9e2cfd00a..19df339a2 100644
--- a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/maven/proxy/MavenProxyServiceImpl.java
+++ b/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/maven/proxy/MavenProxyServiceImpl.java
@@ -1,97 +1,56 @@
 package org.argeo.slc.repo.maven.proxy;
 
-import java.io.InputStream;
-import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.jcr.Binary;
 import javax.jcr.Node;
 import javax.jcr.NodeIterator;
-import javax.jcr.Property;
-import javax.jcr.Repository;
 import javax.jcr.RepositoryException;
-import javax.jcr.Session;
-import javax.jcr.nodetype.NodeType;
 
-import org.apache.commons.io.IOUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.jcr.ArgeoNames;
 import org.argeo.jcr.JcrUtils;
+import org.argeo.jcr.proxy.AbstractUrlProxy;
 import org.argeo.slc.SlcException;
 import org.argeo.slc.jcr.SlcNames;
 import org.argeo.slc.repo.RepoConstants;
 import org.sonatype.aether.repository.RemoteRepository;
 
 /** Synchronizes the node repository with remote Maven repositories */
-public class MavenProxyServiceImpl implements MavenProxyService, ArgeoNames,
-		SlcNames {
+public class MavenProxyServiceImpl extends AbstractUrlProxy implements
+		MavenProxyService, ArgeoNames, SlcNames {
 	private final static Log log = LogFactory
 			.getLog(MavenProxyServiceImpl.class);
 
-	private Repository jcrRepository;
-	private Session jcrAdminSession;
 	private List<RemoteRepository> defaultRepositories = new ArrayList<RemoteRepository>();
 
-	public void init() {
-		try {
-			jcrAdminSession = jcrRepository.login();
-
-			JcrUtils.mkdirs(jcrAdminSession, RepoConstants.ARTIFACTS_BASE_PATH);
-			Node proxiedRepositories = JcrUtils.mkdirs(jcrAdminSession,
-					RepoConstants.PROXIED_REPOSITORIES);
-			for (RemoteRepository repository : defaultRepositories) {
-				if (!proxiedRepositories.hasNode(repository.getId())) {
-					Node proxiedRepository = proxiedRepositories
-							.addNode(repository.getId());
-					proxiedRepository.setProperty(SLC_URL, repository.getUrl());
-					proxiedRepository.setProperty(SLC_TYPE,
-							repository.getContentType());
-				}
+	@Override
+	protected void beforeInitSessionSave() throws RepositoryException {
+		JcrUtils.mkdirs(getJcrAdminSession(), RepoConstants.ARTIFACTS_BASE_PATH);
+		Node proxiedRepositories = JcrUtils.mkdirs(getJcrAdminSession(),
+				RepoConstants.PROXIED_REPOSITORIES);
+		for (RemoteRepository repository : defaultRepositories) {
+			if (!proxiedRepositories.hasNode(repository.getId())) {
+				Node proxiedRepository = proxiedRepositories.addNode(repository
+						.getId());
+				proxiedRepository.setProperty(SLC_URL, repository.getUrl());
+				proxiedRepository.setProperty(SLC_TYPE,
+						repository.getContentType());
 			}
-			jcrAdminSession.save();
-		} catch (RepositoryException e) {
-			JcrUtils.discardQuietly(jcrAdminSession);
-			throw new SlcException("Cannot initialize Maven proxy", e);
 		}
 	}
 
-	public void destroy() {
-		JcrUtils.logoutQuietly(jcrAdminSession);
-	}
-
 	/**
 	 * Retrieve and add this file to the repository
 	 */
-	public synchronized String proxyFile(String path) {
+	protected String retrieve(String path) {
 		try {
 			Node node = null;
-			proxiedRepositories: for (NodeIterator nit = jcrAdminSession
-					.getNode(RepoConstants.PROXIED_REPOSITORIES).getNodes(); nit
-					.hasNext();) {
-				Node proxiedRepository = nit.nextNode();
-				String repoUrl = proxiedRepository.getProperty(SLC_URL)
-						.getString();
-				String remoteUrl = repoUrl + path;
-				if (log.isTraceEnabled())
-					log.trace("remoteUrl=" + remoteUrl);
-				InputStream in = null;
-				try {
-					URL u = new URL(remoteUrl);
-					in = u.openStream();
-					node = importFile(getNodePath(path), in);
-					if (log.isDebugEnabled())
-						log.debug("Imported " + remoteUrl + " to " + node);
-					break proxiedRepositories;
-				} catch (Exception e) {
-					if (log.isDebugEnabled())
-						log.debug("Cannot read " + remoteUrl + ", skipping... "
-								+ e.getMessage());
-					// e.printStackTrace();
-				} finally {
-					IOUtils.closeQuietly(in);
-				}
+			baseUrls: for (String baseUrl : getBaseUrls()) {
+				node = proxyUrl(baseUrl, path);
+				if (node != null)
+					break baseUrls;
 			}
 
 			if (node != null)
@@ -105,31 +64,21 @@ public class MavenProxyServiceImpl implements MavenProxyService, ArgeoNames,
 		}
 	}
 
-	/** The JCR path where this file could be found */
-	public String getNodePath(String path) {
-		return RepoConstants.ARTIFACTS_BASE_PATH + path;
-	}
-
-	protected Node importFile(String nodePath, InputStream in) {
-		Binary binary = null;
-		try {
-			Node node = JcrUtils.mkdirs(jcrAdminSession, nodePath,
-					NodeType.NT_FILE, NodeType.NT_FOLDER, false);
-			Node content = node.addNode(Node.JCR_CONTENT, NodeType.NT_RESOURCE);
-			binary = jcrAdminSession.getValueFactory().createBinary(in);
-			content.setProperty(Property.JCR_DATA, binary);
-			jcrAdminSession.save();
-			return node;
-		} catch (RepositoryException e) {
-			JcrUtils.discardQuietly(jcrAdminSession);
-			throw new SlcException("Cannot initialize Maven proxy", e);
-		} finally {
-			JcrUtils.closeQuietly(binary);
+	protected synchronized List<String> getBaseUrls()
+			throws RepositoryException {
+		List<String> baseUrls = new ArrayList<String>();
+		for (NodeIterator nit = getJcrAdminSession().getNode(
+				RepoConstants.PROXIED_REPOSITORIES).getNodes(); nit.hasNext();) {
+			Node proxiedRepository = nit.nextNode();
+			String repoUrl = proxiedRepository.getProperty(SLC_URL).getString();
+			baseUrls.add(repoUrl);
 		}
+		return baseUrls;
 	}
 
-	public void setJcrRepository(Repository jcrRepository) {
-		this.jcrRepository = jcrRepository;
+	/** The JCR path where this file could be found */
+	public String getNodePath(String path) {
+		return RepoConstants.ARTIFACTS_BASE_PATH + path;
 	}
 
 	public void setDefaultRepositories(