X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=org.argeo.slc.repo%2Fsrc%2Forg%2Fargeo%2Fslc%2Frepo%2FRepoUtils.java;h=e09f80cbaa53bee27bddb47a40e6359e1d642ce4;hb=2a00e308e58352d94abdd740415ca5ed34e7bdfb;hp=3ac2f0b0b2e03ac7586e8ebafa66de597b55a0e3;hpb=9e581505a7009f32cdc1eceb39dc89e77ce2a22f;p=gpl%2Fargeo-slc.git 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 3ac2f0b0b..e09f80cba 100644 --- 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,11 +51,12 @@ 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.JcrMonitor; import org.argeo.jcr.JcrUtils; import org.argeo.node.ArgeoNames; import org.argeo.node.ArgeoTypes; 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; @@ -63,7 +64,6 @@ import org.argeo.slc.aether.ArtifactIdComparator; import org.argeo.slc.jcr.SlcNames; import org.argeo.slc.jcr.SlcTypes; import org.argeo.slc.repo.maven.MavenConventionsUtils; -import org.argeo.util.security.Keyring; import org.eclipse.aether.artifact.Artifact; import org.eclipse.aether.artifact.DefaultArtifact; import org.osgi.framework.Constants; @@ -552,7 +552,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)