]> git.argeo.org Git - gpl/argeo-slc.git/blobdiff - org.argeo.slc.build/src/org/argeo/slc/build/A2Factory.java
Finalise TP distribution.
[gpl/argeo-slc.git] / org.argeo.slc.build / src / org / argeo / slc / build / A2Factory.java
index d8a80d0b299c89bd4ea2833dcbf7cf06c4e8aa43..dcf706299eeb842ca31727547cd0975e86248ca0 100644 (file)
@@ -1,12 +1,21 @@
 package org.argeo.slc.build;
 
+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 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;
+import java.nio.file.DirectoryStream;
 import java.nio.file.FileSystem;
 import java.nio.file.FileSystems;
 import java.nio.file.FileVisitResult;
@@ -21,18 +30,27 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
+import java.util.TreeMap;
 import java.util.jar.Attributes;
 import java.util.jar.JarEntry;
 import java.util.jar.JarInputStream;
+import java.util.jar.JarOutputStream;
 import java.util.jar.Manifest;
 
 import org.argeo.slc.DefaultNameVersion;
 import org.argeo.slc.ManifestConstants;
 import org.argeo.slc.NameVersion;
+import org.argeo.slc.build.m2.DefaultArtifact;
+import org.argeo.slc.build.m2.MavenConventionsUtils;
+
+import aQute.bnd.osgi.Analyzer;
+import aQute.bnd.osgi.Jar;
 
 public class A2Factory {
        private final static Logger logger = System.getLogger(A2Factory.class.getName());
 
+       private final static String COMMON_BND = "common.bnd";
+
        private Path originBase;
        private Path factoryBase;
 
@@ -51,6 +69,241 @@ public class A2Factory {
                mirrors.put("http://www.eclipse.org/downloads", eclipseMirrors);
        }
 
+       public void processCategory(Path targetCategoryBase) {
+               try {
+                       DirectoryStream<Path> bnds = Files.newDirectoryStream(targetCategoryBase,
+                                       (p) -> p.getFileName().toString().endsWith(".bnd")
+                                                       && !p.getFileName().toString().equals(COMMON_BND));
+                       for (Path p : bnds) {
+                               processSingleM2ArtifactDistributionUnit(p);
+                       }
+
+                       DirectoryStream<Path> dus = Files.newDirectoryStream(targetCategoryBase, (p) -> Files.isDirectory(p));
+                       for (Path duDir : dus) {
+                               processM2BasedDistributionUnit(duDir);
+                       }
+               } catch (IOException e) {
+                       throw new RuntimeException("Cannot process category " + targetCategoryBase, e);
+               }
+       }
+
+       public void processSingleM2ArtifactDistributionUnit(Path bndFile) {
+               try {
+                       String category = bndFile.getParent().getFileName().toString();
+                       Path targetCategoryBase = factoryBase.resolve(category);
+                       Properties fileProps = new Properties();
+                       try (InputStream in = Files.newInputStream(bndFile)) {
+                               fileProps.load(in);
+                       }
+
+                       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");
+
+                       Path targetBundleDir = processBndJar(downloaded, targetCategoryBase, fileProps, artifact);
+
+                       downloadAndProcessM2Sources(artifact, targetBundleDir);
+
+                       createJar(targetBundleDir);
+               } catch (Exception e) {
+                       throw new RuntimeException("Cannot process " + bndFile, e);
+               }
+       }
+
+       public void processM2BasedDistributionUnit(Path duDir) {
+               try {
+                       String category = duDir.getParent().getFileName().toString();
+                       Path targetCategoryBase = factoryBase.resolve(category);
+                       Path commonBnd = duDir.resolve(COMMON_BND);
+                       Properties commonProps = new Properties();
+                       try (InputStream in = Files.newInputStream(commonBnd)) {
+                               commonProps.load(in);
+                       }
+
+                       String m2Version = commonProps.getProperty(SLC_ORIGIN_M2.toString());
+                       if (!m2Version.startsWith(":")) {
+                               throw new IllegalStateException("Only the M2 version can be specified: " + m2Version);
+                       }
+                       m2Version = m2Version.substring(1);
+
+                       // String license = commonProps.getProperty(BUNDLE_LICENSE.toString());
+
+                       DirectoryStream<Path> ds = Files.newDirectoryStream(duDir,
+                                       (p) -> p.getFileName().toString().endsWith(".bnd")
+                                                       && !p.getFileName().toString().equals(COMMON_BND));
+                       for (Path p : ds) {
+                               Properties fileProps = new Properties();
+                               try (InputStream in = Files.newInputStream(p)) {
+                                       fileProps.load(in);
+                               }
+                               String m2Coordinates = fileProps.getProperty(SLC_ORIGIN_M2.toString());
+                               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);
+                                       }
+                               }
+
+                               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<String, String> 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;
+                                       String value = fileProps.getProperty(key.toString());
+                                       Object previousValue = mergeProps.put(key.toString(), value);
+                                       if (previousValue != null) {
+                                               logger.log(Level.WARNING,
+                                                               downloaded + ": " + key + " was " + previousValue + ", overridden with " + value);
+                                       }
+                               }
+                               mergeProps.put(ManifestConstants.SLC_ORIGIN_M2.toString(), artifact.toM2Coordinates());
+                               Path targetBundleDir = processBndJar(downloaded, targetCategoryBase, mergeProps, artifact);
+//                             logger.log(Level.DEBUG, () -> "Processed " + downloaded);
+
+                               // sources
+                               downloadAndProcessM2Sources(artifact, targetBundleDir);
+
+                               createJar(targetBundleDir);
+                       }
+               } catch (IOException e) {
+                       throw new RuntimeException("Cannot process " + duDir, e);
+               }
+
+       }
+
+       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);
+
+       }
+
+       protected Path processBndJar(Path downloaded, Path targetCategoryBase, Properties fileProps,
+                       DefaultArtifact artifact) {
+
+               try {
+                       Map<String, String> additionalEntries = new TreeMap<>();
+                       boolean doNotModify = Boolean.parseBoolean(fileProps
+                                       .getOrDefault(ManifestConstants.SLC_ORIGIN_MANIFEST_NOT_MODIFIED.toString(), "false").toString());
+
+                       if (doNotModify) {
+                               fileEntries: for (Object key : fileProps.keySet()) {
+                                       if (ManifestConstants.SLC_ORIGIN_M2.toString().equals(key))
+                                               continue fileEntries;
+                                       String value = fileProps.getProperty(key.toString());
+                                       additionalEntries.put(key.toString(), value);
+                               }
+                       } else {
+                               if (artifact != null) {
+                                       if (!fileProps.containsKey(BUNDLE_SYMBOLICNAME.toString())) {
+                                               fileProps.put(BUNDLE_SYMBOLICNAME.toString(), artifact.getName());
+                                       }
+                                       if (!fileProps.containsKey(BUNDLE_VERSION.toString())) {
+                                               fileProps.put(BUNDLE_VERSION.toString(), artifact.getVersion());
+                                       }
+                               }
+
+                               if (!fileProps.containsKey(EXPORT_PACKAGE.toString())) {
+                                       fileProps.put(EXPORT_PACKAGE.toString(),
+                                                       "*;version=\"" + fileProps.getProperty(BUNDLE_VERSION.toString()) + "\"");
+                               }
+//                             if (!fileProps.contains(IMPORT_PACKAGE.toString())) {
+//                                     fileProps.put(IMPORT_PACKAGE.toString(), "*");
+//                             }
+
+                               try (Analyzer bndAnalyzer = new Analyzer()) {
+                                       bndAnalyzer.setProperties(fileProps);
+                                       Jar jar = new Jar(downloaded.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
+                                               additionalEntries.put(key.toString(), value.toString());
+                                               logger.log(DEBUG, () -> key + "=" + value);
+
+                                       }
+                               }
+
+//                             try (Builder bndBuilder = new Builder()) {
+//                                     Jar jar = new Jar(downloaded.toFile());
+//                                     bndBuilder.addClasspath(jar);
+//                                     Path targetBundleDir = targetCategoryBase.resolve(artifact.getName() + "." + artifact.getBranch());
+//
+//                                     Jar target = new Jar(targetBundleDir.toFile());
+//                                     bndBuilder.setJar(target);
+//                                     return targetBundleDir;
+//                             }
+                       }
+                       Path targetBundleDir = processBundleJar(downloaded, targetCategoryBase, additionalEntries);
+                       logger.log(Level.DEBUG, () -> "Processed " + downloaded);
+                       return targetBundleDir;
+               } catch (Exception e) {
+                       throw new RuntimeException("Cannot BND process " + downloaded, e);
+               }
+
+       }
+
+       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);
+                       } 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);
+                       }
+               }
+
+       }
+
        public void processEclipseArchive(Path duDir) {
                try {
                        String category = duDir.getParent().getFileName().toString();
@@ -58,7 +311,7 @@ public class A2Factory {
                        Files.createDirectories(targetCategoryBase);
                        Files.createDirectories(originBase);
 
-                       Path commonBnd = duDir.resolve("common.bnd");
+                       Path commonBnd = duDir.resolve(COMMON_BND);
                        Properties commonProps = new Properties();
                        try (InputStream in = Files.newInputStream(commonBnd)) {
                                commonProps.load(in);
@@ -97,7 +350,7 @@ public class A2Factory {
                                                                logger.log(Level.DEBUG, () -> "Processed source " + file);
 
                                                        } else {
-                                                               processBundleJar(file, targetCategoryBase);
+                                                               processBundleJar(file, targetCategoryBase, new HashMap<>());
                                                                logger.log(Level.DEBUG, () -> "Processed " + file);
                                                        }
                                                        continue pathMatchers;
@@ -106,18 +359,54 @@ public class A2Factory {
                                        return super.visitFile(file, attrs);
                                }
                        });
+
+                       DirectoryStream<Path> dirs = Files.newDirectoryStream(targetCategoryBase, (p) -> Files.isDirectory(p));
+                       for (Path dir : dirs) {
+                               createJar(dir);
+                       }
                } catch (IOException e) {
                        throw new RuntimeException("Cannot process " + duDir, e);
                }
 
        }
 
