X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc.factory%2Fsrc%2Forg%2Fargeo%2Fslc%2Ffactory%2FA2Factory.java;h=7048a39edb47ff534efbb59930e2550668f4077a;hb=1bb5dafb8b8ba4b69a7bed7242bb8724c79de583;hp=ded5fe4d100dd9b8a63eab0b6e59995d962293e1;hpb=0b2a38b71765b5eb18d2e7e4d707da414fcccd24;p=gpl%2Fargeo-slc.git diff --git a/org.argeo.slc.factory/src/org/argeo/slc/factory/A2Factory.java b/org.argeo.slc.factory/src/org/argeo/slc/factory/A2Factory.java index ded5fe4d1..7048a39ed 100644 --- a/org.argeo.slc.factory/src/org/argeo/slc/factory/A2Factory.java +++ b/org.argeo.slc.factory/src/org/argeo/slc/factory/A2Factory.java @@ -1,17 +1,16 @@ package org.argeo.slc.factory; import static java.lang.System.Logger.Level.DEBUG; -import static org.argeo.slc.ManifestConstants.BUNDLE_LICENSE; import static org.argeo.slc.ManifestConstants.BUNDLE_SYMBOLICNAME; import static org.argeo.slc.ManifestConstants.BUNDLE_VERSION; import static org.argeo.slc.ManifestConstants.EXPORT_PACKAGE; import static org.argeo.slc.ManifestConstants.SLC_ORIGIN_M2; +import static org.argeo.slc.ManifestConstants.SLC_ORIGIN_M2_REPO; import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import java.io.Writer; import java.lang.System.Logger; import java.lang.System.Logger.Level; import java.net.URL; @@ -24,6 +23,7 @@ import java.nio.file.Path; import java.nio.file.PathMatcher; import java.nio.file.Paths; import java.nio.file.SimpleFileVisitor; +import java.nio.file.StandardOpenOption; import java.nio.file.attribute.BasicFileAttributes; import java.util.ArrayList; import java.util.HashMap; @@ -37,9 +37,11 @@ import java.util.jar.JarInputStream; import java.util.jar.JarOutputStream; import java.util.jar.Manifest; +import org.argeo.slc.DefaultCategoryNameVersion; import org.argeo.slc.DefaultNameVersion; import org.argeo.slc.ManifestConstants; import org.argeo.slc.NameVersion; +import org.argeo.slc.factory.m2.Artifact; import org.argeo.slc.factory.m2.DefaultArtifact; import org.argeo.slc.factory.m2.MavenConventionsUtils; @@ -51,6 +53,7 @@ public class A2Factory { private final static Logger logger = System.getLogger(A2Factory.class.getName()); private final static String COMMON_BND = "common.bnd"; + private final static String MERGE_BND = "merge.bnd"; private Path originBase; private Path a2Base; @@ -71,11 +74,16 @@ public class A2Factory { mirrors.put("http://www.eclipse.org/downloads", eclipseMirrors); } + /* + * MAVEN ORIGIN + */ + + /** Process a whole category/group id. */ public void processCategory(Path targetCategoryBase) { try { DirectoryStream bnds = Files.newDirectoryStream(targetCategoryBase, - (p) -> p.getFileName().toString().endsWith(".bnd") - && !p.getFileName().toString().equals(COMMON_BND)); + (p) -> p.getFileName().toString().endsWith(".bnd") && !p.getFileName().toString().equals(COMMON_BND) + && !p.getFileName().toString().equals(MERGE_BND)); for (Path p : bnds) { processSingleM2ArtifactDistributionUnit(p); } @@ -89,6 +97,7 @@ public class A2Factory { } } + /** Process a standalone Maven artifact. */ public void processSingleM2ArtifactDistributionUnit(Path bndFile) { try { String category = bndFile.getParent().getFileName().toString(); @@ -97,17 +106,28 @@ public class A2Factory { try (InputStream in = Files.newInputStream(bndFile)) { fileProps.load(in); } + String repoStr = fileProps.containsKey(SLC_ORIGIN_M2_REPO.toString()) + ? fileProps.getProperty(SLC_ORIGIN_M2_REPO.toString()) + : null; + + if (!fileProps.containsKey(BUNDLE_SYMBOLICNAME.toString()) + && !fileProps.containsKey(ManifestConstants.SLC_ORIGIN_MANIFEST_NOT_MODIFIED.toString())) { + // use file name as symbolic name + String symbolicName = bndFile.getFileName().toString(); + symbolicName = symbolicName.substring(0, symbolicName.length() - ".bnd".length()); + fileProps.put(BUNDLE_SYMBOLICNAME.toString(), symbolicName); + } String m2Coordinates = fileProps.getProperty(SLC_ORIGIN_M2.toString()); if (m2Coordinates == null) throw new IllegalArgumentException("No M2 coordinates available for " + bndFile); DefaultArtifact artifact = new DefaultArtifact(m2Coordinates); - URL url = MavenConventionsUtils.mavenCentralUrl(artifact); - Path downloaded = download(url, originBase, artifact.toM2Coordinates() + ".jar"); + URL url = MavenConventionsUtils.mavenRepoUrl(repoStr, artifact); + Path downloaded = download(url, originBase, artifact); Path targetBundleDir = processBndJar(downloaded, targetCategoryBase, fileProps, artifact); - downloadAndProcessM2Sources(artifact, targetBundleDir); + downloadAndProcessM2Sources(repoStr, artifact, targetBundleDir); createJar(targetBundleDir); } catch (Exception e) { @@ -115,11 +135,23 @@ public class A2Factory { } } + /** Process multiple Maven artifacts. */ public void processM2BasedDistributionUnit(Path duDir) { try { String category = duDir.getParent().getFileName().toString(); Path targetCategoryBase = a2Base.resolve(category); + + // merge + Path mergeBnd = duDir.resolve(MERGE_BND); + if (Files.exists(mergeBnd)) { + mergeM2Artifacts(mergeBnd); +// return; + } + Path commonBnd = duDir.resolve(COMMON_BND); + if (!Files.exists(commonBnd)) { + return; + } Properties commonProps = new Properties(); try (InputStream in = Files.newInputStream(commonBnd)) { commonProps.load(in); @@ -135,11 +167,9 @@ public class A2Factory { } m2Version = m2Version.substring(1); - // String license = commonProps.getProperty(BUNDLE_LICENSE.toString()); - DirectoryStream ds = Files.newDirectoryStream(duDir, - (p) -> p.getFileName().toString().endsWith(".bnd") - && !p.getFileName().toString().equals(COMMON_BND)); + (p) -> p.getFileName().toString().endsWith(".bnd") && !p.getFileName().toString().equals(COMMON_BND) + && !p.getFileName().toString().equals(MERGE_BND)); for (Path p : ds) { Properties fileProps = new Properties(); try (InputStream in = Files.newInputStream(p)) { @@ -149,31 +179,25 @@ public class A2Factory { DefaultArtifact artifact = new DefaultArtifact(m2Coordinates); // temporary rewrite, for migration - String localLicense = fileProps.getProperty(BUNDLE_LICENSE.toString()); - if (localLicense != null || artifact.getVersion() != null) { - fileProps.remove(BUNDLE_LICENSE.toString()); - fileProps.put(SLC_ORIGIN_M2.toString(), artifact.getGroupId() + ":" + artifact.getArtifactId()); - try (Writer writer = Files.newBufferedWriter(p)) { - for (Object key : fileProps.keySet()) { - String value = fileProps.getProperty(key.toString()); - writer.write(key + ": " + value + '\n'); - } - logger.log(DEBUG, () -> "Migrated " + p); - } - } +// String localLicense = fileProps.getProperty(BUNDLE_LICENSE.toString()); +// if (localLicense != null || artifact.getVersion() != null) { +// fileProps.remove(BUNDLE_LICENSE.toString()); +// fileProps.put(SLC_ORIGIN_M2.toString(), artifact.getGroupId() + ":" + artifact.getArtifactId()); +// try (Writer writer = Files.newBufferedWriter(p)) { +// for (Object key : fileProps.keySet()) { +// String value = fileProps.getProperty(key.toString()); +// writer.write(key + ": " + value + '\n'); +// } +// logger.log(DEBUG, () -> "Migrated " + p); +// } +// } artifact.setVersion(m2Version); - URL url = MavenConventionsUtils.mavenCentralUrl(artifact); - Path downloaded = download(url, originBase, artifact.toM2Coordinates() + ".jar"); // prepare manifest entries Properties mergeProps = new Properties(); mergeProps.putAll(commonProps); - // Map entries = new HashMap<>(); -// for (Object key : commonProps.keySet()) { -// entries.put(key.toString(), commonProps.getProperty(key.toString())); -// } fileEntries: for (Object key : fileProps.keySet()) { if (ManifestConstants.SLC_ORIGIN_M2.toString().equals(key)) continue fileEntries; @@ -181,15 +205,31 @@ public class A2Factory { Object previousValue = mergeProps.put(key.toString(), value); if (previousValue != null) { logger.log(Level.WARNING, - downloaded + ": " + key + " was " + previousValue + ", overridden with " + value); + commonBnd + ": " + key + " was " + previousValue + ", overridden with " + value); } } mergeProps.put(ManifestConstants.SLC_ORIGIN_M2.toString(), artifact.toM2Coordinates()); + if (!mergeProps.containsKey(BUNDLE_SYMBOLICNAME.toString()) + && !mergeProps.containsKey(ManifestConstants.SLC_ORIGIN_MANIFEST_NOT_MODIFIED.toString())) { + // use file name as symbolic name + String symbolicName = p.getFileName().toString(); + symbolicName = symbolicName.substring(0, symbolicName.length() - ".bnd".length()); + mergeProps.put(BUNDLE_SYMBOLICNAME.toString(), symbolicName); + } + + String repoStr = mergeProps.containsKey(SLC_ORIGIN_M2_REPO.toString()) + ? mergeProps.getProperty(SLC_ORIGIN_M2_REPO.toString()) + : null; + + // download + URL url = MavenConventionsUtils.mavenRepoUrl(repoStr, artifact); + Path downloaded = download(url, originBase, artifact); + Path targetBundleDir = processBndJar(downloaded, targetCategoryBase, mergeProps, artifact); // logger.log(Level.DEBUG, () -> "Processed " + downloaded); // sources - downloadAndProcessM2Sources(artifact, targetBundleDir); + downloadAndProcessM2Sources(repoStr, artifact, targetBundleDir); createJar(targetBundleDir); } @@ -199,15 +239,134 @@ public class A2Factory { } - protected void downloadAndProcessM2Sources(DefaultArtifact artifact, Path targetBundleDir) throws IOException { - DefaultArtifact sourcesArtifact = new DefaultArtifact(artifact.toM2Coordinates(), "sources"); - URL sourcesUrl = MavenConventionsUtils.mavenCentralUrl(sourcesArtifact); - Path sourcesDownloaded = download(sourcesUrl, originBase, artifact.toM2Coordinates() + ".sources.jar"); - processM2SourceJar(sourcesDownloaded, targetBundleDir); - logger.log(Level.DEBUG, () -> "Processed source " + sourcesDownloaded); + /** Merge multiple Maven artifacts. */ + protected void mergeM2Artifacts(Path mergeBnd) throws IOException { + Path duDir = mergeBnd.getParent(); + String category = duDir.getParent().getFileName().toString(); + Path targetCategoryBase = a2Base.resolve(category); + + Properties mergeProps = new Properties(); + try (InputStream in = Files.newInputStream(mergeBnd)) { + mergeProps.load(in); + } + String m2Version = mergeProps.getProperty(SLC_ORIGIN_M2.toString()); + if (m2Version == null) { + logger.log(Level.WARNING, "Ignoring " + duDir + " as it is not an M2-based distribution unit"); + return;// ignore, this is probably an Eclipse archive + } + if (!m2Version.startsWith(":")) { + throw new IllegalStateException("Only the M2 version can be specified: " + m2Version); + } + m2Version = m2Version.substring(1); + + String artifactsStr = mergeProps.getProperty(ManifestConstants.SLC_ORIGIN_M2_MERGE.toString()); + String repoStr = mergeProps.containsKey(SLC_ORIGIN_M2_REPO.toString()) + ? mergeProps.getProperty(SLC_ORIGIN_M2_REPO.toString()) + : null; + + String bundleSymbolicName = mergeProps.getProperty(ManifestConstants.BUNDLE_SYMBOLICNAME.toString()); + if (bundleSymbolicName == null) + throw new IllegalArgumentException("Bundle-SymbolicName must be set in " + mergeBnd); + DefaultCategoryNameVersion nameVersion = new DefaultArtifact( + category + ":" + bundleSymbolicName + ":" + m2Version); + Path targetBundleDir = targetCategoryBase.resolve(bundleSymbolicName + "." + nameVersion.getBranch()); + + String[] artifacts = artifactsStr.split(","); + artifacts: for (String str : artifacts) { + String m2Coordinates = str.trim(); + if ("".equals(m2Coordinates)) + continue artifacts; + DefaultArtifact artifact = new DefaultArtifact(m2Coordinates.trim()); + if (artifact.getVersion() == null) + artifact.setVersion(m2Version); + URL url = MavenConventionsUtils.mavenRepoUrl(repoStr, artifact); + Path downloaded = download(url, originBase, artifact); + JarEntry entry; + try (JarInputStream jarIn = new JarInputStream(Files.newInputStream(downloaded), false)) { + entries: while ((entry = jarIn.getNextJarEntry()) != null) { + if (entry.isDirectory()) + continue entries; + if (entry.getName().endsWith(".RSA") || entry.getName().endsWith(".SF")) + continue entries; + if (entry.getName().startsWith("META-INF/versions/")) + continue entries; + if (entry.getName().startsWith("META-INF/maven/")) + continue entries; + if (entry.getName().equals("module-info.class")) + continue entries; + if (entry.getName().equals("META-INF/NOTICE")) + continue entries; + if (entry.getName().equals("META-INF/LICENSE")) + continue entries; + Path target = targetBundleDir.resolve(entry.getName()); + Files.createDirectories(target.getParent()); + if (!Files.exists(target)) { + Files.copy(jarIn, target); + } else { + if (entry.getName().startsWith("META-INF/services/")) { + try (OutputStream out = Files.newOutputStream(target, StandardOpenOption.APPEND)) { + out.write("\n".getBytes()); + jarIn.transferTo(out); + if (logger.isLoggable(DEBUG)) + logger.log(DEBUG, "Appended " + entry.getName()); + } + } else if (entry.getName().startsWith("org/apache/batik/")) { + logger.log(Level.WARNING, "Skip " + entry.getName()); + continue entries; + } else { + throw new IllegalStateException("File " + target + " already exists"); + } + } + logger.log(Level.TRACE, () -> "Copied " + target); + } + + } + downloadAndProcessM2Sources(repoStr, artifact, targetBundleDir); + } + + Map entries = new TreeMap<>(); + try (Analyzer bndAnalyzer = new Analyzer()) { + bndAnalyzer.setProperties(mergeProps); + Jar jar = new Jar(targetBundleDir.toFile()); + bndAnalyzer.setJar(jar); + Manifest manifest = bndAnalyzer.calcManifest(); + + keys: for (Object key : manifest.getMainAttributes().keySet()) { + Object value = manifest.getMainAttributes().get(key); + + switch (key.toString()) { + case "Tool": + case "Bnd-LastModified": + case "Created-By": + continue keys; + } + if ("Require-Capability".equals(key.toString()) + && value.toString().equals("osgi.ee;filter:=\"(&(osgi.ee=JavaSE)(version=1.1))\"")) + continue keys;// hack for very old classes + entries.put(key.toString(), value.toString()); + logger.log(DEBUG, () -> key + "=" + value); + + } + } catch (Exception e) { + throw new RuntimeException("Cannot process " + mergeBnd, e); + } + + Manifest manifest = new Manifest(); + Path manifestPath = targetBundleDir.resolve("META-INF/MANIFEST.MF"); + Files.createDirectories(manifestPath.getParent()); + for (String key : entries.keySet()) { + String value = entries.get(key); + manifest.getMainAttributes().putValue(key, value); + } + try (OutputStream out = Files.newOutputStream(manifestPath)) { + manifest.write(out); + } + + createJar(targetBundleDir); } + /** Generate MANIFEST using BND. */ protected Path processBndJar(Path downloaded, Path targetCategoryBase, Properties fileProps, DefaultArtifact artifact) { @@ -286,13 +445,25 @@ public class A2Factory { } + /** Download and integrates sources for a single Maven artifact. */ + protected void downloadAndProcessM2Sources(String repoStr, DefaultArtifact artifact, Path targetBundleDir) + throws IOException { + DefaultArtifact sourcesArtifact = new DefaultArtifact(artifact.toM2Coordinates(), "sources"); + URL sourcesUrl = MavenConventionsUtils.mavenRepoUrl(repoStr, sourcesArtifact); + Path sourcesDownloaded = download(sourcesUrl, originBase, artifact, true); + processM2SourceJar(sourcesDownloaded, targetBundleDir); + logger.log(Level.DEBUG, () -> "Processed source " + sourcesDownloaded); + + } + + /** Integrate sources from a downloaded jar file. */ protected void processM2SourceJar(Path file, Path targetBundleDir) throws IOException { try (JarInputStream jarIn = new JarInputStream(Files.newInputStream(file), false)) { Path targetSourceDir = targetBundleDir.resolve("OSGI-OPT/src"); // TODO make it less dangerous? if (Files.exists(targetSourceDir)) { - deleteDirectory(targetSourceDir); +// deleteDirectory(targetSourceDir); } else { Files.createDirectories(targetSourceDir); } @@ -304,15 +475,39 @@ public class A2Factory { continue entries; if (entry.getName().startsWith("META-INF"))// skip META-INF entries continue entries; + if (entry.getName().startsWith("module-info.java"))// skip META-INF entries + continue entries; + if (entry.getName().startsWith("/")) // absolute paths + continue entries; Path target = targetSourceDir.resolve(entry.getName()); Files.createDirectories(target.getParent()); - Files.copy(jarIn, target); - logger.log(Level.TRACE, () -> "Copied source " + target); + if (!Files.exists(target)) { + Files.copy(jarIn, target); + logger.log(Level.TRACE, () -> "Copied source " + target); + } else { + logger.log(Level.WARNING, () -> target + " already exists, skipping..."); + } } } } + /** Download a Maven artifact. */ + protected Path download(URL url, Path dir, Artifact artifact) throws IOException { + return download(url, dir, artifact, false); + } + + /** Download a Maven artifact. */ + protected Path download(URL url, Path dir, Artifact artifact, boolean sources) throws IOException { + return download(url, dir, artifact.getGroupId() + '/' + artifact.getArtifactId() + "-" + artifact.getVersion() + + (sources ? "-sources" : "") + ".jar"); + } + + /* + * ECLIPSE ORIGIN + */ + + /** Process an archive in Eclipse format. */ public void processEclipseArchive(Path duDir) { try { String category = duDir.getParent().getFileName().toString(); @@ -330,27 +525,47 @@ public class A2Factory { try (InputStream in = Files.newInputStream(commonBnd)) { commonProps.load(in); } - Properties includes = new Properties(); - try (InputStream in = Files.newInputStream(duDir.resolve("includes.properties"))) { - includes.load(in); - } String url = commonProps.getProperty(ManifestConstants.SLC_ORIGIN_URI.toString()); Path downloaded = tryDownload(url, originBase); FileSystem zipFs = FileSystems.newFileSystem(downloaded, (ClassLoader) null); - List pathMatchers = new ArrayList<>(); + // filters + List includeMatchers = new ArrayList<>(); + Properties includes = new Properties(); + try (InputStream in = Files.newInputStream(duDir.resolve("includes.properties"))) { + includes.load(in); + } for (Object pattern : includes.keySet()) { PathMatcher pathMatcher = zipFs.getPathMatcher("glob:/" + pattern); - pathMatchers.add(pathMatcher); + includeMatchers.add(pathMatcher); + } + + List excludeMatchers = new ArrayList<>(); + Path excludeFile = duDir.resolve("excludes.properties"); + if (Files.exists(excludeFile)) { + Properties excludes = new Properties(); + try (InputStream in = Files.newInputStream(excludeFile)) { + excludes.load(in); + } + for (Object pattern : excludes.keySet()) { + PathMatcher pathMatcher = zipFs.getPathMatcher("glob:/" + pattern); + excludeMatchers.add(pathMatcher); + } } Files.walkFileTree(zipFs.getRootDirectories().iterator().next(), new SimpleFileVisitor() { @Override public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException { - pathMatchers: for (PathMatcher pathMatcher : pathMatchers) { - if (pathMatcher.matches(file)) { + includeMatchers: for (PathMatcher includeMatcher : includeMatchers) { + if (includeMatcher.matches(file)) { + for (PathMatcher excludeMatcher : excludeMatchers) { + if (excludeMatcher.matches(file)) { + logger.log(Level.WARNING, "Skipping excluded " + file); + return FileVisitResult.CONTINUE; + } + } if (file.getFileName().toString().contains(".source_")) { processEclipseSourceJar(file, targetCategoryBase); logger.log(Level.DEBUG, () -> "Processed source " + file); @@ -359,7 +574,7 @@ public class A2Factory { processBundleJar(file, targetCategoryBase, new HashMap<>()); logger.log(Level.DEBUG, () -> "Processed " + file); } - break pathMatchers; + break includeMatchers; } } return FileVisitResult.CONTINUE; @@ -376,11 +591,64 @@ public class A2Factory { } + /** Process sources in Eclipse format. */ + protected void processEclipseSourceJar(Path file, Path targetBase) throws IOException { + try { + Path targetBundleDir; + try (JarInputStream jarIn = new JarInputStream(Files.newInputStream(file), false)) { + Manifest manifest = jarIn.getManifest(); + + String[] relatedBundle = manifest.getMainAttributes().getValue("Eclipse-SourceBundle").split(";"); + String version = relatedBundle[1].substring("version=\"".length()); + version = version.substring(0, version.length() - 1); + NameVersion nameVersion = new DefaultNameVersion(relatedBundle[0], version); + targetBundleDir = targetBase.resolve(nameVersion.getName() + "." + nameVersion.getBranch()); + + Path targetSourceDir = targetBundleDir.resolve("OSGI-OPT/src"); + + // TODO make it less dangerous? + if (Files.exists(targetSourceDir)) { +// deleteDirectory(targetSourceDir); + } else { + Files.createDirectories(targetSourceDir); + } + + // copy entries + JarEntry entry; + entries: while ((entry = jarIn.getNextJarEntry()) != null) { + if (entry.isDirectory()) + continue entries; + if (entry.getName().startsWith("META-INF"))// skip META-INF entries + continue entries; + Path target = targetSourceDir.resolve(entry.getName()); + Files.createDirectories(target.getParent()); + Files.copy(jarIn, target); + logger.log(Level.TRACE, () -> "Copied source " + target); + } + + // copy MANIFEST +// Path manifestPath = targetBundleDir.resolve("META-INF/MANIFEST.MF"); +// Files.createDirectories(manifestPath.getParent()); +// try (OutputStream out = Files.newOutputStream(manifestPath)) { +// manifest.write(out); +// } + } + } catch (IOException e) { + throw new IllegalStateException("Cannot process " + file, e); + } + + } + + /* + * COMMON PROCESSING + */ + /** Normalise a bundle. */ protected Path processBundleJar(Path file, Path targetBase, Map entries) throws IOException { DefaultNameVersion nameVersion; Path targetBundleDir; try (JarInputStream jarIn = new JarInputStream(Files.newInputStream(file), false)) { - Manifest manifest = new Manifest(jarIn.getManifest()); + Manifest sourceManifest = jarIn.getManifest(); + Manifest manifest = sourceManifest != null ? new Manifest(sourceManifest) : new Manifest(); // remove problematic entries in MANIFEST manifest.getEntries().clear(); @@ -460,54 +728,12 @@ public class A2Factory { return targetBundleDir; } - protected void processEclipseSourceJar(Path file, Path targetBase) throws IOException { - try { - Path targetBundleDir; - try (JarInputStream jarIn = new JarInputStream(Files.newInputStream(file), false)) { - Manifest manifest = jarIn.getManifest(); + /* + * UTILITIES + */ - String[] relatedBundle = manifest.getMainAttributes().getValue("Eclipse-SourceBundle").split(";"); - String version = relatedBundle[1].substring("version=\"".length()); - version = version.substring(0, version.length() - 1); - NameVersion nameVersion = new DefaultNameVersion(relatedBundle[0], version); - targetBundleDir = targetBase.resolve(nameVersion.getName() + "." + nameVersion.getBranch()); - - Path targetSourceDir = targetBundleDir.resolve("OSGI-OPT/src"); - - // TODO make it less dangerous? - if (Files.exists(targetSourceDir)) { -// deleteDirectory(targetSourceDir); - } else { - Files.createDirectories(targetSourceDir); - } - - // copy entries - JarEntry entry; - entries: while ((entry = jarIn.getNextJarEntry()) != null) { - if (entry.isDirectory()) - continue entries; - if (entry.getName().startsWith("META-INF"))// skip META-INF entries - continue entries; - Path target = targetSourceDir.resolve(entry.getName()); - Files.createDirectories(target.getParent()); - Files.copy(jarIn, target); - logger.log(Level.TRACE, () -> "Copied source " + target); - } - - // copy MANIFEST -// Path manifestPath = targetBundleDir.resolve("META-INF/MANIFEST.MF"); -// Files.createDirectories(manifestPath.getParent()); -// try (OutputStream out = Files.newOutputStream(manifestPath)) { -// manifest.write(out); -// } - } - } catch (IOException e) { - throw new IllegalStateException("Cannot process " + file, e); - } - - } - - static void deleteDirectory(Path path) throws IOException { + /** Recursively deletes a directory. */ + private static void deleteDirectory(Path path) throws IOException { if (!Files.exists(path)) return; Files.walkFileTree(path, new SimpleFileVisitor() { @@ -527,6 +753,7 @@ public class A2Factory { }); } + /** Extract name/version from a MANIFEST. */ protected DefaultNameVersion nameVersionFromManifest(Manifest manifest) { Attributes attrs = manifest.getMainAttributes(); // symbolic name @@ -540,6 +767,7 @@ public class A2Factory { return new DefaultNameVersion(symbolicName, version); } + /** Try to download from an URI. */ protected Path tryDownload(String uri, Path dir) throws IOException { // find mirror List urlBases = null; @@ -555,7 +783,7 @@ public class A2Factory { } if (urlBases == null) try { - return download(new URL(uri), dir, null); + return download(new URL(uri), dir); } catch (FileNotFoundException e) { throw new FileNotFoundException("Cannot find " + uri); } @@ -565,7 +793,7 @@ public class A2Factory { String relativePath = uri.substring(uriPrefix.length()); URL url = new URL(urlBase + relativePath); try { - return download(url, dir, null); + return download(url, dir); } catch (FileNotFoundException e) { logger.log(Level.WARNING, "Cannot download " + url + ", trying another mirror"); } @@ -578,6 +806,12 @@ public class A2Factory { // // } + /** Effectively download. */ + protected Path download(URL url, Path dir) throws IOException { + return download(url, dir, (String) null); + } + + /** Effectively download. */ protected Path download(URL url, Path dir, String name) throws IOException { Path dest; @@ -589,6 +823,8 @@ public class A2Factory { if (Files.exists(dest)) { logger.log(Level.TRACE, () -> "File " + dest + " already exists for " + url + ", not downloading again"); return dest; + } else { + Files.createDirectories(dest.getParent()); } try (InputStream in = url.openStream()) { @@ -598,6 +834,7 @@ public class A2Factory { return dest; } + /** Create a JAR file from a directory. */ protected Path createJar(Path bundleDir) throws IOException { Path jarPath = bundleDir.getParent().resolve(bundleDir.getFileName() + ".jar"); Path manifestPath = bundleDir.resolve("META-INF/MANIFEST.MF"); @@ -624,6 +861,7 @@ public class A2Factory { return jarPath; } + /** For development purproses. */ public static void main(String[] args) { Path factoryBase = Paths.get("../../output/a2").toAbsolutePath().normalize(); A2Factory factory = new A2Factory(factoryBase); @@ -635,15 +873,22 @@ public class A2Factory { // factory.processM2BasedDistributionUnit(descriptorsBase.resolve("org.argeo.tp.jetty/jetty")); // factory.processM2BasedDistributionUnit(descriptorsBase.resolve("org.argeo.tp.jetty/jetty-websocket")); // factory.processCategory(descriptorsBase.resolve("org.argeo.tp.eclipse.rcp")); -// System.exit(0); +// factory.processCategory(descriptorsBase.resolve("org.argeo.tp")); +// factory.processCategory(descriptorsBase.resolve("org.argeo.tp.apache")); +// factory.processCategory(descriptorsBase.resolve("org.argeo.tp.formats")); + factory.processCategory(descriptorsBase.resolve("org.argeo.tp.formats")); + System.exit(0); // Eclipse factory.processEclipseArchive( descriptorsBase.resolve("org.argeo.tp.eclipse.equinox").resolve("eclipse-equinox")); + factory.processEclipseArchive(descriptorsBase.resolve("org.argeo.tp.eclipse.rwt").resolve("eclipse-rwt")); factory.processEclipseArchive(descriptorsBase.resolve("org.argeo.tp.eclipse.rap").resolve("eclipse-rap")); + factory.processEclipseArchive(descriptorsBase.resolve("org.argeo.tp.eclipse.swt").resolve("eclipse-swt")); + factory.processEclipseArchive(descriptorsBase.resolve("org.argeo.tp.eclipse.swt").resolve("eclipse-nebula")); + factory.processEclipseArchive(descriptorsBase.resolve("org.argeo.tp.eclipse.swt").resolve("eclipse-equinox")); factory.processEclipseArchive(descriptorsBase.resolve("org.argeo.tp.eclipse.rcp").resolve("eclipse-rcp")); - - System.exit(0); + factory.processCategory(descriptorsBase.resolve("org.argeo.tp.eclipse.rcp")); // Maven factory.processCategory(descriptorsBase.resolve("org.argeo.tp.sdk")); @@ -651,5 +896,8 @@ public class A2Factory { factory.processCategory(descriptorsBase.resolve("org.argeo.tp.apache")); factory.processCategory(descriptorsBase.resolve("org.argeo.tp.jetty")); factory.processCategory(descriptorsBase.resolve("org.argeo.tp.jcr")); + factory.processCategory(descriptorsBase.resolve("org.argeo.tp.formats")); + factory.processCategory(descriptorsBase.resolve("org.argeo.tp.poi")); + factory.processCategory(descriptorsBase.resolve("org.argeo.tp.gis")); } }