X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc.repo%2Fsrc%2Forg%2Fargeo%2Fslc%2Frepo%2Fosgi%2FArgeoOsgiDistributionImpl.java;h=dbfd576b4d999deb130ec520972874f582803161;hb=1b8b4c8443356a7a4adc632f391daa8c0ded8053;hp=b47da8b887fcdae29253c1ea8f592f39cfc03adc;hpb=b9505fef5ba8186433e903e9de3c73c17bdf6562;p=gpl%2Fargeo-slc.git

diff --git a/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/ArgeoOsgiDistributionImpl.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/ArgeoOsgiDistributionImpl.java
index b47da8b88..dbfd576b4 100644
--- a/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/ArgeoOsgiDistributionImpl.java
+++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/ArgeoOsgiDistributionImpl.java
@@ -1,25 +1,42 @@
 package org.argeo.slc.repo.osgi;
 
+import static org.argeo.slc.ManifestConstants.SLC_ORIGIN_M2;
+import static org.argeo.slc.ManifestConstants.SLC_ORIGIN_URI;
+
+import java.io.IOException;
+import java.io.Writer;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
+import java.util.Set;
 import java.util.SortedSet;
+import java.util.TreeMap;
 import java.util.TreeSet;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.argeo.api.cms.CmsLog;
+import org.argeo.slc.CategoryNameVersion;
+import org.argeo.slc.ManifestConstants;
 import org.argeo.slc.ModuleSet;
 import org.argeo.slc.NameVersion;
 import org.argeo.slc.build.Distribution;
 import org.argeo.slc.execution.ExecutionFlow;
 import org.argeo.slc.repo.ArgeoOsgiDistribution;
 import org.argeo.slc.repo.ArtifactDistribution;
+import org.argeo.slc.repo.FreeLicense;
+import org.eclipse.aether.artifact.Artifact;
+import org.eclipse.aether.artifact.DefaultArtifact;
+import org.osgi.framework.Constants;
 
