From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sun, 13 Feb 2022 05:30:33 +0000 (+0100)
Subject: Add missing Eclipse RCP third parties
X-Git-Tag: argeo-slc-2.3.1~8
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=3277752e2561e929365e556b28ce1647dd0e900e;p=gpl%2Fargeo-slc.git

Add missing Eclipse RCP third parties
---

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
diff --git a/sdk/output-argeo-tp-rcp.target b/sdk/output-argeo-tp-rcp.target
new file mode 100644
index 000000000..77466926c
--- /dev/null
+++ b/sdk/output-argeo-tp-rcp.target
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.8"?>
+<target name="(output) argeo-tp-rcp">
+	<locations>
+		<location path="${project_loc:argeo-slc-unstable}/../output/a2/org.argeo.tp.apache" type="Directory"/>
+		<location path="${project_loc:argeo-slc-unstable}/../output/a2/org.argeo.tp.eclipse.equinox" type="Directory"/>
+		<location path="${project_loc:argeo-slc-unstable}/../output/a2/org.argeo.tp.eclipse.rcp" type="Directory"/>
+		<location path="${project_loc:argeo-slc-unstable}/../output/a2/org.argeo.tp.jetty" type="Directory"/>
+		<location path="${project_loc:argeo-slc-unstable}/../output/a2/org.argeo.tp.sdk" type="Directory"/>
+		<location path="${project_loc:argeo-slc-unstable}/../output/a2/org.argeo.tp.jcr" type="Directory"/>
+		<location path="${project_loc:argeo-slc-unstable}/../output/a2/org.argeo.tp" type="Directory"/>
+	</locations>
+</target>
\ No newline at end of file
diff --git a/tp/Make.java b/tp/Make.java
index 6ea7f875c..c5080ed2c 100644
--- a/tp/Make.java
+++ b/tp/Make.java
@@ -23,6 +23,7 @@ class Make {
 				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.processCategory(descriptorsBase.resolve("org.argeo.tp.eclipse.rcp"));
 
 		// Maven
 		factory.processCategory(descriptorsBase.resolve("org.argeo.tp.sdk"));
diff --git a/tp/org.argeo.tp.eclipse.rcp/org.eclipse.emf.common.bnd b/tp/org.argeo.tp.eclipse.rcp/org.eclipse.emf.common.bnd
new file mode 100644
index 000000000..edd9030e3
--- /dev/null
+++ b/tp/org.argeo.tp.eclipse.rcp/org.eclipse.emf.common.bnd
@@ -0,0 +1,3 @@
+Bundle-License: EPEL-2.0
+SLC-Origin-M2: org.eclipse.emf:org.eclipse.emf.common:2.23.0
+SLC-Origin-ManifestNotModified: true
diff --git a/tp/org.argeo.tp.eclipse.rcp/org.eclipse.emf.ecore.bnd b/tp/org.argeo.tp.eclipse.rcp/org.eclipse.emf.ecore.bnd
new file mode 100644
index 000000000..c914536f6
--- /dev/null
+++ b/tp/org.argeo.tp.eclipse.rcp/org.eclipse.emf.ecore.bnd
@@ -0,0 +1,3 @@
+Bundle-License: EPEL-2.0
+SLC-Origin-M2: org.eclipse.emf:org.eclipse.emf.ecore:2.25.0
+SLC-Origin-ManifestNotModified: true
diff --git a/tp/org.argeo.tp.eclipse.rcp/org.eclipse.emf.ecore.change.bnd b/tp/org.argeo.tp.eclipse.rcp/org.eclipse.emf.ecore.change.bnd
new file mode 100644
index 000000000..ba733ef6d
--- /dev/null
+++ b/tp/org.argeo.tp.eclipse.rcp/org.eclipse.emf.ecore.change.bnd
@@ -0,0 +1,3 @@
+Bundle-License: EPEL-2.0
+SLC-Origin-M2: org.eclipse.emf:org.eclipse.emf.ecore.change:2.14.0
+SLC-Origin-ManifestNotModified: true
diff --git a/tp/org.argeo.tp.eclipse.rcp/org.eclipse.emf.ecore.xmi.bnd b/tp/org.argeo.tp.eclipse.rcp/org.eclipse.emf.ecore.xmi.bnd
new file mode 100644
index 000000000..4a4088191
--- /dev/null
+++ b/tp/org.argeo.tp.eclipse.rcp/org.eclipse.emf.ecore.xmi.bnd
@@ -0,0 +1,3 @@
+Bundle-License: EPEL-2.0
+SLC-Origin-M2: org.eclipse.emf:org.eclipse.emf.ecore.xmi:2.16.0
+SLC-Origin-ManifestNotModified: true