]> git.argeo.org Git - gpl/argeo-slc.git/commitdiff
Implement m2 based distribution unit.
authorMathieu Baudier <mbaudier@argeo.org>
Fri, 4 Feb 2022 09:54:45 +0000 (10:54 +0100)
committerMathieu Baudier <mbaudier@argeo.org>
Fri, 4 Feb 2022 09:54:45 +0000 (10:54 +0100)
23 files changed:
org.argeo.slc.api/src/org/argeo/slc/ManifestConstants.java
org.argeo.slc.build/src/org/argeo/slc/build/A2Factory.java
org.argeo.slc.build/src/org/argeo/slc/build/m2/DefaultArtifact.java
org.argeo.slc.build/src/org/argeo/slc/build/m2/MavenConventionsUtils.java
tp/org.argeo.tp/jetty/common.bnd [new file with mode: 0644]
tp/org.argeo.tp/jetty/org.eclipse.jetty.client.bnd [new file with mode: 0644]
tp/org.argeo.tp/jetty/org.eclipse.jetty.continuation.bnd [new file with mode: 0644]
tp/org.argeo.tp/jetty/org.eclipse.jetty.http.bnd [new file with mode: 0644]
tp/org.argeo.tp/jetty/org.eclipse.jetty.io.bnd [new file with mode: 0644]
tp/org.argeo.tp/jetty/org.eclipse.jetty.jmx.bnd [new file with mode: 0644]
tp/org.argeo.tp/jetty/org.eclipse.jetty.security.bnd [new file with mode: 0644]
tp/org.argeo.tp/jetty/org.eclipse.jetty.server.bnd [new file with mode: 0644]
tp/org.argeo.tp/jetty/org.eclipse.jetty.servlet.bnd [new file with mode: 0644]
tp/org.argeo.tp/jetty/org.eclipse.jetty.servlets.bnd [new file with mode: 0644]
tp/org.argeo.tp/jetty/org.eclipse.jetty.util.bnd [new file with mode: 0644]
tp/org.argeo.tp/jetty/org.eclipse.jetty.websocket.api.bnd [new file with mode: 0644]
tp/org.argeo.tp/jetty/org.eclipse.jetty.websocket.client.bnd [new file with mode: 0644]
tp/org.argeo.tp/jetty/org.eclipse.jetty.websocket.common.bnd [new file with mode: 0644]
tp/org.argeo.tp/jetty/org.eclipse.jetty.websocket.javax.websocket.bnd [new file with mode: 0644]
tp/org.argeo.tp/jetty/org.eclipse.jetty.websocket.javax.websocket.server.bnd [new file with mode: 0644]
tp/org.argeo.tp/jetty/org.eclipse.jetty.websocket.server.bnd [new file with mode: 0644]
tp/org.argeo.tp/jetty/org.eclipse.jetty.websocket.servlet.bnd [new file with mode: 0644]
tp/org.argeo.tp/jetty/org.eclipse.jetty.xml.bnd [new file with mode: 0644]