-       protected void processBundleJar(Path file, Path targetBase) throws IOException {
+       protected Path processBundleJar(Path file, Path targetBase, Map<String, String> entries) throws IOException {
                NameVersion nameVersion;
                Path targetBundleDir;
                try (JarInputStream jarIn = new JarInputStream(Files.newInputStream(file), false)) {
-                       Manifest manifest = jarIn.getManifest();
-                       nameVersion = nameVersionFromManifest(manifest);
+                       Manifest manifest = new Manifest(jarIn.getManifest());
+
+                       // remove problematic entries in MANIFEST
+                       manifest.getEntries().clear();
+//                     Set<String> entriesToDelete = new HashSet<>();
+//                     for (String key : manifest.getEntries().keySet()) {
+////                           logger.log(DEBUG, "## " + key);
+//                             Attributes attrs = manifest.getAttributes(key);
+//                             for (Object attrName : attrs.keySet()) {
+////                                   logger.log(DEBUG, attrName + "=" + attrs.get(attrName));
+//                                     if ("Specification-Version".equals(attrName.toString())
+//                                                     || "Implementation-Version".equals(attrName.toString())) {
+//                                             entriesToDelete.add(key);
+//
+//                                     }
+//                             }
+//                     }
+//                     for (String key : entriesToDelete) {
+//                             manifest.getEntries().remove(key);
+//                     }
+
+                       String symbolicNameFromEntries = entries.get(BUNDLE_SYMBOLICNAME.toString());
+                       String versionFromEntries = entries.get(BUNDLE_VERSION.toString());
+
+                       if (symbolicNameFromEntries != null && versionFromEntries != null) {
+                               nameVersion = new DefaultNameVersion(symbolicNameFromEntries, versionFromEntries);
+                       } else {
+                               nameVersion = nameVersionFromManifest(manifest);
+                               if (versionFromEntries != null && !nameVersion.getVersion().equals(versionFromEntries)) {
+                                       logger.log(Level.WARNING, "Original version is " + nameVersion.getVersion()
+                                                       + " while new version is " + versionFromEntries);
+                               }
+                       }
                        targetBundleDir = targetBase.resolve(nameVersion.getName() + "." + nameVersion.getBranch());
 
                        // TODO make it less dangerous?
@@ -130,6 +419,8 @@ public class A2Factory {
                        entries: while ((entry = jarIn.getNextJarEntry()) != null) {
                                if (entry.isDirectory())
                                        continue entries;
+                               if (entry.getName().endsWith(".RSA") || entry.getName().endsWith(".SF"))
+                                       continue entries;
                                Path target = targetBundleDir.resolve(entry.getName());
                                Files.createDirectories(target.getParent());
                                Files.copy(jarIn, target);
@@ -139,11 +430,19 @@ public class A2Factory {
                        // copy MANIFEST
                        Path manifestPath = targetBundleDir.resolve("META-INF/MANIFEST.MF");
                        Files.createDirectories(manifestPath.getParent());
+                        for (String key : entries.keySet()) {
+                               String value = entries.get(key);
+                               Object previousValue = manifest.getMainAttributes().putValue(key, value);
+                               if (previousValue != null && !previousValue.equals(value)) {
+                                       logger.log(Level.WARNING,
+                                                       file.getFileName() + ": " + key + " was " + previousValue + ", overridden with " + value);
+                               }
+                       }
                        try (OutputStream out = Files.newOutputStream(manifestPath)) {
                                manifest.write(out);
                        }
                }
-
+               return targetBundleDir;
        }
 
        protected void processEclipseSourceJar(Path file, Path targetBase) throws IOException {
@@ -215,6 +514,8 @@ public class A2Factory {
                Attributes attrs = manifest.getMainAttributes();
                // symbolic name
                String symbolicName = attrs.getValue(ManifestConstants.BUNDLE_SYMBOLICNAME.toString());
+               if (symbolicName == null)
+                       return null;
                // make sure there is no directive
                symbolicName = symbolicName.split(";")[0];
 
@@ -237,7 +538,7 @@ public class A2Factory {
                }
                if (urlBases == null)
                        try {
-                               return download(uri, dir, null);
+                               return download(new URL(uri), dir, null);
                        } catch (FileNotFoundException e) {
                                throw new FileNotFoundException("Cannot find " + uri);
                        }
@@ -245,7 +546,7 @@ public class A2Factory {
                // try to download
                for (String urlBase : urlBases) {
                        String relativePath = uri.substring(uriPrefix.length());
-                       String url = urlBase + relativePath;
+                       URL url = new URL(urlBase + relativePath);
                        try {
                                return download(url, dir, null);
                        } catch (FileNotFoundException e) {
@@ -260,36 +561,74 @@ public class A2Factory {
 //             
 //     }
 
-       public Path download(String url, Path dir, String name) throws IOException {
+       protected Path download(URL url, Path dir, String name) throws IOException {
 
                Path dest;
-               URL u = new URL(url);
                if (name == null) {
-                       name = u.getPath().substring(u.getPath().lastIndexOf('/') + 1);
+                       name = url.getPath().substring(url.getPath().lastIndexOf('/') + 1);
                }
 
                dest = dir.resolve(name);
                if (Files.exists(dest)) {
-                       logger.log(Level.DEBUG, () -> "File " + dest + " already exists for " + url + ", not downloading again.");
+                       logger.log(Level.TRACE, () -> "File " + dest + " already exists for " + url + ", not downloading again");
                        return dest;
                }
 
-               try (InputStream in = u.openStream()) {
+               try (InputStream in = url.openStream()) {
                        Files.copy(in, dest);
+                       logger.log(Level.DEBUG, () -> "Downloaded " + dest + " from " + url);
                }
                return dest;
        }
 
+       protected Path createJar(Path bundleDir) throws IOException {
+               Path jarPath = bundleDir.getParent().resolve(bundleDir.getFileName() + ".jar");
+               Path manifestPath = bundleDir.resolve("META-INF/MANIFEST.MF");
+               Manifest manifest;
+               try (InputStream in = Files.newInputStream(manifestPath)) {
+                       manifest = new Manifest(in);
+               }
+               try (JarOutputStream jarOut = new JarOutputStream(Files.newOutputStream(jarPath), manifest)) {
+                       Files.walkFileTree(bundleDir, new SimpleFileVisitor<Path>() {
+
+                               @Override
+                               public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
+                                       if (file.getFileName().toString().equals("MANIFEST.MF"))
+                                               return super.visitFile(file, attrs);
+                                       JarEntry entry = new JarEntry(bundleDir.relativize(file).toString());
+                                       jarOut.putNextEntry(entry);
+                                       Files.copy(file, jarOut);
+                                       return super.visitFile(file, attrs);
+                               }
+
+                       });
+               }
+               deleteDirectory(bundleDir);
+               return jarPath;
+       }
+
        public static void main(String[] args) {
-               Path originBase = Paths.get("../output/origin").toAbsolutePath();
-               Path factoryBase = Paths.get("../output/a2").toAbsolutePath();
+               Path originBase = Paths.get("../output/origin").toAbsolutePath().normalize();
+               Path factoryBase = Paths.get("../output/a2").toAbsolutePath().normalize();
                A2Factory factory = new A2Factory(originBase, factoryBase);
 
-               Path descriptorsBase = Paths.get("../tp").toAbsolutePath();
+               Path descriptorsBase = Paths.get("../tp").toAbsolutePath().normalize();
+
+//             factory.processSingleM2ArtifactDistributionUnit(descriptorsBase.resolve("org.argeo.tp.apache").resolve("org.apache.xml.resolver.bnd"));
+//             factory.processM2BasedDistributionUnit(descriptorsBase.resolve("org.argeo.tp/slf4j"));
+//             System.exit(0);
 
+               // Eclipse
                factory.processEclipseArchive(
                                descriptorsBase.resolve("org.argeo.tp.eclipse.equinox").resolve("eclipse-equinox"));
                factory.processEclipseArchive(descriptorsBase.resolve("org.argeo.tp.eclipse.rap").resolve("eclipse-rap"));
                factory.processEclipseArchive(descriptorsBase.resolve("org.argeo.tp.eclipse.rcp").resolve("eclipse-rcp"));
+
+               // Maven
+               factory.processCategory(descriptorsBase.resolve("org.argeo.tp.sdk"));
+               factory.processCategory(descriptorsBase.resolve("org.argeo.tp"));
+               factory.processCategory(descriptorsBase.resolve("org.argeo.tp.apache"));
+               factory.processCategory(descriptorsBase.resolve("org.argeo.tp.jetty"));
+               factory.processCategory(descriptorsBase.resolve("org.argeo.tp.jcr"));
        }
 }