From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 14 Jul 2022 16:10:46 +0000 (+0200)
Subject: Improve Eclipse TP structure
X-Git-Tag: v2.3.5~21
X-Git-Url: https://git.argeo.org/?a=commitdiff_plain;h=ddb643cf7e81e4241bf87dcd0e4fd844815e6a2c;p=gpl%2Fargeo-slc.git

Improve Eclipse TP structure
---

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.eclipse/eclipse-equinox/common.bnd b/tp/org.argeo.tp.eclipse/eclipse-equinox/common.bnd
deleted file mode 100644
index 9a7ae1d76..000000000
--- a/tp/org.argeo.tp.eclipse/eclipse-equinox/common.bnd
+++ /dev/null
@@ -1,2 +0,0 @@
-Bundle-License: EPL-1.0
-SLC-Origin-ManifestNotModified: true
diff --git a/tp/org.argeo.tp.eclipse/eclipse-equinox/includes.properties b/tp/org.argeo.tp.eclipse/eclipse-equinox/includes.properties
deleted file mode 100644
index ac8b8b7a7..000000000
--- a/tp/org.argeo.tp.eclipse/eclipse-equinox/includes.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-plugins/org.eclipse.equinox.app*.jar=
-plugins/org.eclipse.equinox.cm*.jar=
-plugins/org.eclipse.equinox.common*.jar=
-plugins/org.eclipse.equinox.ds*.jar=
-plugins/org.eclipse.equinox.metatype*.jar=
-plugins/org.eclipse.equinox.event*.jar=
-plugins/org.eclipse.equinox.http.jetty*.jar=
-plugins/org.eclipse.equinox.http.registry*.jar=
-plugins/org.eclipse.equinox.http.servlet*.jar=
-plugins/org.eclipse.equinox.http.servletbridge*.jar=
-plugins/org.eclipse.equinox.preferences*.jar=
-plugins/org.eclipse.equinox.registry*.jar=
-plugins/org.eclipse.equinox.servletbridge*.jar=
-plugins/org.eclipse.equinox.util*.jar=
diff --git a/tp/org.argeo.tp.sdk/org.graalvm.bnd b/tp/org.argeo.tp.sdk/org.graalvm.bnd
deleted file mode 100644
index dd55db9bb..000000000
--- a/tp/org.argeo.tp.sdk/org.graalvm.bnd
+++ /dev/null
@@ -1,4 +0,0 @@
-Bundle-License: UPL-1.0
-SLC-Origin-M2: org.graalvm.sdk:graal-sdk:22.1.0.1
-# Workaround for errors in Eclipse PDE when using GraalVM as JCM
-Import-Package: java.*;resolution:="optional", *
\ No newline at end of file
diff --git a/tp/org.argeo.tp.sdk/org.graalvm.bnd.retired b/tp/org.argeo.tp.sdk/org.graalvm.bnd.retired
new file mode 100644
index 000000000..dd55db9bb
--- /dev/null
+++ b/tp/org.argeo.tp.sdk/org.graalvm.bnd.retired
@@ -0,0 +1,4 @@
+Bundle-License: UPL-1.0
+SLC-Origin-M2: org.graalvm.sdk:graal-sdk:22.1.0.1
+# Workaround for errors in Eclipse PDE when using GraalVM as JCM
+Import-Package: java.*;resolution:="optional", *
\ No newline at end of file
diff --git a/tp/osgi/equinox/org.argeo.tp.eclipse/eclipse-equinox/common.bnd b/tp/osgi/equinox/org.argeo.tp.eclipse/eclipse-equinox/common.bnd
new file mode 100644
index 000000000..9a7ae1d76
--- /dev/null
+++ b/tp/osgi/equinox/org.argeo.tp.eclipse/eclipse-equinox/common.bnd
@@ -0,0 +1,2 @@
+Bundle-License: EPL-1.0
+SLC-Origin-ManifestNotModified: true
diff --git a/tp/osgi/equinox/org.argeo.tp.eclipse/eclipse-equinox/includes.properties b/tp/osgi/equinox/org.argeo.tp.eclipse/eclipse-equinox/includes.properties
new file mode 100644
index 000000000..ac8b8b7a7
--- /dev/null
+++ b/tp/osgi/equinox/org.argeo.tp.eclipse/eclipse-equinox/includes.properties
@@ -0,0 +1,14 @@
+plugins/org.eclipse.equinox.app*.jar=
+plugins/org.eclipse.equinox.cm*.jar=
+plugins/org.eclipse.equinox.common*.jar=
+plugins/org.eclipse.equinox.ds*.jar=
+plugins/org.eclipse.equinox.metatype*.jar=
+plugins/org.eclipse.equinox.event*.jar=
+plugins/org.eclipse.equinox.http.jetty*.jar=
+plugins/org.eclipse.equinox.http.registry*.jar=
+plugins/org.eclipse.equinox.http.servlet*.jar=
+plugins/org.eclipse.equinox.http.servletbridge*.jar=
+plugins/org.eclipse.equinox.preferences*.jar=
+plugins/org.eclipse.equinox.registry*.jar=
+plugins/org.eclipse.equinox.servletbridge*.jar=
+plugins/org.eclipse.equinox.util*.jar=