X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=runtime%2Forg.argeo.slc.repo%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Frepo%2Fosgi%2FArchiveWrapper.java;h=768cbbde392ea03ddd80dd19f91de2d9e4538390;hb=399702cec859f48ec171c30d268c55eb632d472a;hp=97317548428d546806472211addd448a6fca4323;hpb=f03472814ee38e8d3b415da114db52adc2663fb3;p=gpl%2Fargeo-slc.git

diff --git a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/osgi/ArchiveWrapper.java b/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/osgi/ArchiveWrapper.java
index 973175484..768cbbde3 100644
--- a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/osgi/ArchiveWrapper.java
+++ b/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/osgi/ArchiveWrapper.java
@@ -121,6 +121,8 @@ public class ArchiveWrapper implements Runnable, ModuleSet, Distribution {
 						NameVersion nv = RepoUtils.readNameVersion(jis
 								.getManifest());
 						if (nv != null) {
+							if (nv.getName().endsWith(".source"))
+								continue entries;
 							CategorizedNameVersion cnv = new OsgiCategorizedNV(
 									groupId, nv.getName(), nv.getVersion(),
 									this);
@@ -194,9 +196,9 @@ public class ArchiveWrapper implements Runnable, ModuleSet, Distribution {
 									+ "from " + name + " in binary archive.");
 					}
 
-				} else if (baseName.endsWith(".source")) {
-					// TODO Eclipse source already available
 				}
+				// else if (baseName.endsWith(".source")) {
+				// }
 
 				// binaries
 				if (wrappers.containsKey(name)) {
@@ -234,9 +236,9 @@ public class ArchiveWrapper implements Runnable, ModuleSet, Distribution {
 					for (String include : includes.keySet()) {
 						if (pathMatcher.match(include, name)) {
 							String groupId = includes.get(include);
-							byte[] sourceJarBytes = IOUtils.toByteArray(zin);
+							byte[] origJarBytes = IOUtils.toByteArray(zin);
 							Artifact artifact = importZipEntry(javaSession,
-									zentry, sourceJarBytes, groupId);
+									zentry, origJarBytes, groupId);
 							if (artifact == null) {
 								log.warn("Skipped non identified " + zentry);
 								continue entries;