Fix MANIFEST generation

[gpl/argeo-slc.git] / org.argeo.slc.repo / src / org / argeo / slc / repo / maven / MavenProxyServiceImpl.java

diff --git a/org.argeo.slc.repo/src/org/argeo/slc/repo/maven/MavenProxyServiceImpl.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/maven/MavenProxyServiceImpl.java
index 9a88534a04e7c6307318c93fd81ae3183c1f6195..caee12b7f95fccd5f1a43385d425a98bc780739f 100644 (file)
--- a/org.argeo.slc.repo/src/org/argeo/slc/repo/maven/MavenProxyServiceImpl.java
+++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/maven/MavenProxyServiceImpl.java
@@ -11,8 +11,7 @@ import javax.jcr.nodetype.NodeType;
 import javax.jcr.security.AccessControlException;
 import javax.jcr.security.Privilege;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.argeo.api.cms.CmsLog;
 import org.argeo.cms.ArgeoNames;
 import org.argeo.jcr.JcrUtils;
 import org.argeo.jcr.proxy.AbstractUrlProxy;
@@ -25,40 +24,31 @@ import org.argeo.slc.repo.RepoConstants;
 import org.eclipse.aether.repository.RemoteRepository;
 
 /** Synchronises the node repository with remote Maven repositories */
-public class MavenProxyServiceImpl extends AbstractUrlProxy implements
-               MavenProxyService, ArgeoNames, SlcNames {
-       private final static Log log = LogFactory
-                       .getLog(MavenProxyServiceImpl.class);
+public class MavenProxyServiceImpl extends AbstractUrlProxy implements MavenProxyService, ArgeoNames, SlcNames {
+       private final static CmsLog log = CmsLog.getLog(MavenProxyServiceImpl.class);
 
        private List<RemoteRepository> defaultRepositories = new ArrayList<RemoteRepository>();
 
        /** Initialises the artifacts area. */
        @Override
-       protected void beforeInitSessionSave(Session session)
-                       throws RepositoryException {
+       protected void beforeInitSessionSave(Session session) throws RepositoryException {
                JcrUtils.addPrivilege(session, "/", SlcConstants.USER_ANONYMOUS, Privilege.JCR_READ);
                try {
-                       JcrUtils.addPrivilege(session, "/", SlcConstants.ROLE_SLC,
-                                       Privilege.JCR_ALL);
+                       JcrUtils.addPrivilege(session, "/", SlcConstants.ROLE_SLC, Privilege.JCR_ALL);
                } catch (AccessControlException e) {
                        if (log.isTraceEnabled())
-                               log.trace("Cannot give jcr:all privileges to "
-                                               + SlcConstants.ROLE_SLC);
+                               log.trace("Cannot give jcr:all privileges to " + SlcConstants.ROLE_SLC);
                }
 
                JcrUtils.mkdirsSafe(session, RepoConstants.DEFAULT_ARTIFACTS_BASE_PATH);
-               Node proxiedRepositories = JcrUtils.mkdirsSafe(session,
-                               RepoConstants.PROXIED_REPOSITORIES);
+               Node proxiedRepositories = JcrUtils.mkdirsSafe(session, RepoConstants.PROXIED_REPOSITORIES);
                for (RemoteRepository repository : defaultRepositories) {
                        if (!proxiedRepositories.hasNode(repository.getId())) {
-                               Node proxiedRepository = proxiedRepositories.addNode(repository
-                                               .getId());
+                               Node proxiedRepository = proxiedRepositories.addNode(repository.getId());
                                proxiedRepository.addMixin(NodeType.MIX_REFERENCEABLE);
-                               JcrUtils.urlToAddressProperties(proxiedRepository,
-                                               repository.getUrl());
+                               JcrUtils.urlToAddressProperties(proxiedRepository, repository.getUrl());
                                // proxiedRepository.setProperty(SLC_URL, repository.getUrl());
-                               proxiedRepository.setProperty(SLC_TYPE,
-                                               repository.getContentType());
+                               proxiedRepository.setProperty(SLC_TYPE, repository.getContentType());
                        }
                }
        }
@@ -73,13 +63,11 @@ public class MavenProxyServiceImpl extends AbstractUrlProxy implements
                                throw new SlcException("Session has pending changed");
                        Node node = null;
                        for (Node proxiedRepository : getBaseUrls(session)) {
-                               String baseUrl = JcrUtils
-                                               .urlFromAddressProperties(proxiedRepository);
+                               String baseUrl = JcrUtils.urlFromAddressProperties(proxiedRepository);
                                node = proxyUrl(session, baseUrl, path);
                                if (node != null) {
                                        node.addMixin(SlcTypes.SLC_KNOWN_ORIGIN);
-                                       Node origin = node
-                                                       .addNode(SLC_ORIGIN, SlcTypes.SLC_PROXIED);
+                                       Node origin = node.addNode(SLC_ORIGIN, SlcTypes.SLC_PROXIED);
                                        origin.setProperty(SLC_PROXY, proxiedRepository);
                                        JcrUtils.urlToAddressProperties(origin, baseUrl + path);
                                        if (log.isDebugEnabled())
@@ -95,19 +83,16 @@ public class MavenProxyServiceImpl extends AbstractUrlProxy implements
                }
        }
 
-       protected synchronized List<Node> getBaseUrls(Session session)
-                       throws RepositoryException {
+       protected synchronized List<Node> getBaseUrls(Session session) throws RepositoryException {
                List<Node> baseUrls = new ArrayList<Node>();
-               for (NodeIterator nit = session.getNode(
-                               RepoConstants.PROXIED_REPOSITORIES).getNodes(); nit.hasNext();) {
+               for (NodeIterator nit = session.getNode(RepoConstants.PROXIED_REPOSITORIES).getNodes(); nit.hasNext();) {
                        Node proxiedRepository = nit.nextNode();
                        baseUrls.add(proxiedRepository);
                }
                return baseUrls;
        }
 
-       public void setDefaultRepositories(
-                       List<RemoteRepository> defaultRepositories) {
+       public void setDefaultRepositories(List<RemoteRepository> defaultRepositories) {
                this.defaultRepositories = defaultRepositories;
        }
 }