Merge branch 'master' of https://github.com/argeo/argeo-slc.git

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

diff --git a/org.argeo.slc.repo/src/org/argeo/slc/repo/RepoUtils.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/RepoUtils.java
index f03319ae358593ccfef11ce83a6fb0dc702a9552..7bc7854cf80f92e1bfd1ee5f24c64bc611cfffa5 100644 (file)
--- a/org.argeo.slc.repo/src/org/argeo/slc/repo/RepoUtils.java
+++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/RepoUtils.java
@@ -51,22 +51,22 @@ import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.argeo.ArgeoMonitor;
-import org.argeo.jcr.ArgeoJcrUtils;
-import org.argeo.jcr.ArgeoNames;
-import org.argeo.jcr.ArgeoTypes;
+import org.argeo.cms.ArgeoNames;
+import org.argeo.cms.ArgeoTypes;
+import org.argeo.jcr.JcrMonitor;
 import org.argeo.jcr.JcrUtils;
+import org.argeo.node.NodeUtils;
+import org.argeo.node.security.Keyring;
 import org.argeo.slc.DefaultNameVersion;
 import org.argeo.slc.NameVersion;
 import org.argeo.slc.SlcException;
-import org.argeo.slc.aether.ArtifactIdComparator;
-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.maven.ArtifactIdComparator;
 import org.argeo.slc.repo.maven.MavenConventionsUtils;
-import org.argeo.util.security.Keyring;
-import org.osgi.framework.Constants;
 import org.eclipse.aether.artifact.Artifact;
 import org.eclipse.aether.artifact.DefaultArtifact;
+import org.osgi.framework.Constants;
 
 /** Utilities around repo */
 public class RepoUtils implements ArgeoNames, SlcNames {
@@ -269,7 +269,6 @@ public class RepoUtils implements ArgeoNames, SlcNames {
                        // probably not a jar, skipping
                        if (log.isDebugEnabled()) {
                                log.debug("Skipping because of " + e);
-                               e.printStackTrace();
                        }
                } finally {
                        IOUtils.closeQuietly(jarInputStream);
@@ -379,10 +378,10 @@ public class RepoUtils implements ArgeoNames, SlcNames {
                        if (repoNode.isNodeType(ArgeoTypes.ARGEO_REMOTE_REPOSITORY)) {
                                String uri = repoNode.getProperty(ARGEO_URI).getString();
                                if (uri.startsWith("http")) {// http, https
-                                       repository = ArgeoJcrUtils.getRepositoryByUri(
+                                       repository = NodeUtils.getRepositoryByUri(
                                                        repositoryFactory, uri);
                                } else if (uri.startsWith("vm:")) {// alias
-                                       repository = ArgeoJcrUtils.getRepositoryByUri(
+                                       repository = NodeUtils.getRepositoryByUri(
                                                        repositoryFactory, uri);
                                } else {
                                        throw new SlcException("Unsupported repository uri " + uri);
@@ -445,8 +444,7 @@ public class RepoUtils implements ArgeoNames, SlcNames {
                        // Anonymous URI only workspace
                        if (repoNode == null)
                                // Anonymous
-                               currRepo = ArgeoJcrUtils.getRepositoryByUri(repositoryFactory,
-                                               uri);
+                               currRepo = NodeUtils.getRepositoryByUri(repositoryFactory, uri);
                        else {
                                currRepo = RepoUtils.getRepository(repositoryFactory, keyring,
                                                repoNode);
@@ -553,7 +551,7 @@ public class RepoUtils implements ArgeoNames, SlcNames {
                copy(fromNode, toNode, null);
        }
 
-       public static void copy(Node fromNode, Node toNode, ArgeoMonitor monitor) {
+       public static void copy(Node fromNode, Node toNode, JcrMonitor monitor) {
                try {
                        String fromPath = fromNode.getPath();
                        if (monitor != null)