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 674571057f6b062eff8167ae2fd3b0f883c14c39..1174b8e8c6a074a4996bd42ee63814438ed901d9 100644 (file)
--- 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 b87b8914e4dc3c0aea2136e050f2dffd1cc35162..49f0bc2d5f10fe2c533a4f1ec6ecd5c3f24d2f06 100644 (file)
--- 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 4c0cea55a15f662747bb9d1c3f20a07cb311a016..11c7bcdc14448661f27faa5b67a0e5035362cbdf 100644 (file)
--- 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 (file)
index 9a7ae1d..0000000
--- 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 (file)
index ac8b8b7..0000000
--- 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 (file)
index dd55db9..0000000
--- 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 (file)
index 0000000..dd55db9
--- /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 (file)
index 0000000..9a7ae1d
--- /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 (file)
index 0000000..ac8b8b7
--- /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=