X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=inline;f=org.argeo.slc.repo%2Fsrc%2Forg%2Fargeo%2Fslc%2Frepo%2Fosgi%2FArchiveWrapper.java;h=a6551a6e4d9fbcdbc436bfbfd31be348346ef1d8;hb=305ecfa036fac8562fbb3af875c6ecf5822b6dcb;hp=5469487a18239cfb080ef42cb2be92232ec7e564;hpb=42938785f222beefa7c869efcbef1f27a53b3319;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 5469487a1..a6551a6e4 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
@@ -25,7 +25,7 @@ import org.apache.commons.io.IOUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 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;
@@ -86,6 +86,18 @@ public class ArchiveWrapper implements Runnable, ModuleSet, Distribution {
 		return uri;
 	}
 
+	public String getVersion() {
+		return version;
+	}
+
+	public License getLicense() {
+		return license;
+	}
+
+	public String getUri() {
+		return uri;
+	}
+
 	public Iterator<? extends NameVersion> nameVersions() {
 		if (wrappers.size() > 0)
 			return wrappers.values().iterator();
@@ -95,7 +107,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;
@@ -127,7 +139,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
@@ -406,4 +418,16 @@ public class ArchiveWrapper implements Runnable, ModuleSet, Distribution {
 		this.sourcesProvider = sourcesProvider;
 	}
 
+	public Map<String, BndWrapper> getWrappers() {
+		return wrappers;
+	}
+
+	public Map<String, String> getIncludes() {
+		return includes;
+	}
+
+	public List<String> getExcludes() {
+		return excludes;
+	}
+
 }