From ddb643cf7e81e4241bf87dcd0e4fd844815e6a2c Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 14 Jul 2022 18:10:46 +0200
Subject: [PATCH] Improve Eclipse TP structure

---
 .../src/org/argeo/slc/factory/A2Factory.java             | 7 +------
 sdk/output-argeo-tp-backend.target                       | 2 +-
 tp/Make.java                                             | 9 +++------
 .../{org.graalvm.bnd => org.graalvm.bnd.retired}         | 0
 .../org.argeo.tp.eclipse/eclipse-equinox/common.bnd      | 0
 .../eclipse-equinox/includes.properties                  | 0
 6 files changed, 5 insertions(+), 13 deletions(-)
 rename tp/org.argeo.tp.sdk/{org.graalvm.bnd => org.graalvm.bnd.retired} (100%)
 rename tp/{ => osgi/equinox}/org.argeo.tp.eclipse/eclipse-equinox/common.bnd (100%)
 rename tp/{ => osgi/equinox}/org.argeo.tp.eclipse/eclipse-equinox/includes.properties (100%)

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 674571057..1174b8e8c 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
@@ -1038,8 +1038,7 @@ public class A2Factory {
 		// Eclipse
 		factory.processCategory(Paths.get("osgi/api/org.argeo.tp.osgi"));
 		factory.processEclipseArchive(Paths.get("osgi/equinox/org.argeo.tp.osgi", "eclipse-equinox"));
-
-		factory.processEclipseArchive(Paths.get("org.argeo.tp.eclipse", "eclipse-equinox"));
+		factory.processEclipseArchive(Paths.get("osgi/equinox/org.argeo.tp.eclipse", "eclipse-equinox"));
 
 		factory.processEclipseArchive(Paths.get("swt/rap/org.argeo.tp.swt", "eclipse-rap"));
 		factory.processEclipseArchive(Paths.get("swt/rap/org.argeo.tp.swt.workbench", "eclipse-rap"));
@@ -1051,11 +1050,7 @@ public class A2Factory {
 		factory.processEclipseArchive(Paths.get("lib/win32/x86_64/swt/rcp/org.argeo.tp.swt", "eclipse-rcp"));
 		factory.processEclipseArchive(Paths.get("lib/macosx/x86_64/swt/rcp/org.argeo.tp.swt", "eclipse-rcp"));
 
-		System.exit(1);
-
 		factory.processEclipseArchive(Paths.get("swt/rcp/org.argeo.tp.swt", "eclipse-nebula"));
-		// factory.processEclipseArchive(Paths.get("swt/rcp/org.argeo.tp.swt",
-		// "eclipse-equinox"));
 		factory.processEclipseArchive(Paths.get("swt/rcp/org.argeo.tp.swt.workbench", "eclipse-rcp"));
 		factory.processCategory(Paths.get("swt/rcp/org.argeo.tp.swt.workbench"));
 
diff --git a/sdk/output-argeo-tp-backend.target b/sdk/output-argeo-tp-backend.target
index b87b8914e..49f0bc2d5 100644
--- a/sdk/output-argeo-tp-backend.target
+++ b/sdk/output-argeo-tp-backend.target
@@ -3,11 +3,11 @@
 <target name="Argeo TP Backend">
 	<locations>
 		<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.eclipse" 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.formats" type="Directory"/>
 		<location path="${project_loc:argeo-slc-unstable}/../output/a2/org.argeo.tp.poi" type="Directory"/>
 		<location path="${project_loc:argeo-slc-unstable}/../output/a2/org.argeo.tp.gis" type="Directory"/>
+		<location path="${project_loc:argeo-slc-unstable}/../output/a2/osgi/equinox/org.argeo.tp.eclipse" type="Directory"/>
 		<location type="Target" uri="file:${project_loc:/argeo-slc-unstable}/sdk/output-argeo-tp-minimal.target"/>
 	</locations>
 </target>
\ No newline at end of file
diff --git a/tp/Make.java b/tp/Make.java
index 4c0cea55a..11c7bcdc1 100644
--- a/tp/Make.java
+++ b/tp/Make.java
@@ -19,22 +19,19 @@ class Make {
 		// Eclipse
 		factory.processCategory(Paths.get("osgi/api/org.argeo.tp.osgi"));
 		factory.processEclipseArchive(Paths.get("osgi/equinox/org.argeo.tp.osgi", "eclipse-equinox"));
-
-		factory.processEclipseArchive(Paths.get("org.argeo.tp.eclipse", "eclipse-equinox"));
+		factory.processEclipseArchive(Paths.get("osgi/equinox/org.argeo.tp.eclipse", "eclipse-equinox"));
 
 		factory.processEclipseArchive(Paths.get("swt/rap/org.argeo.tp.swt", "eclipse-rap"));
 		factory.processEclipseArchive(Paths.get("swt/rap/org.argeo.tp.swt.workbench", "eclipse-rap"));
-		
+
 		factory.processEclipseArchive(Paths.get("swt/rcp/org.argeo.tp.swt", "eclipse-rcp"));
-		
+
 		factory.processEclipseArchive(Paths.get("lib/linux/x86_64/swt/rcp/org.argeo.tp.swt", "eclipse-rcp"));
 		factory.processEclipseArchive(Paths.get("lib/linux/aarch64/swt/rcp/org.argeo.tp.swt", "eclipse-rcp"));
 		factory.processEclipseArchive(Paths.get("lib/win32/x86_64/swt/rcp/org.argeo.tp.swt", "eclipse-rcp"));
 		factory.processEclipseArchive(Paths.get("lib/macosx/x86_64/swt/rcp/org.argeo.tp.swt", "eclipse-rcp"));
 
 		factory.processEclipseArchive(Paths.get("swt/rcp/org.argeo.tp.swt", "eclipse-nebula"));
-		// factory.processEclipseArchive(Paths.get("swt/rcp/org.argeo.tp.swt",
-		// "eclipse-equinox"));
 		factory.processEclipseArchive(Paths.get("swt/rcp/org.argeo.tp.swt.workbench", "eclipse-rcp"));
 		factory.processCategory(Paths.get("swt/rcp/org.argeo.tp.swt.workbench"));
 
diff --git a/tp/org.argeo.tp.sdk/org.graalvm.bnd b/tp/org.argeo.tp.sdk/org.graalvm.bnd.retired
similarity index 100%
rename from tp/org.argeo.tp.sdk/org.graalvm.bnd
rename to tp/org.argeo.tp.sdk/org.graalvm.bnd.retired
diff --git a/tp/org.argeo.tp.eclipse/eclipse-equinox/common.bnd b/tp/osgi/equinox/org.argeo.tp.eclipse/eclipse-equinox/common.bnd
similarity index 100%
rename from tp/org.argeo.tp.eclipse/eclipse-equinox/common.bnd
rename to tp/osgi/equinox/org.argeo.tp.eclipse/eclipse-equinox/common.bnd
diff --git a/tp/org.argeo.tp.eclipse/eclipse-equinox/includes.properties b/tp/osgi/equinox/org.argeo.tp.eclipse/eclipse-equinox/includes.properties
similarity index 100%
rename from tp/org.argeo.tp.eclipse/eclipse-equinox/includes.properties
rename to tp/osgi/equinox/org.argeo.tp.eclipse/eclipse-equinox/includes.properties
-- 
2.30.2