Improve Apache SSHD packaging

[gpl/argeo-slc.git] / org.argeo.slc.factory / src / org / argeo / slc / factory / A2Factory.java

diff --git a/org.argeo.slc.factory/src/org/argeo/slc/factory/A2Factory.java b/org.argeo.slc.factory/src/org/argeo/slc/factory/A2Factory.java
index 5641687f7bbf79afefce003e876f56c6be5bf07e..b9c69dea3a34664cf4fdc1638c6feda3691786b2 100644 (file)
--- a/org.argeo.slc.factory/src/org/argeo/slc/factory/A2Factory.java
+++ b/org.argeo.slc.factory/src/org/argeo/slc/factory/A2Factory.java
@@ -290,17 +290,23 @@ public class A2Factory {
                                entries: while ((entry = jarIn.getNextJarEntry()) != null) {
                                        if (entry.isDirectory())
                                                continue entries;
-                                       if (entry.getName().endsWith(".RSA") || entry.getName().endsWith(".SF"))
+                                       else if (entry.getName().endsWith(".RSA") || entry.getName().endsWith(".SF"))
                                                continue entries;
-                                       if (entry.getName().startsWith("META-INF/versions/"))
+                                       else if (entry.getName().startsWith("META-INF/versions/"))
                                                continue entries;
-                                       if (entry.getName().startsWith("META-INF/maven/"))
+                                       else if (entry.getName().startsWith("META-INF/maven/"))
                                                continue entries;
-                                       if (entry.getName().equals("module-info.class"))
+                                       else if (entry.getName().equals("module-info.class"))
                                                continue entries;
-                                       if (entry.getName().equals("META-INF/NOTICE"))
+                                       else if (entry.getName().equals("META-INF/NOTICE"))
                                                continue entries;
-                                       if (entry.getName().equals("META-INF/LICENSE"))
+                                       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;
                                        Path target = targetBundleDir.resolve(entry.getName());
                                        Files.createDirectories(target.getParent());
@@ -920,11 +926,12 @@ public class A2Factory {
 //             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.processM2BasedDistributionUnit(descriptorsBase.resolve("org.argeo.tp.jetty/jetty-websocket"));
+//             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.formats"));
+//             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(0);