X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=src%2Forg%2Fargeo%2Fbuild%2FRepackage.java;h=ac3c9a62981a75f22e5e5e8f0c5cf2f0cf8f2344;hb=d304d3c10b977a45453106d1c65a76cb595c05ca;hp=7513dc5928f0ad946ff4f80a6f7ae08fa2ae58d5;hpb=af5b640e4fa16c3d5ed59a1fd3b1ffcdc37bf4fb;p=cc0%2Fargeo-build.git diff --git a/src/org/argeo/build/Repackage.java b/src/org/argeo/build/Repackage.java index 7513dc5..ac3c9a6 100644 --- a/src/org/argeo/build/Repackage.java +++ b/src/org/argeo/build/Repackage.java @@ -1,12 +1,16 @@ package org.argeo.build; import static java.lang.System.Logger.Level.DEBUG; +import static java.lang.System.Logger.Level.ERROR; +import static java.lang.System.Logger.Level.INFO; +import static java.lang.System.Logger.Level.TRACE; import static java.lang.System.Logger.Level.WARNING; +import static java.nio.file.FileVisitResult.CONTINUE; +import static org.argeo.build.Repackage.ManifestConstants.ARGEO_ORIGIN_M2; +import static org.argeo.build.Repackage.ManifestConstants.ARGEO_ORIGIN_M2_REPO; import static org.argeo.build.Repackage.ManifestConstants.BUNDLE_SYMBOLICNAME; import static org.argeo.build.Repackage.ManifestConstants.BUNDLE_VERSION; import static org.argeo.build.Repackage.ManifestConstants.EXPORT_PACKAGE; -import static org.argeo.build.Repackage.ManifestConstants.SLC_ORIGIN_M2; -import static org.argeo.build.Repackage.ManifestConstants.SLC_ORIGIN_M2_REPO; import java.io.File; import java.io.FileNotFoundException; @@ -14,7 +18,6 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.lang.System.Logger; -import java.lang.System.Logger.Level; import java.net.MalformedURLException; import java.net.URL; import java.nio.charset.StandardCharsets; @@ -48,12 +51,20 @@ import java.util.zip.Deflater; import aQute.bnd.osgi.Analyzer; import aQute.bnd.osgi.Jar; -/** The central class for A2 packaging. */ +/** + * Simple tool repackaging existing jar files into OSGi bundles in an A2 + * repository. + */ public class Repackage { private final static Logger logger = System.getLogger(Repackage.class.getName()); - private final static String ENV_BUILD_SOURCE_BUNDLES = "BUILD_SOURCE_BUNDLES"; + /** + * Environment variable on whether sources should be packaged separately or + * integrated in the bundles. + */ + private final static String ENV_SOURCE_BUNDLES = "SOURCE_BUNDLES"; + /** Whethere repackaging should run in parallel or sequentially. */ private final static boolean parallel = true; /** Main entry point. */ @@ -80,28 +91,41 @@ public class Repackage { private final static String COMMON_BND = "common.bnd"; private final static String MERGE_BND = "merge.bnd"; + /** Directory where to download archives */ private Path originBase; + /** Directory where to download Maven artifacts */ + private Path mavenBase; + + /** A2 repository base for binary bundles */ private Path a2Base; + /** A2 repository base for source bundles */ + private Path a2SrcBase; + /** A2 base for native components */ private Path a2LibBase; + /** Location of the descriptors driving the packaging */ private Path descriptorsBase; - + /** URIs of archives to download */ private Properties uris = new Properties(); - - /** key is URI prefix, value list of base URLs */ + /** Mirrors for archive download. Key is URI prefix, value list of base URLs */ private Map> mirrors = new HashMap>(); + /** Whether sources should be packaged separately */ private final boolean sourceBundles; + /** Constructor initialises the various variables */ public Repackage(Path a2Base, Path descriptorsBase) { - sourceBundles = Boolean.parseBoolean(System.getenv(ENV_BUILD_SOURCE_BUNDLES)); + sourceBundles = Boolean.parseBoolean(System.getenv(ENV_SOURCE_BUNDLES)); if (sourceBundles) - logger.log(Level.INFO, "Sources will be packaged separately"); + logger.log(INFO, "Sources will be packaged separately"); Objects.requireNonNull(a2Base); Objects.requireNonNull(descriptorsBase); this.originBase = Paths.get(System.getProperty("user.home"), ".cache", "argeo/build/origin"); + this.mavenBase = Paths.get(System.getProperty("user.home"), ".m2", "repository"); + // TODO define and use a build base this.a2Base = a2Base; + this.a2SrcBase = a2Base.getParent().resolve(a2Base.getFileName() + ".src"); this.a2LibBase = a2Base.resolve("lib"); this.descriptorsBase = descriptorsBase; if (!Files.exists(this.descriptorsBase)) @@ -132,14 +156,12 @@ public class Repackage { it.remove(); } } - mirrors.put("http://www.eclipse.org/downloads", eclipseMirrors); } /* * MAVEN ORIGIN */ - /** Process a whole category/group id. */ public void processCategory(Path categoryRelativePath) { try { @@ -167,7 +189,6 @@ public class Repackage { /** Process a standalone Maven artifact. */ public void processSingleM2ArtifactDistributionUnit(Path bndFile) { try { -// String category = bndFile.getParent().getFileName().toString(); Path categoryRelativePath = descriptorsBase.relativize(bndFile.getParent()); Path targetCategoryBase = a2Base.resolve(categoryRelativePath); @@ -175,8 +196,8 @@ public class Repackage { 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()) + String repoStr = fileProps.containsKey(ARGEO_ORIGIN_M2_REPO.toString()) + ? fileProps.getProperty(ARGEO_ORIGIN_M2_REPO.toString()) : null; if (!fileProps.containsKey(BUNDLE_SYMBOLICNAME.toString())) { @@ -186,15 +207,14 @@ public class Repackage { fileProps.put(BUNDLE_SYMBOLICNAME.toString(), symbolicName); } - String m2Coordinates = fileProps.getProperty(SLC_ORIGIN_M2.toString()); + String m2Coordinates = fileProps.getProperty(ARGEO_ORIGIN_M2.toString()); if (m2Coordinates == null) throw new IllegalArgumentException("No M2 coordinates available for " + bndFile); M2Artifact artifact = new M2Artifact(m2Coordinates); URL url = M2ConventionsUtils.mavenRepoUrl(repoStr, artifact); - Path downloaded = downloadMaven(url, originBase, artifact); + Path downloaded = downloadMaven(url, artifact); Path targetBundleDir = processBndJar(downloaded, targetCategoryBase, fileProps, artifact); - downloadAndProcessM2Sources(repoStr, artifact, targetBundleDir); createJar(targetBundleDir); @@ -206,29 +226,25 @@ public class Repackage { /** Process multiple Maven artifacts. */ public void processM2BasedDistributionUnit(Path duDir) { try { - // String category = duDir.getParent().getFileName().toString(); Path categoryRelativePath = descriptorsBase.relativize(duDir.getParent()); Path targetCategoryBase = a2Base.resolve(categoryRelativePath); - // merge Path mergeBnd = duDir.resolve(MERGE_BND); - if (Files.exists(mergeBnd)) { + if (Files.exists(mergeBnd)) // merge mergeM2Artifacts(mergeBnd); -// return; - } Path commonBnd = duDir.resolve(COMMON_BND); - if (!Files.exists(commonBnd)) { + if (!Files.exists(commonBnd)) return; - } + Properties commonProps = new Properties(); try (InputStream in = Files.newInputStream(commonBnd)) { commonProps.load(in); } - String m2Version = commonProps.getProperty(SLC_ORIGIN_M2.toString()); + String m2Version = commonProps.getProperty(ARGEO_ORIGIN_M2.toString()); if (m2Version == null) { - logger.log(Level.WARNING, "Ignoring " + duDir + " as it is not an M2-based distribution unit"); + logger.log(WARNING, "Ignoring " + duDir + " as it is not an M2-based distribution unit"); return;// ignore, this is probably an Eclipse archive } if (!m2Version.startsWith(":")) { @@ -244,9 +260,8 @@ public class Repackage { try (InputStream in = Files.newInputStream(p)) { fileProps.load(in); } - String m2Coordinates = fileProps.getProperty(SLC_ORIGIN_M2.toString()); + String m2Coordinates = fileProps.getProperty(ARGEO_ORIGIN_M2.toString()); M2Artifact artifact = new M2Artifact(m2Coordinates); - artifact.setVersion(m2Version); // prepare manifest entries @@ -254,16 +269,16 @@ public class Repackage { mergeProps.putAll(commonProps); fileEntries: for (Object key : fileProps.keySet()) { - if (ManifestConstants.SLC_ORIGIN_M2.toString().equals(key)) + if (ManifestConstants.ARGEO_ORIGIN_M2.toString().equals(key)) continue fileEntries; String value = fileProps.getProperty(key.toString()); Object previousValue = mergeProps.put(key.toString(), value); if (previousValue != null) { - logger.log(Level.WARNING, + logger.log(WARNING, commonBnd + ": " + key + " was " + previousValue + ", overridden with " + value); } } - mergeProps.put(ManifestConstants.SLC_ORIGIN_M2.toString(), artifact.toM2Coordinates()); + mergeProps.put(ManifestConstants.ARGEO_ORIGIN_M2.toString(), artifact.toM2Coordinates()); if (!mergeProps.containsKey(BUNDLE_SYMBOLICNAME.toString())) { // use file name as symbolic name String symbolicName = p.getFileName().toString(); @@ -271,26 +286,21 @@ public class Repackage { mergeProps.put(BUNDLE_SYMBOLICNAME.toString(), symbolicName); } - String repoStr = mergeProps.containsKey(SLC_ORIGIN_M2_REPO.toString()) - ? mergeProps.getProperty(SLC_ORIGIN_M2_REPO.toString()) + String repoStr = mergeProps.containsKey(ARGEO_ORIGIN_M2_REPO.toString()) + ? mergeProps.getProperty(ARGEO_ORIGIN_M2_REPO.toString()) : null; // download URL url = M2ConventionsUtils.mavenRepoUrl(repoStr, artifact); - Path downloaded = downloadMaven(url, originBase, artifact); + Path downloaded = downloadMaven(url, artifact); Path targetBundleDir = processBndJar(downloaded, targetCategoryBase, mergeProps, artifact); -// logger.log(Level.DEBUG, () -> "Processed " + downloaded); - - // sources downloadAndProcessM2Sources(repoStr, artifact, targetBundleDir); - createJar(targetBundleDir); } } catch (IOException e) { throw new RuntimeException("Cannot process " + duDir, e); } - } /** Merge multiple Maven artifacts. */ @@ -304,10 +314,9 @@ public class Repackage { mergeProps.load(in); } - // Version - String m2Version = mergeProps.getProperty(SLC_ORIGIN_M2.toString()); + String m2Version = mergeProps.getProperty(ARGEO_ORIGIN_M2.toString()); if (m2Version == null) { - logger.log(Level.WARNING, "Ignoring " + duDir + " as it is not an M2-based distribution unit"); + logger.log(WARNING, "Ignoring " + duDir + " as it is not an M2-based distribution unit"); return;// ignore, this is probably an Eclipse archive } if (!m2Version.startsWith(":")) { @@ -316,19 +325,20 @@ public class Repackage { m2Version = m2Version.substring(1); mergeProps.put(ManifestConstants.BUNDLE_VERSION.toString(), m2Version); - String artifactsStr = mergeProps.getProperty(ManifestConstants.SLC_ORIGIN_M2_MERGE.toString()); + String artifactsStr = mergeProps.getProperty(ManifestConstants.ARGEO_ORIGIN_M2_MERGE.toString()); if (artifactsStr == null) throw new IllegalArgumentException( - mergeBnd + ": " + ManifestConstants.SLC_ORIGIN_M2_MERGE + " must be set"); + mergeBnd + ": " + ManifestConstants.ARGEO_ORIGIN_M2_MERGE + " must be set"); - String repoStr = mergeProps.containsKey(SLC_ORIGIN_M2_REPO.toString()) - ? mergeProps.getProperty(SLC_ORIGIN_M2_REPO.toString()) + String repoStr = mergeProps.containsKey(ARGEO_ORIGIN_M2_REPO.toString()) + ? mergeProps.getProperty(ARGEO_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); CategoryNameVersion nameVersion = new M2Artifact(category + ":" + bundleSymbolicName + ":" + m2Version); + Path targetBundleDir = targetCategoryBase.resolve(bundleSymbolicName + "." + nameVersion.getBranch()); String[] artifacts = artifactsStr.split(","); @@ -340,7 +350,7 @@ public class Repackage { if (artifact.getVersion() == null) artifact.setVersion(m2Version); URL url = M2ConventionsUtils.mavenRepoUrl(repoStr, artifact); - Path downloaded = downloadMaven(url, originBase, artifact); + Path downloaded = downloadMaven(url, artifact); JarEntry entry; try (JarInputStream jarIn = new JarInputStream(Files.newInputStream(downloaded), false)) { entries: while ((entry = jarIn.getNextJarEntry()) != null) { @@ -377,16 +387,16 @@ public class Repackage { try (OutputStream out = Files.newOutputStream(target, StandardOpenOption.APPEND)) { out.write("\n".getBytes()); jarIn.transferTo(out); - logger.log(Level.WARNING, artifact.getArtifactId() + " - Appended " + entry.getName()); + logger.log(DEBUG, artifact.getArtifactId() + " - Appended " + entry.getName()); } } else if (entry.getName().startsWith("org/apache/batik/")) { - logger.log(Level.WARNING, "Skip " + entry.getName()); + logger.log(TRACE, "Skip " + entry.getName()); continue entries; } else { throw new IllegalStateException("File " + target + " from " + artifact + " already exists"); } } - logger.log(Level.TRACE, () -> "Copied " + target); + logger.log(TRACE, () -> "Copied " + target); } } @@ -402,7 +412,7 @@ public class Repackage { OutputStream out = Files.newOutputStream(target, StandardOpenOption.APPEND);) { out.write("\n".getBytes()); in.transferTo(out); - logger.log(Level.WARNING, "Appended " + p); + logger.log(DEBUG, "Appended " + p); } } } @@ -427,8 +437,6 @@ public class Repackage { && 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); @@ -454,13 +462,13 @@ public class Repackage { try { Map additionalEntries = new TreeMap<>(); boolean doNotModify = Boolean.parseBoolean(fileProps - .getOrDefault(ManifestConstants.SLC_ORIGIN_MANIFEST_NOT_MODIFIED.toString(), "false").toString()); + .getOrDefault(ManifestConstants.ARGEO_ORIGIN_MANIFEST_NOT_MODIFIED.toString(), "false").toString()); // we always force the symbolic name if (doNotModify) { fileEntries: for (Object key : fileProps.keySet()) { - if (ManifestConstants.SLC_ORIGIN_M2.toString().equals(key)) + if (ManifestConstants.ARGEO_ORIGIN_M2.toString().equals(key)) continue fileEntries; String value = fileProps.getProperty(key.toString()); additionalEntries.put(key.toString(), value); @@ -505,7 +513,7 @@ public class Repackage { } } Path targetBundleDir = processBundleJar(downloaded, targetCategoryBase, additionalEntries); - logger.log(Level.DEBUG, () -> "Processed " + downloaded); + logger.log(DEBUG, () -> "Processed " + downloaded); return targetBundleDir; } catch (Exception e) { throw new RuntimeException("Cannot BND process " + downloaded, e); @@ -516,16 +524,14 @@ public class Repackage { /** Download and integrates sources for a single Maven artifact. */ protected void downloadAndProcessM2Sources(String repoStr, M2Artifact artifact, Path targetBundleDir) throws IOException { -// if (sourceBundles) -// return; try { M2Artifact sourcesArtifact = new M2Artifact(artifact.toM2Coordinates(), "sources"); URL sourcesUrl = M2ConventionsUtils.mavenRepoUrl(repoStr, sourcesArtifact); - Path sourcesDownloaded = downloadMaven(sourcesUrl, originBase, artifact, true); + Path sourcesDownloaded = downloadMaven(sourcesUrl, artifact, true); processM2SourceJar(sourcesDownloaded, targetBundleDir); - logger.log(Level.TRACE, () -> "Processed source " + sourcesDownloaded); + logger.log(TRACE, () -> "Processed source " + sourcesDownloaded); } catch (Exception e) { - logger.log(Level.ERROR, () -> "Cannot download source for " + artifact); + logger.log(ERROR, () -> "Cannot download source for " + artifact); } } @@ -537,14 +543,7 @@ public class Repackage { ? targetBundleDir.getParent().resolve(targetBundleDir.toString() + ".src") : targetBundleDir.resolve("OSGI-OPT/src"); - // TODO make it less dangerous? - if (Files.exists(targetSourceDir)) { -// deleteDirectory(targetSourceDir); - } else { - Files.createDirectories(targetSourceDir); - } - - // copy entries + Files.createDirectories(targetSourceDir); JarEntry entry; entries: while ((entry = jarIn.getNextJarEntry()) != null) { if (entry.isDirectory()) @@ -559,9 +558,9 @@ public class Repackage { Files.createDirectories(target.getParent()); if (!Files.exists(target)) { Files.copy(jarIn, target); - logger.log(Level.TRACE, () -> "Copied source " + target); + logger.log(TRACE, () -> "Copied source " + target); } else { - logger.log(Level.WARNING, () -> target + " already exists, skipping..."); + logger.log(TRACE, () -> target + " already exists, skipping..."); } } } @@ -569,20 +568,20 @@ public class Repackage { } /** Download a Maven artifact. */ - protected Path downloadMaven(URL url, Path dir, M2Artifact artifact) throws IOException { - return downloadMaven(url, dir, artifact, false); + protected Path downloadMaven(URL url, M2Artifact artifact) throws IOException { + return downloadMaven(url, artifact, false); } /** Download a Maven artifact. */ - protected Path downloadMaven(URL url, Path dir, M2Artifact artifact, boolean sources) throws IOException { - return download(url, dir, artifact.getGroupId() + '/' + artifact.getArtifactId() + "-" + artifact.getVersion() - + (sources ? "-sources" : "") + ".jar"); + protected Path downloadMaven(URL url, M2Artifact artifact, boolean sources) throws IOException { + return download(url, mavenBase, artifact.getGroupId().replace(".", "/") // + + '/' + artifact.getArtifactId() + '/' + artifact.getVersion() // + + '/' + artifact.getArtifactId() + "-" + artifact.getVersion() + (sources ? "-sources" : "") + ".jar"); } /* * ECLIPSE ORIGIN */ - /** Process an archive in Eclipse format. */ public void processEclipseArchive(Path duDir) { try { @@ -590,9 +589,8 @@ public class Repackage { Path targetCategoryBase = a2Base.resolve(categoryRelativePath); Files.createDirectories(targetCategoryBase); // first delete all directories from previous builds - for (Path dir : Files.newDirectoryStream(targetCategoryBase, (p) -> Files.isDirectory(p))) { + for (Path dir : Files.newDirectoryStream(targetCategoryBase, (p) -> Files.isDirectory(p))) deleteDirectory(dir); - } Files.createDirectories(originBase); @@ -601,12 +599,12 @@ public class Repackage { try (InputStream in = Files.newInputStream(commonBnd)) { commonProps.load(in); } - String url = commonProps.getProperty(ManifestConstants.SLC_ORIGIN_URI.toString()); + String url = commonProps.getProperty(ManifestConstants.ARGEO_ORIGIN_URI.toString()); if (url == null) { url = uris.getProperty(duDir.getFileName().toString()); if (url == null) throw new IllegalStateException("No url available for " + duDir); - commonProps.put(ManifestConstants.SLC_ORIGIN_URI.toString(), url); + commonProps.put(ManifestConstants.ARGEO_ORIGIN_URI.toString(), url); } Path downloaded = tryDownloadArchive(url, originBase); @@ -644,22 +642,19 @@ public class Repackage { if (includeMatcher.matches(file)) { for (PathMatcher excludeMatcher : excludeMatchers) { if (excludeMatcher.matches(file)) { - logger.log(Level.TRACE, "Skipping excluded " + file); + logger.log(TRACE, "Skipping excluded " + file); return FileVisitResult.CONTINUE; } } if (file.getFileName().toString().contains(".source_")) { -// if (!sourceBundles) { processEclipseSourceJar(file, targetCategoryBase); - logger.log(Level.DEBUG, () -> "Processed source " + file); -// } - + logger.log(DEBUG, () -> "Processed source " + file); } else { Map map = new HashMap<>(); for (Object key : commonProps.keySet()) map.put(key.toString(), commonProps.getProperty(key.toString())); processBundleJar(file, targetCategoryBase, map); - logger.log(Level.DEBUG, () -> "Processed " + file); + logger.log(DEBUG, () -> "Processed " + file); } break includeMatchers; } @@ -696,14 +691,7 @@ public class Repackage { ? targetBundleDir.getParent().resolve(targetBundleDir.toString() + ".src") : targetBundleDir.resolve("OSGI-OPT/src"); - // TODO make it less dangerous? - if (Files.exists(targetSourceDir)) { -// deleteDirectory(targetSourceDir); - } else { - Files.createDirectories(targetSourceDir); - } - - // copy entries + Files.createDirectories(targetSourceDir); JarEntry entry; entries: while ((entry = jarIn.getNextJarEntry()) != null) { if (entry.isDirectory()) @@ -713,15 +701,12 @@ public class Repackage { Path target = targetSourceDir.resolve(entry.getName()); Files.createDirectories(target.getParent()); Files.copy(jarIn, target); - logger.log(Level.TRACE, () -> "Copied source " + target); + logger.log(TRACE, () -> "Copied source " + target); } - - // copy MANIFEST } } catch (IOException e) { throw new IllegalStateException("Cannot process " + file, e); } - } /* @@ -740,7 +725,6 @@ public class Repackage { String rawSourceSymbolicName = manifest.getMainAttributes() .getValue(ManifestConstants.BUNDLE_SYMBOLICNAME.toString()); if (rawSourceSymbolicName != null) { - // make sure there is no directive String[] arr = rawSourceSymbolicName.split(";"); for (int i = 1; i < arr.length; i++) { @@ -749,7 +733,6 @@ public class Repackage { logger.log(DEBUG, file.getFileName() + " is a singleton"); } } - // remove problematic entries in MANIFEST manifest.getEntries().clear(); @@ -761,7 +744,7 @@ public class Repackage { } else { nameVersion = nameVersionFromManifest(manifest); if (ourVersion != null && !nameVersion.getVersion().equals(ourVersion)) { - logger.log(Level.WARNING, + logger.log(WARNING, "Original version is " + nameVersion.getVersion() + " while new version is " + ourVersion); entries.put(BUNDLE_VERSION.toString(), ourVersion); } @@ -809,9 +792,6 @@ public class Repackage { if (isNative && (entry.getName().endsWith(".so") || entry.getName().endsWith(".dll") || entry.getName().endsWith(".jnilib"))) { Path categoryDir = targetBundleDir.getParent(); -// String[] segments = categoryDir.getFileName().toString().split("\\."); -// String arch = segments[segments.length - 1]; -// String os = segments[segments.length - 2]; boolean copyDll = false; Path targetDll = categoryDir.resolve(targetBundleDir.relativize(target)); if (nameVersion.getName().equals("com.sun.jna")) { @@ -834,7 +814,7 @@ public class Repackage { } Files.delete(target); } - logger.log(Level.TRACE, () -> "Copied " + target); + logger.log(TRACE, () -> "Copied " + target); } // copy MANIFEST @@ -851,15 +831,14 @@ public class Repackage { Object previousValue = manifest.getMainAttributes().putValue(key, value); if (previousValue != null && !previousValue.equals(value)) { if (ManifestConstants.IMPORT_PACKAGE.toString().equals(key) - || ManifestConstants.EXPORT_PACKAGE.toString().equals(key) - || ManifestConstants.BUNDLE_LICENSE.toString().equals(key)) - logger.log(Level.TRACE, file.getFileName() + ": " + key + " was modified"); + || ManifestConstants.EXPORT_PACKAGE.toString().equals(key)) + logger.log(TRACE, file.getFileName() + ": " + key + " was modified"); else - logger.log(Level.WARNING, file.getFileName() + ": " + key + " was " + previousValue + logger.log(WARNING, file.getFileName() + ": " + key + " was " + previousValue + ", overridden with " + value); } - // hack to remove unresolvable + // !! hack to remove unresolvable if (key.equals("Provide-Capability") || key.equals("Require-Capability")) if (nameVersion.getName().equals("osgi.core") || nameVersion.getName().equals("osgi.cmpn")) { manifest.getMainAttributes().remove(key); @@ -875,7 +854,6 @@ public class Repackage { /* * UTILITIES */ - /** Recursively deletes a directory. */ private static void deleteDirectory(Path path) throws IOException { if (!Files.exists(path)) @@ -886,13 +864,13 @@ public class Repackage { if (e != null) throw e; Files.delete(directory); - return FileVisitResult.CONTINUE; + return CONTINUE; } @Override public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException { Files.delete(file); - return FileVisitResult.CONTINUE; + return CONTINUE; } }); } @@ -939,7 +917,7 @@ public class Repackage { try { return downloadArchive(url, dir); } catch (FileNotFoundException e) { - logger.log(Level.WARNING, "Cannot download " + url + ", trying another mirror"); + logger.log(WARNING, "Cannot download " + url + ", trying another mirror"); } } throw new FileNotFoundException("Cannot find " + uri); @@ -966,7 +944,7 @@ public class Repackage { dest = dir.resolve(name); if (Files.exists(dest)) { - logger.log(Level.TRACE, () -> "File " + dest + " already exists for " + url + ", not downloading again"); + logger.log(TRACE, () -> "File " + dest + " already exists for " + url + ", not downloading again"); return dest; } else { Files.createDirectories(dest.getParent()); @@ -974,7 +952,7 @@ public class Repackage { try (InputStream in = url.openStream()) { Files.copy(in, dest); - logger.log(Level.DEBUG, () -> "Downloaded " + dest + " from " + url); + logger.log(DEBUG, () -> "Downloaded " + dest + " from " + url); } return dest; } @@ -1015,9 +993,11 @@ public class Repackage { return jarPath; } - Path guessedA2Base = bundleCategoryDir.getParent(); - Path srcA2Base = guessedA2Base.getParent().resolve(guessedA2Base.getFileName() + ".src"); - Path srcJarP = srcA2Base.resolve(bundleCategoryDir.getFileName()).resolve(sourceDir.getFileName() + ".jar"); + + Path relPath = a2Base.relativize(bundleCategoryDir); + Path srcCategoryDir = a2SrcBase.resolve(relPath); + Path srcJarP = srcCategoryDir.resolve(sourceDir.getFileName() + ".jar"); + Files.createDirectories(srcJarP.getParent()); String bundleSymbolicName = manifest.getMainAttributes().getValue("Bundle-SymbolicName").toString(); // in case there are additional directives @@ -1053,22 +1033,41 @@ public class Repackage { return jarPath; } + /** MANIFEST headers. */ enum ManifestConstants { // OSGi + /** OSGi bundle symbolic name. */ BUNDLE_SYMBOLICNAME("Bundle-SymbolicName"), // + /** OSGi bundle version. */ BUNDLE_VERSION("Bundle-Version"), // - BUNDLE_LICENSE("Bundle-License"), // +// BUNDLE_LICENSE("Bundle-License"), // + /** OSGi exported packages list. */ EXPORT_PACKAGE("Export-Package"), // + /** OSGi imported packages list. */ IMPORT_PACKAGE("Import-Package"), // - // JAVA + // Java + /** Java module name. */ AUTOMATIC_MODULE_NAME("Automatic-Module-Name"), // - // SLC - SLC_CATEGORY("SLC-Category"), // - SLC_ORIGIN_M2("SLC-Origin-M2"), // - SLC_ORIGIN_M2_MERGE("SLC-Origin-M2-Merge"), // - SLC_ORIGIN_M2_REPO("SLC-Origin-M2-Repo"), // - SLC_ORIGIN_MANIFEST_NOT_MODIFIED("SLC-Origin-ManifestNotModified"), // - SLC_ORIGIN_URI("SLC-Origin-URI"),// + // Argeo Origin + /** + * Maven coordinates of the origin, possibly partial when using common.bnd or + * merge.bnd. + */ + ARGEO_ORIGIN_M2("Argeo-Origin-M2"), // + /** List of Maven coordinates to merge. */ + ARGEO_ORIGIN_M2_MERGE("Argeo-Origin-M2-Merge"), // + /** Maven repository if not the default one. */ + ARGEO_ORIGIN_M2_REPO("Argeo-Origin-M2-Repo"), // + /** + * Do not perform BND analysis of the origin component. Typically IMport_package + * and Export-Package will be kept untouched. + */ + ARGEO_ORIGIN_MANIFEST_NOT_MODIFIED("Argeo-Origin-ManifestNotModified"), // + /** + * Origin (non-Maven) URI of the component. It may be anything (jar, archive, + * etc.). + */ + ARGEO_ORIGIN_URI("Argeo-Origin-URI"), // ; final String value; @@ -1081,9 +1080,7 @@ public class Repackage { public String toString() { return value; } - } - } /** Simple representation of an M2 artifact. */ @@ -1175,6 +1172,7 @@ class M2ConventionsUtils { } } +/** Combination of a category, a name and a version. */ class CategoryNameVersion extends NameVersion { private String category; @@ -1206,6 +1204,7 @@ class CategoryNameVersion extends NameVersion { } +/** Combination of a name and a version. */ class NameVersion implements Comparable { private String name; private String version;