index fb01d70452d5dff850c56b46d201e97fb99b669b..919d050d7de87bec78584349ba74bb196f1572f1 100644 (file)
@@ -4,6 +4,7 @@ public enum ManifestConstants {
        // OSGi
        BUNDLE_SYMBOLICNAME("Bundle-SymbolicName"), //
        BUNDLE_VERSION("Bundle-Version"), //
+       BUNDLE_LICENSE("Bundle-License"), //
        // SLC
        SLC_CATEGORY("SLC-Category"), //
        SLC_ORIGIN_M2("SLC-Origin-M2"), //
index d8a80d0b299c89bd4ea2833dcbf7cf06c4e8aa43..7af1d1c83280920b66130b8857a59d3c48b0ca97 100644 (file)
@@ -1,12 +1,17 @@
 package org.argeo.slc.build;
 
+import static org.argeo.slc.ManifestConstants.BUNDLE_LICENSE;
+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;
@@ -29,10 +34,14 @@ 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;
 
 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 +60,112 @@ public class A2Factory {
                mirrors.put("http://www.eclipse.org/downloads", eclipseMirrors);
        }
 
+       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(Level.DEBUG, () -> "Migrated  " + p);
+                                       }
+                               }
+
+                               artifact.setVersion(m2Version);
+                               URL url = MavenConventionsUtils.mavenCentralUrl(artifact);
+                               Path downloaded = download(url, originBase, artifact.toM2Coordinates() + ".jar");
+
+                               // prepare manifest entries
+                               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());
+                                       String previousValue = entries.put(key.toString(), value);
+                                       if (previousValue != null) {
+                                               logger.log(Level.WARNING,
+                                                               downloaded + ": " + key + " was " + previousValue + ", overridden with " + value);
+                                       }
+                               }
+                               entries.put(ManifestConstants.SLC_ORIGIN_M2.toString(), artifact.toM2Coordinates());
+                               Path targetBundleDir = processBundleJar(downloaded, targetCategoryBase, entries);
+                               logger.log(Level.DEBUG, () -> "Processed " + downloaded);
+
+                               // sources
+                               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 " + sourcesDownloaded);
+                       }
+               } catch (IOException e) {
+                       throw new RuntimeException("Cannot process " + duDir, 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 +173,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 +212,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;
@@ -112,7 +227,8 @@ public class A2Factory {
 
        }
 
-       protected void processBundleJar(Path file, Path targetBase) throws IOException {
+       protected Path processBundleJar(Path file, Path targetBase, Map<String, String> additionalManifestEntries)
+                       throws IOException {
                NameVersion nameVersion;
                Path targetBundleDir;
                try (JarInputStream jarIn = new JarInputStream(Files.newInputStream(file), false)) {
@@ -139,11 +255,19 @@ public class A2Factory {
                        // copy MANIFEST
                        Path manifestPath = targetBundleDir.resolve("META-INF/MANIFEST.MF");
                        Files.createDirectories(manifestPath.getParent());
+                       for (String key : additionalManifestEntries.keySet()) {
+                               String value = additionalManifestEntries.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 {
@@ -237,7 +361,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 +369,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 +384,38 @@ 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;
        }
 
        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.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"));
 
-               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"));
+               factory.processM2BasedDistributionUnit(descriptorsBase.resolve("org.argeo.tp").resolve("jetty"));
        }
 }
index 922a0aa444bb6fbffdad0a31e6d6a290127d72dc..bf9782216ff52a853d25f7b5ceea767857673306 100644 (file)
@@ -2,7 +2,26 @@ package org.argeo.slc.build.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() {
@@ -14,4 +33,12 @@ public class DefaultArtifact extends DefaultCategoryNameVersion implements Artif
                return getName();
        }
 
+       public String toM2Coordinates() {
+               return getCategory() + ":" + getName() + (getVersion() != null ? ":" + getVersion() : "");
+       }
+
+       public String getClassifier() {
+               return classifier != null ? classifier : "";
+       }
+
 }
index 358e2ef8f7cf37c799e99f8152ac5e3a9e92ee97..1790775ecc963ad106adfb21b417e9f939f7f388 100644 (file)
@@ -1,6 +1,8 @@
 package org.argeo.slc.build.m2;
 
 import java.io.File;
+import java.net.MalformedURLException;
+import java.net.URL;
 import java.util.Set;
 
 /**
@@ -8,10 +10,12 @@ import java.util.Set;
  * 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.
+        * 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)
         */
@@ -21,13 +25,11 @@ public class MavenConventionsUtils {
        }
 
        /**
-        * Path to the file identified by this artifact <b>without</b> using Maven
-        * APIs (convention based).
+        * 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
+        * @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)
@@ -55,6 +57,17 @@ public class MavenConventionsUtils {
                        return repoUrl + artifactPath("/", artifact);
        }
 
+       /** Absolute path to the file */
+       public static URL mavenCentralUrl(Artifact artifact) {
+               String url = artifactUrl(MAVEN_CENTRAL_BASE_URL, 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);
@@ -131,68 +144,7 @@ public class MavenConventionsUtils {
                return p.toString();
        }
 
-//     /**
-//      * Directly parses Maven POM XML format in order to find all artifacts
-//      * references under the dependency and dependencyManagement tags. This is
-//      * meant to migrate existing pom registering a lot of artifacts, not to
-//      * replace Maven resolving.
-//      */
-//     public static void gatherPomDependencies(AetherTemplate aetherTemplate, Set<Artifact> artifacts,
-//                     Artifact pomArtifact) {
-//             if (log.isDebugEnabled())
-//                     log.debug("Gather dependencies for " + pomArtifact);
-//
-//             try {
-//                     File file = aetherTemplate.getResolvedFile(pomArtifact);
-//                     DocumentBuilder documentBuilder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
-//                     Document doc = documentBuilder.parse(file);
-//
-//                     // properties
-//                     Properties props = new Properties();
-//                     props.setProperty("project.version", pomArtifact.getBaseVersion());
-//                     NodeList properties = doc.getElementsByTagName("properties");
-//                     if (properties.getLength() > 0) {
-//                             NodeList propertiesElems = properties.item(0).getChildNodes();
-//                             for (int i = 0; i < propertiesElems.getLength(); i++) {
-//                                     if (propertiesElems.item(i) instanceof Element) {
-//                                             Element property = (Element) propertiesElems.item(i);
-//                                             props.put(property.getNodeName(), property.getTextContent());
-//                                     }
-//                             }
-//                     }
-//
-//                     // dependencies (direct and dependencyManagement)
-//                     NodeList dependencies = doc.getElementsByTagName("dependency");
-//                     for (int i = 0; i < dependencies.getLength(); i++) {
-//                             Element dependency = (Element) dependencies.item(i);
-//                             String groupId = dependency.getElementsByTagName("groupId").item(0).getTextContent().trim();
-//                             String artifactId = dependency.getElementsByTagName("artifactId").item(0).getTextContent().trim();
-//                             String version = dependency.getElementsByTagName("version").item(0).getTextContent().trim();
-//                             if (version.startsWith("${")) {
-//                                     String versionKey = version.substring(0, version.length() - 1).substring(2);
-//                                     if (!props.containsKey(versionKey))
-//                                             throw new SlcException("Cannot interpret version " + version);
-//                                     version = props.getProperty(versionKey);
-//                             }
-//                             NodeList scopes = dependency.getElementsByTagName("scope");
-//                             if (scopes.getLength() > 0 && scopes.item(0).getTextContent().equals("import")) {
-//                                     // recurse
-//                                     gatherPomDependencies(aetherTemplate, artifacts,
-//                                                     new DefaultArtifact(groupId, artifactId, "pom", version));
-//                             } else {
-//                                     // TODO: deal with scope?
-//                                     // TODO: deal with type
-//                                     String type = "jar";
-//                                     Artifact artifact = new DefaultArtifact(groupId, artifactId, type, version);
-//                                     artifacts.add(artifact);
-//                             }
-//                     }
-//             } catch (Exception e) {
-//                     throw new SlcException("Cannot process " + pomArtifact, e);
-//             }
-//     }
-
-       /** Prevent instantiation */
+       /** Singleton */
        private MavenConventionsUtils() {
        }
 }
diff --git a/tp/org.argeo.tp/jetty/common.bnd b/tp/org.argeo.tp/jetty/common.bnd
new file mode 100644 (file)
index 0000000..14a0f68
--- /dev/null
@@ -0,0 +1,2 @@
+Bundle-License: Apache-2.0
+SLC-Origin-M2: :9.4.24.v20191120
diff --git a/tp/org.argeo.tp/jetty/org.eclipse.jetty.client.bnd b/tp/org.argeo.tp/jetty/org.eclipse.jetty.client.bnd
new file mode 100644 (file)
index 0000000..8bce1ab
--- /dev/null
@@ -0,0 +1,3 @@
+SLC-Origin-M2: org.eclipse.jetty:jetty-client
+SLC-Origin-ManifestNotModified: true
+Bundle-SymbolicName: org.eclipse.jetty.client
diff --git a/tp/org.argeo.tp/jetty/org.eclipse.jetty.continuation.bnd b/tp/org.argeo.tp/jetty/org.eclipse.jetty.continuation.bnd
new file mode 100644 (file)
index 0000000..5cf169d
--- /dev/null
@@ -0,0 +1,3 @@
+SLC-Origin-M2: org.eclipse.jetty:jetty-continuation
+SLC-Origin-ManifestNotModified: true
+Bundle-SymbolicName: org.eclipse.jetty.continuation
diff --git a/tp/org.argeo.tp/jetty/org.eclipse.jetty.http.bnd b/tp/org.argeo.tp/jetty/org.eclipse.jetty.http.bnd
new file mode 100644 (file)
index 0000000..4a4e18c
--- /dev/null
@@ -0,0 +1,3 @@
+SLC-Origin-M2: org.eclipse.jetty:jetty-http
+SLC-Origin-ManifestNotModified: true
+Bundle-SymbolicName: org.eclipse.jetty.http
diff --git a/tp/org.argeo.tp/jetty/org.eclipse.jetty.io.bnd b/tp/org.argeo.tp/jetty/org.eclipse.jetty.io.bnd
new file mode 100644 (file)
index 0000000..4037c70
--- /dev/null
@@ -0,0 +1,3 @@
+SLC-Origin-M2: org.eclipse.jetty:jetty-io
+SLC-Origin-ManifestNotModified: true
+Bundle-SymbolicName: org.eclipse.jetty.io
diff --git a/tp/org.argeo.tp/jetty/org.eclipse.jetty.jmx.bnd b/tp/org.argeo.tp/jetty/org.eclipse.jetty.jmx.bnd
new file mode 100644 (file)
index 0000000..dbdf6e1
--- /dev/null
@@ -0,0 +1,3 @@
+SLC-Origin-M2: org.eclipse.jetty:jetty-jmx
+SLC-Origin-ManifestNotModified: true
+Bundle-SymbolicName: org.eclipse.jetty.jmx
diff --git a/tp/org.argeo.tp/jetty/org.eclipse.jetty.security.bnd b/tp/org.argeo.tp/jetty/org.eclipse.jetty.security.bnd
new file mode 100644 (file)
index 0000000..f28b886
--- /dev/null
@@ -0,0 +1,3 @@
+SLC-Origin-M2: org.eclipse.jetty:jetty-security
+SLC-Origin-ManifestNotModified: true
+Bundle-SymbolicName: org.eclipse.jetty.security
diff --git a/tp/org.argeo.tp/jetty/org.eclipse.jetty.server.bnd b/tp/org.argeo.tp/jetty/org.eclipse.jetty.server.bnd
new file mode 100644 (file)
index 0000000..d66a70d
--- /dev/null
@@ -0,0 +1,3 @@
+SLC-Origin-M2: org.eclipse.jetty:jetty-server
+SLC-Origin-ManifestNotModified: true
+Bundle-SymbolicName: org.eclipse.jetty.server
diff --git a/tp/org.argeo.tp/jetty/org.eclipse.jetty.servlet.bnd b/tp/org.argeo.tp/jetty/org.eclipse.jetty.servlet.bnd
new file mode 100644 (file)
index 0000000..68469c1
--- /dev/null
@@ -0,0 +1,3 @@
+SLC-Origin-M2: org.eclipse.jetty:jetty-servlet
+SLC-Origin-ManifestNotModified: true
+Bundle-SymbolicName: org.eclipse.jetty.servlet
diff --git a/tp/org.argeo.tp/jetty/org.eclipse.jetty.servlets.bnd b/tp/org.argeo.tp/jetty/org.eclipse.jetty.servlets.bnd
new file mode 100644 (file)
index 0000000..27a8f2e
--- /dev/null
@@ -0,0 +1,3 @@
+SLC-Origin-M2: org.eclipse.jetty:jetty-servlets
+SLC-Origin-ManifestNotModified: true
+Bundle-SymbolicName: org.eclipse.jetty.servlets
diff --git a/tp/org.argeo.tp/jetty/org.eclipse.jetty.util.bnd b/tp/org.argeo.tp/jetty/org.eclipse.jetty.util.bnd
new file mode 100644 (file)
index 0000000..600cc70
--- /dev/null
@@ -0,0 +1,3 @@
+SLC-Origin-M2: org.eclipse.jetty:jetty-util
+SLC-Origin-ManifestNotModified: true
+Bundle-SymbolicName: org.eclipse.jetty.util
diff --git a/tp/org.argeo.tp/jetty/org.eclipse.jetty.websocket.api.bnd b/tp/org.argeo.tp/jetty/org.eclipse.jetty.websocket.api.bnd
new file mode 100644 (file)
index 0000000..3de1e46
--- /dev/null
@@ -0,0 +1,3 @@
+SLC-Origin-M2: org.eclipse.jetty.websocket:websocket-api
+SLC-Origin-ManifestNotModified: true
+Bundle-SymbolicName: org.eclipse.jetty.websocket.api
diff --git a/tp/org.argeo.tp/jetty/org.eclipse.jetty.websocket.client.bnd b/tp/org.argeo.tp/jetty/org.eclipse.jetty.websocket.client.bnd
new file mode 100644 (file)
index 0000000..674c775
--- /dev/null
@@ -0,0 +1,3 @@
+SLC-Origin-M2: org.eclipse.jetty.websocket:websocket-client
+SLC-Origin-ManifestNotModified: true
+Bundle-SymbolicName: org.eclipse.jetty.websocket.client
diff --git a/tp/org.argeo.tp/jetty/org.eclipse.jetty.websocket.common.bnd b/tp/org.argeo.tp/jetty/org.eclipse.jetty.websocket.common.bnd
new file mode 100644 (file)
index 0000000..7e7a113
--- /dev/null
@@ -0,0 +1,3 @@
+SLC-Origin-M2: org.eclipse.jetty.websocket:websocket-common
+SLC-Origin-ManifestNotModified: true
+Bundle-SymbolicName: org.eclipse.jetty.websocket.common
diff --git a/tp/org.argeo.tp/jetty/org.eclipse.jetty.websocket.javax.websocket.bnd b/tp/org.argeo.tp/jetty/org.eclipse.jetty.websocket.javax.websocket.bnd
new file mode 100644 (file)
index 0000000..1007784
--- /dev/null
@@ -0,0 +1,3 @@
+SLC-Origin-M2: org.eclipse.jetty.websocket:javax-websocket-client-impl
+SLC-Origin-ManifestNotModified: true
+Bundle-SymbolicName: org.eclipse.jetty.websocket.javax.websocket
diff --git a/tp/org.argeo.tp/jetty/org.eclipse.jetty.websocket.javax.websocket.server.bnd b/tp/org.argeo.tp/jetty/org.eclipse.jetty.websocket.javax.websocket.server.bnd
new file mode 100644 (file)
index 0000000..72860e3
--- /dev/null
@@ -0,0 +1,3 @@
+SLC-Origin-M2: org.eclipse.jetty.websocket:javax-websocket-server-impl
+SLC-Origin-ManifestNotModified: true
+Bundle-SymbolicName: org.eclipse.jetty.websocket.javax.websocket.server
diff --git a/tp/org.argeo.tp/jetty/org.eclipse.jetty.websocket.server.bnd b/tp/org.argeo.tp/jetty/org.eclipse.jetty.websocket.server.bnd
new file mode 100644 (file)
index 0000000..b9cad3c
--- /dev/null
@@ -0,0 +1,3 @@
+SLC-Origin-M2: org.eclipse.jetty.websocket:websocket-server
+SLC-Origin-ManifestNotModified: true
+Bundle-SymbolicName: org.eclipse.jetty.websocket.server
diff --git a/tp/org.argeo.tp/jetty/org.eclipse.jetty.websocket.servlet.bnd b/tp/org.argeo.tp/jetty/org.eclipse.jetty.websocket.servlet.bnd
new file mode 100644 (file)
index 0000000..3db77e2
--- /dev/null
@@ -0,0 +1,3 @@
+SLC-Origin-M2: org.eclipse.jetty.websocket:websocket-servlet
+SLC-Origin-ManifestNotModified: true
+Bundle-SymbolicName: org.eclipse.jetty.websocket.servlet
diff --git a/tp/org.argeo.tp/jetty/org.eclipse.jetty.xml.bnd b/tp/org.argeo.tp/jetty/org.eclipse.jetty.xml.bnd
new file mode 100644 (file)
index 0000000..0ccef1a
--- /dev/null
@@ -0,0 +1,3 @@
+SLC-Origin-M2: org.eclipse.jetty:jetty-xml
+SLC-Origin-ManifestNotModified: true
+Bundle-SymbolicName: org.eclipse.jetty.xml