X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc.factory%2Fsrc%2Forg%2Fargeo%2Fslc%2Ffactory%2FA2Factory.java;h=9764b1f65c4029f3f2cf064336ba425589ccf591;hb=4b9228ef254b2132a128ebbaa4603fd8fb084a91;hp=4bab07aa14ac5e3ac723ccc55ef0410936e2285c;hpb=04e7ba0710e74d9f18322dcc2c730f972b7ea10c;p=gpl%2Fargeo-slc.git

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 4bab07aa1..9764b1f65 100644
--- 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,19 +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/NOTICE.txt"))
+					else if (entry.getName().equals("META-INF/NOTICE.txt"))
 						continue entries;
-					if (entry.getName().equals("META-INF/LICENSE"))
+					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,12 +924,12 @@ public class A2Factory {
 		Path descriptorsBase = Paths.get("../tp").toAbsolutePath().normalize();
 
 //		factory.processSingleM2ArtifactDistributionUnit(descriptorsBase.resolve("org.argeo.tp.apache").resolve("org.apache.xml.resolver.bnd"));
-		factory.processM2BasedDistributionUnit(descriptorsBase.resolve("org.argeo.tp.apache/apache-sshd"));
+//		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.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.apache"));
 //		factory.processCategory(descriptorsBase.resolve("org.argeo.tp.formats"));
 //		factory.processCategory(descriptorsBase.resolve("org.argeo.tp.gis"));
 		System.exit(0);