Remove factory
authorMathieu <mbaudier@argeo.org>
Wed, 30 Nov 2022 05:43:00 +0000 (06:43 +0100)
committerMathieu <mbaudier@argeo.org>
Wed, 30 Nov 2022 05:43:00 +0000 (06:43 +0100)
org.argeo.slc.factory/.classpath [deleted file]
org.argeo.slc.factory/.project [deleted file]
org.argeo.slc.factory/bnd.bnd [deleted file]
org.argeo.slc.factory/build.properties [deleted file]
org.argeo.slc.factory/src/org/argeo/slc/factory/A2Factory.java [deleted file]
org.argeo.slc.factory/src/org/argeo/slc/factory/m2/Artifact.java [deleted file]
org.argeo.slc.factory/src/org/argeo/slc/factory/m2/DefaultArtifact.java [deleted file]
org.argeo.slc.factory/src/org/argeo/slc/factory/m2/MavenConventionsUtils.java [deleted file]

diff --git a/org.argeo.slc.factory/.classpath b/org.argeo.slc.factory/.classpath
deleted file mode 100644 (file)
index e801ebf..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
-       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-       <classpathentry kind="src" path="src"/>
-       <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/org.argeo.slc.factory/.project b/org.argeo.slc.factory/.project
deleted file mode 100644 (file)
index d0f4daf..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-       <name>org.argeo.slc.factory</name>
-       <comment></comment>
-       <projects>
-       </projects>
-       <buildSpec>
-               <buildCommand>
-                       <name>org.eclipse.jdt.core.javabuilder</name>
-                       <arguments>
-                       </arguments>
-               </buildCommand>
-               <buildCommand>
-                       <name>org.eclipse.pde.ManifestBuilder</name>
-                       <arguments>
-                       </arguments>
-               </buildCommand>
-               <buildCommand>
-                       <name>org.eclipse.pde.SchemaBuilder</name>
-                       <arguments>
-                       </arguments>
-               </buildCommand>
-       </buildSpec>
-       <natures>
-               <nature>org.eclipse.pde.PluginNature</nature>
-               <nature>org.eclipse.jdt.core.javanature</nature>
-       </natures>
-</projectDescription>
diff --git a/org.argeo.slc.factory/bnd.bnd b/org.argeo.slc.factory/bnd.bnd
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/org.argeo.slc.factory/build.properties b/org.argeo.slc.factory/build.properties
deleted file mode 100644 (file)
index 6050127..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .
-additional.bundles = org.argeo.init,\
-                     org.slf4j.api
\ No newline at end of file
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
deleted file mode 100644 (file)
index 1174b8e..0000000
+++ /dev/null
@@ -1,1066 +0,0 @@
-package org.argeo.slc.factory;
-
-import static java.lang.System.Logger.Level.DEBUG;
-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.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;
-import java.nio.file.Files;
-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;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-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 java.util.zip.Deflater;
-
-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;
-
-import aQute.bnd.osgi.Analyzer;
-import aQute.bnd.osgi.Jar;
-
-/** The central class for A2 packaging. */
-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;
-       private Path a2LibBase;
-       private Path descriptorsBase;
-
-       private Properties uris = new Properties();
-
-       private boolean includeSources = true;
-
-       /** key is URI prefix, value list of base URLs */
-       private Map<String, List<String>> mirrors = new HashMap<String, List<String>>();
-
-       public A2Factory(Path a2Base, Path descriptorsBase, boolean includeSources) {
-               Objects.requireNonNull(a2Base);
-               Objects.requireNonNull(descriptorsBase);
-               this.originBase = Paths.get(System.getProperty("user.home"), ".cache", "argeo/slc/origin");
-               this.a2Base = a2Base;
-               this.a2LibBase = a2Base.resolve("lib");
-               this.descriptorsBase = descriptorsBase;
-               if (!Files.exists(this.descriptorsBase))
-                       throw new IllegalArgumentException(this.descriptorsBase + " does not exist");
-               this.includeSources = includeSources;
-
-               Path urisPath = this.descriptorsBase.resolve("uris.properties");
-               if (Files.exists(urisPath)) {
-                       try (InputStream in = Files.newInputStream(urisPath)) {
-                               uris.load(in);
-                       } catch (IOException e) {
-                               throw new IllegalStateException("Cannot load " + urisPath, e);
-                       }
-               }
-
-               // TODO make it configurable
-               List<String> eclipseMirrors = new ArrayList<>();
-               eclipseMirrors.add("https://archive.eclipse.org/");
-               eclipseMirrors.add("http://ftp-stud.hs-esslingen.de/Mirrors/eclipse/");
-               eclipseMirrors.add("http://ftp.fau.de/eclipse/");
-
-               mirrors.put("http://www.eclipse.org/downloads", eclipseMirrors);
-       }
-
-       /*
-        * MAVEN ORIGIN
-        */
-
-       /** Process a whole category/group id. */
-       public void processCategory(Path categoryRelativePath) {
-               try {
-                       Path targetCategoryBase = descriptorsBase.resolve(categoryRelativePath);
-                       DirectoryStream<Path> bnds = Files.newDirectoryStream(targetCategoryBase,
-                                       (p) -> p.getFileName().toString().endsWith(".bnd") && !p.getFileName().toString().equals(COMMON_BND)
-                                                       && !p.getFileName().toString().equals(MERGE_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 " + categoryRelativePath, e);
-               }
-       }
-
-       /** 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);
-
-                       Properties fileProps = new Properties();
-                       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())) {
-                               // 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.mavenRepoUrl(repoStr, artifact);
-                       Path downloaded = download(url, originBase, artifact);
-
-                       Path targetBundleDir = processBndJar(downloaded, targetCategoryBase, fileProps, artifact);
-
-                       downloadAndProcessM2Sources(repoStr, artifact, targetBundleDir);
-
-                       createJar(targetBundleDir);
-               } catch (Exception e) {
-                       throw new RuntimeException("Cannot process " + bndFile, e);
-               }
-       }
-
-       /** 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)) {
-                               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);
-                       }
-
-                       String m2Version = commonProps.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);
-
-                       DirectoryStream<Path> ds = Files.newDirectoryStream(duDir,
-                                       (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)) {
-                                       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);
-
-                               // prepare manifest entries
-                               Properties mergeProps = new Properties();
-                               mergeProps.putAll(commonProps);
-
-                               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,
-                                                               commonBnd + ": " + key + " was " + previousValue + ", overridden with " + value);
-                                       }
-                               }
-                               mergeProps.put(ManifestConstants.SLC_ORIGIN_M2.toString(), artifact.toM2Coordinates());
-                               if (!mergeProps.containsKey(BUNDLE_SYMBOLICNAME.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(repoStr, artifact, targetBundleDir);
-
-                               createJar(targetBundleDir);
-                       }
-               } catch (IOException e) {
-                       throw new RuntimeException("Cannot process " + duDir, e);
-               }
-
-       }
-
-       /** 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);
-               }
-
-               // Version
-               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);
-               mergeProps.put(ManifestConstants.BUNDLE_VERSION.toString(), m2Version);
-
-               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;
-                                       else if (entry.getName().endsWith(".RSA") || entry.getName().endsWith(".SF"))
-                                               continue entries;
-                                       else if (entry.getName().startsWith("META-INF/versions/"))
-                                               continue entries;
-                                       else if (entry.getName().startsWith("META-INF/maven/"))
-                                               continue entries;
-                                       else if (entry.getName().equals("module-info.class"))
-                                               continue entries;
-                                       else if (entry.getName().equals("META-INF/NOTICE"))
-                                               continue entries;
-                                       else if (entry.getName().equals("META-INF/NOTICE.txt"))
-                                               continue entries;
-                                       else if (entry.getName().equals("META-INF/LICENSE"))
-                                               continue entries;
-                                       else if (entry.getName().equals("META-INF/LICENSE.md"))
-                                               continue entries;
-                                       else if (entry.getName().equals("META-INF/LICENSE-notice.md"))
-                                               continue entries;
-                                       else if (entry.getName().equals("META-INF/DEPENDENCIES"))
-                                               continue entries;
-                                       if (entry.getName().startsWith(".cache/")) // Apache SSHD
-                                               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, artifact.getArtifactId() + " - 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 + " from " + artifact + " already exists");
-                                               }
-                                       }
-                                       logger.log(Level.TRACE, () -> "Copied " + target);
-                               }
-
-                       }
-                       downloadAndProcessM2Sources(repoStr, artifact, targetBundleDir);
-               }
-
-               // additional service files
-               Path servicesDir = duDir.resolve("services");
-               if (Files.exists(servicesDir)) {
-                       for (Path p : Files.newDirectoryStream(servicesDir)) {
-                               Path target = targetBundleDir.resolve("META-INF/services/").resolve(p.getFileName());
-                               try (InputStream in = Files.newInputStream(p);
-                                               OutputStream out = Files.newOutputStream(target, StandardOpenOption.APPEND);) {
-                                       out.write("\n".getBytes());
-                                       in.transferTo(out);
-                                       if (logger.isLoggable(DEBUG))
-                                               logger.log(DEBUG, "Appended " + p);
-                               }
-                       }
-               }
-
-               Map<String, String> 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);
-               }
-
-//             // Use Maven version as Bundle-Version
-//             String bundleVersion = manifest.getMainAttributes().getValue(ManifestConstants.BUNDLE_VERSION.toString());
-//             if (bundleVersion == null || bundleVersion.trim().equals("0")) {
-//                     // TODO check why it is sometimes set to "0"
-//                     manifest.getMainAttributes().putValue(ManifestConstants.BUNDLE_VERSION.toString(), m2Version);
-//             }
-               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) {
-
-               try {
-                       Map<String, String> additionalEntries = new TreeMap<>();
-                       boolean doNotModify = Boolean.parseBoolean(fileProps
-                                       .getOrDefault(ManifestConstants.SLC_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))
-                                               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);
-               }
-
-       }
-
-       /** Download and integrates sources for a single Maven artifact. */
-       protected void downloadAndProcessM2Sources(String repoStr, DefaultArtifact artifact, Path targetBundleDir)
-                       throws IOException {
-               if (!includeSources)
-                       return;
-               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.TRACE, () -> "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);
-                       } 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;
-                               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());
-                               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 relativePath) {
-               try {
-                       Path categoryRelativePath = relativePath.getParent();
-                       // String category = categoryRelativePath.getFileName().toString();
-                       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))) {
-                               deleteDirectory(dir);
-                       }
-
-                       Files.createDirectories(originBase);
-
-                       Path duDir = descriptorsBase.resolve(relativePath);
-                       Path commonBnd = duDir.resolve(COMMON_BND);
-                       Properties commonProps = new Properties();
-                       try (InputStream in = Files.newInputStream(commonBnd)) {
-                               commonProps.load(in);
-                       }
-                       String url = commonProps.getProperty(ManifestConstants.SLC_ORIGIN_URI.toString());
-                       if (url == null) {
-                               url = uris.getProperty(relativePath.getFileName().toString());
-                               if (url == null)
-                                       throw new IllegalStateException("No url available for " + duDir);
-                               commonProps.put(ManifestConstants.SLC_ORIGIN_URI.toString(), url);
-                       }
-                       Path downloaded = tryDownload(url, originBase);
-
-                       FileSystem zipFs = FileSystems.newFileSystem(downloaded, (ClassLoader) null);
-
-                       // filters
-                       List<PathMatcher> 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);
-                               includeMatchers.add(pathMatcher);
-                       }
-
-                       List<PathMatcher> 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<Path>() {
-
-                               @Override
-                               public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
-                                       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 (includeSources && file.getFileName().toString().contains(".source_")) {
-                                                               processEclipseSourceJar(file, targetCategoryBase);
-                                                               logger.log(Level.DEBUG, () -> "Processed source " + file);
-
-                                                       } else {
-                                                               processBundleJar(file, targetCategoryBase, new HashMap(commonProps));
-                                                               logger.log(Level.DEBUG, () -> "Processed " + file);
-                                                       }
-                                                       break includeMatchers;
-                                               }
-                                       }
-                                       return FileVisitResult.CONTINUE;
-                               }
-                       });
-
-                       DirectoryStream<Path> dirs = Files.newDirectoryStream(targetCategoryBase,
-                                       (p) -> Files.isDirectory(p) && p.getFileName().toString().indexOf('.') >= 0);
-                       for (Path dir : dirs) {
-                               createJar(dir);
-                       }
-               } catch (IOException e) {
-                       throw new RuntimeException("Cannot process " + relativePath, e);
-               }
-
-       }
-
-       /** 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<String, String> entries) throws IOException {
-               DefaultNameVersion nameVersion;
-               Path targetBundleDir;
-               try (JarInputStream jarIn = new JarInputStream(Files.newInputStream(file), false)) {
-                       Manifest sourceManifest = jarIn.getManifest();
-                       Manifest manifest = sourceManifest != null ? new Manifest(sourceManifest) : new Manifest();
-
-                       // 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 ourSymbolicName = entries.get(BUNDLE_SYMBOLICNAME.toString());
-                       String ourVersion = entries.get(BUNDLE_VERSION.toString());
-
-                       if (ourSymbolicName != null && ourVersion != null) {
-                               nameVersion = new DefaultNameVersion(ourSymbolicName, ourVersion);
-                       } else {
-                               nameVersion = nameVersionFromManifest(manifest);
-                               if (ourVersion != null && !nameVersion.getVersion().equals(ourVersion)) {
-                                       logger.log(Level.WARNING,
-                                                       "Original version is " + nameVersion.getVersion() + " while new version is " + ourVersion);
-                                       entries.put(BUNDLE_VERSION.toString(), ourVersion);
-                               }
-                               if (ourSymbolicName != null) {
-                                       // we always force our symbolic name
-                                       nameVersion.setName(ourSymbolicName);
-                               }
-                       }
-                       targetBundleDir = targetBase.resolve(nameVersion.getName() + "." + nameVersion.getBranch());
-
-                       // force Java 9 module name
-                       entries.put(ManifestConstants.AUTOMATIC_MODULE_NAME.toString(), nameVersion.getName());
-
-                       // TODO make it less dangerous?
-//                     if (Files.exists(targetBundleDir)) {
-//                             deleteDirectory(targetBundleDir);
-//                     }
-
-                       boolean isNative = false;
-                       String os = null;
-                       String arch = null;
-                       if (targetBundleDir.startsWith(a2LibBase)) {
-                               isNative = true;
-                               Path libRelativePath = a2LibBase.relativize(targetBundleDir);
-                               os = libRelativePath.getName(0).toString();
-                               arch = libRelativePath.getName(1).toString();
-                       }
-
-                       // copy entries
-                       JarEntry entry;
-                       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().endsWith("module-info.class")) // skip Java 9 module info
-                                       continue entries;
-                               if (entry.getName().startsWith("META-INF/versions/")) // skip multi-version
-                                       continue entries;
-                               // skip file system providers as they cause issues with native image
-                               if (entry.getName().startsWith("META-INF/services/java.nio.file.spi.FileSystemProvider"))
-                                       continue entries;
-                               if (entry.getName().startsWith("OSGI-OPT/src/")) // skip embedded sources
-                                       continue entries;
-                               Path target = targetBundleDir.resolve(entry.getName());
-                               Files.createDirectories(target.getParent());
-                               Files.copy(jarIn, target);
-
-                               // native libraries
-                               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")) {
-                                               if (arch.equals("x86_64"))
-                                                       arch = "x86-64";
-                                               if (os.equals("macosx"))
-                                                       os = "darwin";
-                                               if (target.getParent().getFileName().toString().equals(os + "-" + arch)) {
-                                                       copyDll = true;
-                                               }
-                                               targetDll = categoryDir.resolve(target.getFileName());
-                                       } else {
-                                               copyDll = true;
-                                       }
-                                       if (copyDll) {
-                                               Files.createDirectories(targetDll.getParent());
-                                               if (Files.exists(targetDll))
-                                                       Files.delete(targetDll);
-                                               Files.copy(target, targetDll);
-                                       }
-                                       Files.delete(target);
-                               }
-                               logger.log(Level.TRACE, () -> "Copied " + target);
-                       }
-
-                       // 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)) {
-                                       if (ManifestConstants.IMPORT_PACKAGE.toString().equals(key)
-                                                       || ManifestConstants.EXPORT_PACKAGE.toString().equals(key))
-                                               logger.log(Level.TRACE, file.getFileName() + ": " + key + " was modified");
-                                       else
-                                               logger.log(Level.WARNING, file.getFileName() + ": " + key + " was " + previousValue
-                                                               + ", overridden with " + value);
-                               }
-
-                               // 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);
-                                       }
-                       }
-                       try (OutputStream out = Files.newOutputStream(manifestPath)) {
-                               manifest.write(out);
-                       }
-               }
-               return targetBundleDir;
-       }
-
-       /*
-        * UTILITIES
-        */
-
-       /** Recursively deletes a directory. */
-       private static void deleteDirectory(Path path) throws IOException {
-               if (!Files.exists(path))
-                       return;
-               Files.walkFileTree(path, new SimpleFileVisitor<Path>() {
-                       @Override
-                       public FileVisitResult postVisitDirectory(Path directory, IOException e) throws IOException {
-                               if (e != null)
-                                       throw e;
-                               Files.delete(directory);
-                               return FileVisitResult.CONTINUE;
-                       }
-
-                       @Override
-                       public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
-                               Files.delete(file);
-                               return FileVisitResult.CONTINUE;
-                       }
-               });
-       }
-
-       /** Extract name/version from a MANIFEST. */
-       protected DefaultNameVersion nameVersionFromManifest(Manifest manifest) {
-               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];
-
-               String version = attrs.getValue(ManifestConstants.BUNDLE_VERSION.toString());
-               return new DefaultNameVersion(symbolicName, version);
-       }
-
-       /** Try to download from an URI. */
-       protected Path tryDownload(String uri, Path dir) throws IOException {
-               // find mirror
-               List<String> urlBases = null;
-               String uriPrefix = null;
-               uriPrefixes: for (String uriPref : mirrors.keySet()) {
-                       if (uri.startsWith(uriPref)) {
-                               if (mirrors.get(uriPref).size() > 0) {
-                                       urlBases = mirrors.get(uriPref);
-                                       uriPrefix = uriPref;
-                                       break uriPrefixes;
-                               }
-                       }
-               }
-               if (urlBases == null)
-                       try {
-                               return download(new URL(uri), dir);
-                       } catch (FileNotFoundException e) {
-                               throw new FileNotFoundException("Cannot find " + uri);
-                       }
-
-               // try to download
-               for (String urlBase : urlBases) {
-                       String relativePath = uri.substring(uriPrefix.length());
-                       URL url = new URL(urlBase + relativePath);
-                       try {
-                               return download(url, dir);
-                       } catch (FileNotFoundException e) {
-                               logger.log(Level.WARNING, "Cannot download " + url + ", trying another mirror");
-                       }
-               }
-               throw new FileNotFoundException("Cannot find " + uri);
-       }
-
-//     protected String simplifyName(URL u) {
-//     String  name = u.getPath().substring(u.getPath().lastIndexOf('/') + 1);
-//             
-//     }
-
-       /** 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;
-               if (name == null) {
-                       name = url.getPath().substring(url.getPath().lastIndexOf('/') + 1);
-               }
-
-               dest = dir.resolve(name);
-               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()) {
-                       Files.copy(in, dest);
-                       logger.log(Level.DEBUG, () -> "Downloaded " + dest + " from " + url);
-               }
-               return dest;
-       }
-
-       /** Create a JAR file from a directory. */
-       protected Path createJar(Path bundleDir) throws IOException {
-               // Remove from source the resources already in the jar file
-//             Path srcDir = bundleDir.resolve("OSGI-OPT/src");
-//             Files.walkFileTree(srcDir, new SimpleFileVisitor<Path>() {
-//
-//                     @Override
-//                     public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
-//                             // always keep .java file
-//                             if (file.getFileName().toString().endsWith(".java"))
-//                                     return super.visitFile(file, attrs);
-//
-//                             Path relPath = srcDir.relativize(file);
-//                             Path bundlePath = bundleDir.resolve(relPath);
-//                             if (Files.exists(bundlePath)) {
-//                                     Files.delete(file);
-//                                     logger.log(DEBUG, () -> "Removed " + file + " from sources.");
-//                             }
-//                             return super.visitFile(file, attrs);
-//                     }
-//
-//             });
-
-               // Create the jar
-               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)) {
-                       jarOut.setLevel(Deflater.DEFAULT_COMPRESSION);
-                       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;
-       }
-
-       /** For development purproses. */
-       public static void main(String[] args) {
-               Path factoryBase = Paths.get("../../output/a2").toAbsolutePath().normalize();
-               Path descriptorsBase = Paths.get("../tp").toAbsolutePath().normalize();
-               A2Factory factory = new A2Factory(factoryBase, descriptorsBase, true);
-
-//             factory.processSingleM2ArtifactDistributionUnit(descriptorsBase.resolve("org.argeo.tp.apache").resolve("org.apache.xml.resolver.bnd"));
-               factory.processM2BasedDistributionUnit(descriptorsBase.resolve("org.argeo.tp.apache/apache-sshd"));
-//             factory.processM2BasedDistributionUnit(descriptorsBase.resolve("org.argeo.tp.jetty/jetty"));
-//             factory.processCategory(descriptorsBase.resolve("org.argeo.tp.osgi"));
-//             factory.processCategory(descriptorsBase.resolve("org.argeo.tp.eclipse.rcp"));
-//             factory.processCategory(descriptorsBase.resolve("org.argeo.tp"));
-//             factory.processCategory(descriptorsBase.resolve("org.argeo.tp.apache"));
-//             factory.processCategory(descriptorsBase.resolve("org.argeo.tp.sdk"));
-//             factory.processCategory(descriptorsBase.resolve("org.argeo.tp.formats"));
-//             factory.processCategory(descriptorsBase.resolve("org.argeo.tp.gis"));
-               System.exit(1);
-
-               // SDK
-               factory.processCategory(Paths.get("org.argeo.tp.sdk"));
-
-               // Eclipse
-               factory.processCategory(Paths.get("osgi/api/org.argeo.tp.osgi"));
-               factory.processEclipseArchive(Paths.get("osgi/equinox/org.argeo.tp.osgi", "eclipse-equinox"));
-               factory.processEclipseArchive(Paths.get("osgi/equinox/org.argeo.tp.eclipse", "eclipse-equinox"));
-
-               factory.processEclipseArchive(Paths.get("swt/rap/org.argeo.tp.swt", "eclipse-rap"));
-               factory.processEclipseArchive(Paths.get("swt/rap/org.argeo.tp.swt.workbench", "eclipse-rap"));
-
-               factory.processEclipseArchive(Paths.get("swt/rcp/org.argeo.tp.swt", "eclipse-rcp"));
-
-               factory.processEclipseArchive(Paths.get("lib/linux/x86_64/swt/rcp/org.argeo.tp.swt", "eclipse-rcp"));
-               factory.processEclipseArchive(Paths.get("lib/linux/aarch64/swt/rcp/org.argeo.tp.swt", "eclipse-rcp"));
-               factory.processEclipseArchive(Paths.get("lib/win32/x86_64/swt/rcp/org.argeo.tp.swt", "eclipse-rcp"));
-               factory.processEclipseArchive(Paths.get("lib/macosx/x86_64/swt/rcp/org.argeo.tp.swt", "eclipse-rcp"));
-
-               factory.processEclipseArchive(Paths.get("swt/rcp/org.argeo.tp.swt", "eclipse-nebula"));
-               factory.processEclipseArchive(Paths.get("swt/rcp/org.argeo.tp.swt.workbench", "eclipse-rcp"));
-               factory.processCategory(Paths.get("swt/rcp/org.argeo.tp.swt.workbench"));
-
-               // Maven
-               factory.processCategory(Paths.get("org.argeo.tp"));
-               factory.processCategory(Paths.get("org.argeo.tp.apache"));
-               factory.processCategory(Paths.get("org.argeo.tp.jetty"));
-               factory.processCategory(Paths.get("org.argeo.tp.jcr"));
-               factory.processCategory(Paths.get("org.argeo.tp.formats"));
-               factory.processCategory(Paths.get("org.argeo.tp.poi"));
-               factory.processCategory(Paths.get("org.argeo.tp.gis"));
-       }
-}
diff --git a/org.argeo.slc.factory/src/org/argeo/slc/factory/m2/Artifact.java b/org.argeo.slc.factory/src/org/argeo/slc/factory/m2/Artifact.java
deleted file mode 100644 (file)
index 9189f08..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.argeo.slc.factory.m2;
-
-public interface Artifact {
-       String getGroupId();
-
-       String getArtifactId();
-
-       String getVersion();
-
-       default String getBaseVersion() {
-               return getVersion();
-       }
-
-//     boolean isSnapshot();
-
-       default String getClassifier() {
-               return "";
-       }
-
-       default String getExtension() {
-               return "jar";
-       }
-
-}
diff --git a/org.argeo.slc.factory/src/org/argeo/slc/factory/m2/DefaultArtifact.java b/org.argeo.slc.factory/src/org/argeo/slc/factory/m2/DefaultArtifact.java
deleted file mode 100644 (file)
index 0c3b0c1..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.argeo.slc.factory.m2;
-
-import org.argeo.slc.DefaultCategoryNameVersion;
-
-/**
- * Simple representation of an M2 artifact, not taking into account classifiers,
- * types, etc.
- */
-public class DefaultArtifact extends DefaultCategoryNameVersion implements Artifact {
-       private String classifier;
-
-       public DefaultArtifact(String m2coordinates) {
-               this(m2coordinates, null);
-       }
-
-       public DefaultArtifact(String m2coordinates, String classifier) {
-               String[] parts = m2coordinates.split(":");
-               setCategory(parts[0]);
-               setName(parts[1]);
-               if (parts.length > 2) {
-                       setVersion(parts[2]);
-               }
-               this.classifier = classifier;
-       }
-
-       @Override
-       public String getGroupId() {
-               return getCategory();
-       }
-
-       @Override
-       public String getArtifactId() {
-               return getName();
-       }
-
-       public String toM2Coordinates() {
-               return getCategory() + ":" + getName() + (getVersion() != null ? ":" + getVersion() : "");
-       }
-
-       public String getClassifier() {
-               return classifier != null ? classifier : "";
-       }
-
-}
diff --git a/org.argeo.slc.factory/src/org/argeo/slc/factory/m2/MavenConventionsUtils.java b/org.argeo.slc.factory/src/org/argeo/slc/factory/m2/MavenConventionsUtils.java
deleted file mode 100644 (file)
index b6cc34a..0000000
+++ /dev/null
@@ -1,155 +0,0 @@
-package org.argeo.slc.factory.m2;
-
-import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Set;
-
-/**
- * Static utilities around Maven which are NOT using the Maven APIs (conventions
- * based).
- */
-public class MavenConventionsUtils {
-       public final static String MAVEN_CENTRAL_BASE_URL = "https://repo1.maven.org/maven2/";
-
-       /**
-        * Path to the file identified by this artifact <b>without</b> using Maven APIs
-        * (convention based). Default location of repository (~/.m2/repository) is used
-        * here.
-        * 
-        * @see MavenConventionsUtils#artifactToFile(String, Artifact)
-        */
-       public static File artifactToFile(Artifact artifact) {
-               return artifactToFile(System.getProperty("user.home") + File.separator + ".m2" + File.separator + "repository",
-                               artifact);
-       }
-
-       /**
-        * Path to the file identified by this artifact <b>without</b> using Maven APIs
-        * (convention based).
-        * 
-        * @param repositoryPath path to the related local repository location
-        * @param artifact       the artifact
-        */
-       public static File artifactToFile(String repositoryPath, Artifact artifact) {
-               return new File(repositoryPath + File.separator + artifact.getGroupId().replace('.', File.separatorChar)
-                               + File.separator + artifact.getArtifactId() + File.separator + artifact.getVersion() + File.separator
-                               + artifactFileName(artifact)).getAbsoluteFile();
-       }
-
-       /** The file name of this artifact when stored */
-       public static String artifactFileName(Artifact artifact) {
-               return artifact.getArtifactId() + '-' + artifact.getVersion()
-                               + (artifact.getClassifier().equals("") ? "" : '-' + artifact.getClassifier()) + '.'
-                               + artifact.getExtension();
-       }
-
-       /** Absolute path to the file */
-       public static String artifactPath(String artifactBasePath, Artifact artifact) {
-               return artifactParentPath(artifactBasePath, artifact) + '/' + artifactFileName(artifact);
-       }
-
-       /** Absolute path to the file */
-       public static String artifactUrl(String repoUrl, Artifact artifact) {
-               if (repoUrl.endsWith("/"))
-                       return repoUrl + artifactPath("/", artifact).substring(1);
-               else
-                       return repoUrl + artifactPath("/", artifact);
-       }
-
-       /** Absolute path to the file */
-//     public static URL mavenCentralUrl(Artifact artifact) {
-//             return mavenRepoUrl(MAVEN_CENTRAL_BASE_URL, artifact);
-//     }
-
-       /** Absolute path to the file */
-       public static URL mavenRepoUrl(String repoBase, Artifact artifact) {
-               String url = artifactUrl(repoBase == null ? MAVEN_CENTRAL_BASE_URL : repoBase, artifact);
-               try {
-                       return new URL(url);
-               } catch (MalformedURLException e) {
-                       // it should not happen
-                       throw new IllegalStateException(e);
-               }
-       }
-
-       /** Absolute path to the directories where the files will be stored */
-       public static String artifactParentPath(String artifactBasePath, Artifact artifact) {
-               return artifactBasePath + (artifactBasePath.endsWith("/") ? "" : "/") + artifactParentPath(artifact);
-       }
-
-       /** Absolute path to the directory of this group */
-       public static String groupPath(String artifactBasePath, String groupId) {
-               return artifactBasePath + (artifactBasePath.endsWith("/") ? "" : "/") + groupId.replace('.', '/');
-       }
-
-       /** Relative path to the directories where the files will be stored */
-       public static String artifactParentPath(Artifact artifact) {
-               return artifact.getGroupId().replace('.', '/') + '/' + artifact.getArtifactId() + '/'
-                               + artifact.getBaseVersion();
-       }
-
-       public static String artifactsAsDependencyPom(Artifact pomArtifact, Set<Artifact> artifacts, Artifact parent) {
-               StringBuffer p = new StringBuffer();
-
-               // XML header
-               p.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
-               p.append(
-                               "<project xmlns=\"http://maven.apache.org/POM/4.0.0\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd\">\n");
-               p.append("<modelVersion>4.0.0</modelVersion>\n");
-
-               // Artifact
-               if (parent != null) {
-                       p.append("<parent>\n");
-                       p.append("<groupId>").append(parent.getGroupId()).append("</groupId>\n");
-                       p.append("<artifactId>").append(parent.getArtifactId()).append("</artifactId>\n");
-                       p.append("<version>").append(parent.getVersion()).append("</version>\n");
-                       p.append("</parent>\n");
-               }
-               p.append("<groupId>").append(pomArtifact.getGroupId()).append("</groupId>\n");
-               p.append("<artifactId>").append(pomArtifact.getArtifactId()).append("</artifactId>\n");
-               p.append("<version>").append(pomArtifact.getVersion()).append("</version>\n");
-               p.append("<packaging>pom</packaging>\n");
-
-               // Dependencies
-               p.append("<dependencies>\n");
-               for (Artifact a : artifacts) {
-                       p.append("\t<dependency>");
-                       p.append("<artifactId>").append(a.getArtifactId()).append("</artifactId>");
-                       p.append("<groupId>").append(a.getGroupId()).append("</groupId>");
-                       if (!a.getExtension().equals("jar"))
-                               p.append("<type>").append(a.getExtension()).append("</type>");
-                       p.append("</dependency>\n");
-               }
-               p.append("</dependencies>\n");
-
-               // Dependency management
-               p.append("<dependencyManagement>\n");
-               p.append("<dependencies>\n");
-               for (Artifact a : artifacts) {
-                       p.append("\t<dependency>");
-                       p.append("<artifactId>").append(a.getArtifactId()).append("</artifactId>");
-                       p.append("<version>").append(a.getVersion()).append("</version>");
-                       p.append("<groupId>").append(a.getGroupId()).append("</groupId>");
-                       if (a.getExtension().equals("pom")) {
-                               p.append("<type>").append(a.getExtension()).append("</type>");
-                               p.append("<scope>import</scope>");
-                       }
-                       p.append("</dependency>\n");
-               }
-               p.append("</dependencies>\n");
-               p.append("</dependencyManagement>\n");
-
-               // Repositories
-               // p.append("<repositories>\n");
-               // p.append("<repository><id>argeo</id><url>http://maven.argeo.org/argeo</url></repository>\n");
-               // p.append("</repositories>\n");
-
-               p.append("</project>\n");
-               return p.toString();
-       }
-
-       /** Singleton */
-       private MavenConventionsUtils() {
-       }
-}