X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc.factory%2Fsrc%2Forg%2Fargeo%2Fslc%2Ffactory%2FA2Factory.java;h=4691167afdf5f8aa115516e9e62b51c503f0445b;hb=3277752e2561e929365e556b28ce1647dd0e900e;hp=5e1e85bcca01245d6de5c8eb5af82d58aafa093d;hpb=c1551d358c85a2f3d074a9ddd469f015a2cabb6f;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 5e1e85bcc..4691167af 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
@@ -126,6 +126,10 @@ public class A2Factory {
 			}
 
 			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);
 			}
@@ -622,15 +626,16 @@ public class A2Factory {
 	}
 
 	public static void main(String[] args) {
-		Path factoryBase = Paths.get("../output/a2").toAbsolutePath().normalize();
+		Path factoryBase = Paths.get("../../output/a2").toAbsolutePath().normalize();
 		A2Factory factory = new A2Factory(factoryBase);
 
 		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.jetty/jetty"));
-		factory.processM2BasedDistributionUnit(descriptorsBase.resolve("org.argeo.tp.jetty/jetty-websocket"));
+//		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.eclipse.rcp"));
 		System.exit(0);
 
 		// Eclipse