-/** A consistent and versioned OSGi distribution, which can be built and tested. */
-public class ArgeoOsgiDistributionImpl extends ArtifactDistribution implements
-		ArgeoOsgiDistribution {
-	private final static Log log = LogFactory
-			.getLog(ArgeoOsgiDistributionImpl.class);
+/**
+ * A consistent and versioned OSGi distribution, which can be built and tested.
+ */
+public class ArgeoOsgiDistributionImpl extends ArtifactDistribution implements ArgeoOsgiDistribution {
+	private final static CmsLog log = CmsLog.getLog(ArgeoOsgiDistributionImpl.class);
 
 	private List<Object> modules = new ArrayList<Object>();
 
@@ -28,44 +45,184 @@ public class ArgeoOsgiDistributionImpl extends ArtifactDistribution implements
 	}
 
 	public void init() {
-		if (log.isDebugEnabled()) {
-			SortedSet<String> sort = new TreeSet<String>();
-			Iterator<? extends NameVersion> nvIt = nameVersions();
-			while (nvIt.hasNext()) {
-				NameVersion nv = nvIt.next();
-				sort.add(nv.getName() + ":" + nv.getVersion());
-			}
+		if (log.isDebugEnabled())
+			log.debug(describe());
+		migrateTov2(Paths.get(System.getProperty("user.home"), "dev/git/unstable/argeo-tp/migration"));
+	}
 
-			StringBuffer buf = new StringBuffer(
-					"## OSGi FACTORY MANAGED MODULES : \n");
-			for (String str : sort) {
-				buf.append(str).append('\n');
-			}
+	public void destroy() {
+
+	}
 
-			log.debug(buf);
+	public String describe() {
+		SortedSet<String> sort = new TreeSet<String>();
+		Iterator<? extends NameVersion> nvIt = nameVersions();
+		while (nvIt.hasNext()) {
+			NameVersion nv = nvIt.next();
+			String str = nv.toString();
+			if (nv instanceof MavenWrapper)
+				str = str + "\t(Maven)";
+			else if (nv instanceof UriWrapper)
+				str = str + "\t(URI)";
+			else if (nv instanceof ArchiveWrapperCNV)
+				str = str + "\t(OSGi from archive)";
+			else if (nv instanceof BndWrapper)
+				str = str + "\t(Plain BND from archive)";
+			else
+				str = str + "\t(UNKNOWN??)";
+			sort.add(str);
 		}
+
+		StringBuffer buf = new StringBuffer("## DISTRIBUTION " + toString() + " ##\n");
+		for (String str : sort) {
+			buf.append(str).append('\n');
+		}
+		return buf.toString();
 	}
 
-	// private static void print(ModuleSet moduleSet, Integer depth) {
-	// StringBuilder prefix = new StringBuilder();
-	// for (int i = 0; i < depth; i++) {
-	// prefix.append(' ');
-	// }
-	// String p = prefix.toString();
-	// prefix.setLength(0);
-	// log.debug(p + "## " + moduleSet.toString());
-	// Iterator<? extends NameVersion> nvIt = moduleSet.nameVersions();
-	// while (nvIt.hasNext()) {
-	// NameVersion nv = nvIt.next();
-	// if (nv instanceof ModuleSet)
-	// print((ModuleSet) nv, depth + 1);
-	// else
-	// log.debug(p + nv);
-	//
-	// }
-	// }
+	public void migrateTov2(Path baseDir) {
+		Set<ArchiveWrapper> archiveWrappers = new HashSet<>();
+		Iterator<? extends NameVersion> nvIt = nameVersions();
+		while (nvIt.hasNext()) {
+			NameVersion nv = nvIt.next();
+			try {
+				if (nv instanceof CategoryNameVersion) {
+					CategoryNameVersion cnv = (CategoryNameVersion) nv;
+					// TODO add branch?
+					Path categoryBase = baseDir.resolve(cnv.getCategory());
+					Files.createDirectories(categoryBase);
+					if (cnv instanceof BndWrapper) {
+						BndWrapper bw = (BndWrapper) cnv;
+						Path bndPath = categoryBase.resolve(cnv.getName() + ".bnd");
+						Map<String, String> props = new TreeMap<>();
+						for (Map.Entry<Object, Object> entry : ((BndWrapper) cnv).getBndProperties().entrySet()) {
+							props.put(entry.getKey().toString(), entry.getValue().toString());
+						}
+						props.put(Constants.BUNDLE_SYMBOLICNAME, cnv.getName());
+						props.put(Constants.BUNDLE_VERSION, cnv.getVersion());
+						if (bw.getLicense() != null)
+							props.put(Constants.BUNDLE_LICENSE, bw.getLicense().toString());
+						else
+							log.warn("No license for " + cnv);
+						if (bw.getDoNotModify()) {
+							props.put(ManifestConstants.SLC_ORIGIN_MANIFEST_NOT_MODIFIED.toString(), "true");
+						}
+						// props.put("SLC-Category", cnv.getCategory());
 
-	public void destroy() {
+						if (cnv instanceof MavenWrapper) {
+							MavenWrapper mw = (MavenWrapper) cnv;
+							String sourceCoords = mw.getSourceCoords();
+							props.put(SLC_ORIGIN_M2.toString(), sourceCoords);
+							Artifact mavenCnv = new DefaultArtifact(sourceCoords);
+							if (mavenCnv.getArtifactId().equals(cnv.getName()))
+								props.remove(Constants.BUNDLE_SYMBOLICNAME);
+							if (mavenCnv.getVersion().equals(cnv.getVersion()))
+								props.remove(Constants.BUNDLE_VERSION);
+						} else if (cnv instanceof UriWrapper) {
+							UriWrapper mw = (UriWrapper) cnv;
+							props.put(SLC_ORIGIN_URI.toString(), mw.getEffectiveUri());
+							if (mw.getUri() == null && mw.getBaseUri() != null) {
+								log.warn("Base URI for " + cnv);
+								props.put("SLC-Origin-BaseURI", mw.getBaseUri());
+								props.put("SLC-Origin-VersionSeparator", mw.getVersionSeparator());
+							}
+						} else {
+							log.warn("Unidentified BND wrapper " + cnv);
+						}
+
+						// write BND file
+						try (Writer writer = Files.newBufferedWriter(bndPath)) {
+							// writer.write("# " + cnv + "\n");
+							props: for (String key : props.keySet()) {
+								String value = props.get(key);
+								if (Constants.EXPORT_PACKAGE.equals(key) && "*".equals(value.trim()))
+									continue props;
+
+								writer.write(key + ": " + value + '\n');
+							}
+							if (log.isTraceEnabled())
+								log.trace("Wrote " + bndPath);
+						}
+					} else if (cnv instanceof ArchiveWrapperCNV) {
+						ArchiveWrapperCNV onv = (ArchiveWrapperCNV) cnv;
+						ArchiveWrapper aw = onv.getBuild();
+						archiveWrappers.add(aw);
+						// TODO specify and implement archive wrapper support
+					} else {
+						log.warn("Unsupported wrapper " + cnv.getClass() + " for " + cnv);
+					}
+
+				} else {
+					log.error("Category required for " + nv + ", skipping...");
+				}
+			} catch (IOException e) {
+				log.error("Could not process " + nv, e);
+			}
+		}
+		if (log.isDebugEnabled()) {
+			for (ArchiveWrapper aw : archiveWrappers) {
+				log.debug("Archive wrapper " + aw.getUri() + ":");
+				log.debug(" includes: " + aw.getIncludes());
+				log.debug(" excludes: " + aw.getExcludes());
+				log.debug(" beans   : " + aw.getWrappers());
+
+				String uri = aw.getUri();
+				String duName = null;
+				String category = null;
+				String oldCategory = null;
+				if (uri.startsWith("http://www.eclipse.org/downloads/rt/rap/3.10/e4/rap-e4")) {
+					duName = "eclipse-rap";
+					category = "org.argeo.tp.eclipse.rap";
+					oldCategory = "org.argeo.tp.rap.e4";
+				} else if (uri.startsWith("http://www.eclipse.org/downloads/equinox/")) {
+					duName = "eclipse-equinox";
+					category = "org.argeo.tp.eclipse.equinox";
+					oldCategory = "org.argeo.tp.equinox";
+				} else if (uri.startsWith("http://www.eclipse.org/downloads/eclipse/downloads/drops4")) {
+					duName = "eclipse-rcp";
+					category = "org.argeo.tp.eclipse.rcp";
+					oldCategory = "org.argeo.tp.rcp.e4";
+				}
+
+				if (duName != null) {
+					try {
+						Path duDir = baseDir.resolve(category).resolve(duName);
+						Files.createDirectories(duDir);
+						Path bndPath = duDir.resolve("common.bnd");
+						Path includesPath = duDir.resolve("includes.properties");
+
+						Map<String, String> props = new TreeMap<>();
+						props.put(ManifestConstants.SLC_ORIGIN_URI.toString(), aw.getUri());
+						props.put(ManifestConstants.SLC_ORIGIN_MANIFEST_NOT_MODIFIED.toString(), "true");
+						props.put(Constants.BUNDLE_LICENSE, FreeLicense.EPL.toString());
+						// write BND file
+						try (Writer bndWriter = Files.newBufferedWriter(bndPath);
+								Writer includesWriter = Files.newBufferedWriter(includesPath);) {
+							// writer.write("# " + cnv + "\n");
+							props: for (String key : props.keySet()) {
+								String value = props.get(key);
+								if (Constants.EXPORT_PACKAGE.equals(key) && "*".equals(value.trim()))
+									continue props;
+
+								bndWriter.write(key + ": " + value + '\n');
+							}
+
+							for (String key : aw.getIncludes().keySet()) {
+								String value = aw.getIncludes().get(key);
+								if (value.equals(oldCategory))
+									value = category;
+								includesWriter.write(key + "=" + value + '\n');
+							}
+							if (log.isTraceEnabled())
+								log.trace("Wrote " + bndPath);
+						}
+					} catch (IOException e) {
+						log.error("Could not process " + aw, e);
+					}
+
+				}
+			}
+		}
 
 	}
 
@@ -74,23 +231,12 @@ public class ArgeoOsgiDistributionImpl extends ArtifactDistribution implements
 		for (Object module : modules) {
 			// extract runnable from execution flow
 			if (module instanceof ExecutionFlow) {
-				for (Iterator<Runnable> it = ((ExecutionFlow) module)
-						.runnables(); it.hasNext();) {
+				for (Iterator<Runnable> it = ((ExecutionFlow) module).runnables(); it.hasNext();) {
 					processModule(nameVersions, it.next());
 				}
-			}
-			// module = ((ExecutionFlow) module).getRunnable();
-			else {
+			} else {
 				processModule(nameVersions, module);
 			}
-			// if (module instanceof ModuleSet)
-			// addNameVersions(nameVersions, (ModuleSet) module);
-			// else if (module instanceof NameVersion) {
-			// NameVersion nv = (NameVersion) module;
-			// if (!nameVersions.contains(nv))
-			// nameVersions.add(nv);
-			// } else
-			// log.warn("Ignored " + module);
 		}
 		return nameVersions.iterator();
 	}
@@ -100,37 +246,32 @@ public class ArgeoOsgiDistributionImpl extends ArtifactDistribution implements
 			addNameVersions(nameVersions, (ModuleSet) module);
 		else if (module instanceof NameVersion) {
 			NameVersion nv = (NameVersion) module;
-			if (!nameVersions.contains(nv))
-				nameVersions.add(nv);
+			addNameVersion(nameVersions, nv);
 		} else
 			log.warn("Ignored " + module);
 	}
 
-	private void addNameVersions(List<NameVersion> nameVersions,
-			ModuleSet moduleSet) {
+	private void addNameVersions(List<NameVersion> nameVersions, ModuleSet moduleSet) {
 		Iterator<? extends NameVersion> it = moduleSet.nameVersions();
 		while (it.hasNext()) {
 			NameVersion nv = it.next();
-			if (!nameVersions.contains(nv))
-				nameVersions.add(nv);
+			addNameVersion(nameVersions, nv);
+		}
+	}
+
+	protected void addNameVersion(List<NameVersion> nameVersions, NameVersion nv) {
+		if (!nameVersions.contains(nv)) {
+			nameVersions.add(nv);
 		}
 	}
 
 	// Modular distribution interface methods. Not yet used.
-	public Distribution getModuleDistribution(String moduleName,
-			String moduleVersion) {
-		// NameVersion searched = new DefaultNameVersion(moduleName,
-		// moduleVersion);
-		// for (Distribution ad : modules) {
-		// if (ad.equals(searched))
-		// return ad;
-		// }
-		return null;
+	public Distribution getModuleDistribution(String moduleName, String moduleVersion) {
+		throw new UnsupportedOperationException();
 	}
 
 	public Object getModulesDescriptor(String descriptorType) {
-		// TODO Auto-generated method stub
-		return null;
+		throw new UnsupportedOperationException();
 	}
 
 	/* DEPENDENCY INJECTION */