X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc.repo%2Fsrc%2Forg%2Fargeo%2Fslc%2Frepo%2Fosgi%2FArchiveWrapper.java;h=3cb1e9c8f3264034407568876ea79f5356a7cd33;hb=fbde11e8a342318876a4744c4676d3618bdf8583;hp=8becba370ceffdb996ee7db7beb8b97b788fec11;hpb=3ff90591a4e64b7459372afe4129f84fb959bbe0;p=gpl%2Fargeo-slc.git

diff --git a/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/ArchiveWrapper.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/ArchiveWrapper.java
index 8becba370..3cb1e9c8f 100644
--- a/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/ArchiveWrapper.java
+++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/ArchiveWrapper.java
@@ -22,10 +22,9 @@ import javax.jcr.Session;
 
 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.api.cms.CmsLog;
 import org.argeo.jcr.JcrUtils;
-import org.argeo.slc.CategorizedNameVersion;
+import org.argeo.slc.CategoryNameVersion;
 import org.argeo.slc.DefaultNameVersion;
 import org.argeo.slc.ModuleSet;
 import org.argeo.slc.NameVersion;
@@ -34,11 +33,11 @@ import org.argeo.slc.build.Distribution;
 import org.argeo.slc.build.License;
 import org.argeo.slc.repo.OsgiFactory;
 import org.argeo.slc.repo.RepoUtils;
+import org.argeo.slc.repo.internal.springutil.AntPathMatcher;
+import org.argeo.slc.repo.internal.springutil.PathMatcher;
 import org.argeo.slc.repo.maven.ArtifactIdComparator;
 import org.eclipse.aether.artifact.Artifact;
 import org.eclipse.aether.artifact.DefaultArtifact;
-import org.springframework.util.AntPathMatcher;
-import org.springframework.util.PathMatcher;
 
 import aQute.bnd.osgi.Jar;
 
@@ -48,7 +47,7 @@ import aQute.bnd.osgi.Jar;
  * need further modification.
  */
 public class ArchiveWrapper implements Runnable, ModuleSet, Distribution {
-	private final static Log log = LogFactory.getLog(ArchiveWrapper.class);
+	private final static CmsLog log = CmsLog.getLog(ArchiveWrapper.class);
 
 	private OsgiFactory osgiFactory;
 	private String version;
@@ -107,7 +106,7 @@ public class ArchiveWrapper implements Runnable, ModuleSet, Distribution {
 
 	@SuppressWarnings("resource")
 	protected Iterator<? extends NameVersion> osgiNameVersions() {
-		List<CategorizedNameVersion> nvs = new ArrayList<CategorizedNameVersion>();
+		List<CategoryNameVersion> nvs = new ArrayList<CategoryNameVersion>();
 
 		Session distSession = null;
 		ZipInputStream zin = null;
@@ -139,7 +138,7 @@ public class ArchiveWrapper implements Runnable, ModuleSet, Distribution {
 						if (nv != null) {
 							if (nv.getName().endsWith(".source"))
 								continue entries;
-							CategorizedNameVersion cnv = new OsgiCategorizedNV(groupId, nv.getName(), nv.getVersion(),
+							CategoryNameVersion cnv = new ArchiveWrapperCNV(groupId, nv.getName(), nv.getVersion(),
 									this);
 							nvs.add(cnv);
 							// no need to process further includes