From cc4b534778db3b4fbe79cfa43e50fcb8770160f7 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Mon, 4 Dec 2023 16:56:19 +0100 Subject: [PATCH] Refactor Argeo Third Parties categories --- rebuild/org.argeo.tp.utils/Makefile | 6 +++--- repackage/Makefile | 10 ++++++---- .../{org.argeo.tp => org.argeo.tp.sys}/com.sun.jna.bnd | 0 .../{org.argeo.tp => org.argeo.tp.sys}/com.sun.jna.bnd | 0 .../{org.argeo.tp => org.argeo.tp.sys}/com.sun.jna.bnd | 0 .../{org.argeo.tp => org.argeo.tp.sys}/com.sun.jna.bnd | 0 repackage/org.argeo.tp.earth/geotools/merge.bnd | 1 + .../org.eclipse.xsd.bnd | 0 .../javax.servlet.bnd | 0 .../javax.websocket.bnd | 0 .../org.apache.commons.fileupload.bnd | 0 .../batik/common.bnd | 0 .../{org.argeo.tp => org.argeo.tp.img}/batik/merge.bnd | 0 .../batik/org.apache.batik.constants.bnd | 0 .../batik/org.apache.batik.css.bnd | 0 .../batik/org.apache.batik.i18n.bnd | 0 .../batik/org.apache.batik.util.bnd | 0 .../com.adobe.xmp.xmpcore.bnd.disabled} | 0 .../com.drew.metadata.bnd | 3 +++ .../org.apache.commons.imaging.bnd | 0 .../xmlgraphics/merge.bnd | 0 ....apache.xmlgraphics.image.loader.spi.ImageConverter | 0 ...che.xmlgraphics.image.loader.spi.ImageLoaderFactory | 0 ....apache.xmlgraphics.image.loader.spi.ImagePreloader | 0 .../com.googlecode.javaewah.JavaEWAH.bnd | 0 .../com.sun.jna.platform.bnd | 0 .../de.thjom.java.systemd.bnd | 0 .../com.fasterxml.jackson.core.jackson.annotations.bnd | 0 .../com.fasterxml.jackson.core.jackson.core.bnd | 0 .../com.fasterxml.jackson.core.jackson.databind.bnd | 0 .../jackson/common.bnd | 0 .../javax.activation.bnd | 0 .../javax.mail.bnd | 0 .../org.apache.commons.codec.bnd | 0 .../org.apache.commons.compress.bnd | 0 .../org.apache.commons.exec.bnd | 0 .../org.apache.commons.vfs2.bnd | 0 .../org.apache.httpcomponents.httpclient.bnd | 0 .../org.apache.httpcomponents.httpcore.bnd | 0 .../org.apache.httpcomponents.httpmime.bnd | 0 .../org.apache.tomcat.jni.bnd | 0 .../org.eclipse.jgit.bnd | 0 .../{org.argeo.tp => org.argeo.tp.sys}/org.jline.bnd | 0 .../org.mozilla.universalchardet.bnd | 0 .../org.tukaani.xz.bnd | 0 ...ons.csv.bnd => org.apache.commons.csv.bnd.disabled} | 0 ...s.text.bnd => org.apache.commons.text.bnd.disabled} | 0 ...ozilla.rhino.bnd => org.mozilla.rhino.bnd.disabled} | 0 .../org.w3c.dom.smil.bnd | 0 .../org.w3c.dom.svg.bnd | 0 ...g.jsonld.bnd => com.apicatalog.jsonld.bnd.disabled} | 0 sdk/output-argeo-tp-apps.target | 1 + sdk/output-argeo-tp-platform.target | 3 ++- sdk/output-argeo-tp-rcp-win.target | 1 + sdk/output-argeo-tp-rcp.target | 1 + sdk/output-argeo-tp-swt.target | 1 - 56 files changed, 18 insertions(+), 9 deletions(-) rename repackage/lib/linux/aarch64/{org.argeo.tp => org.argeo.tp.sys}/com.sun.jna.bnd (100%) rename repackage/lib/linux/x86_64/{org.argeo.tp => org.argeo.tp.sys}/com.sun.jna.bnd (100%) rename repackage/lib/macosx/x86_64/{org.argeo.tp => org.argeo.tp.sys}/com.sun.jna.bnd (100%) rename repackage/lib/win32/x86_64/{org.argeo.tp => org.argeo.tp.sys}/com.sun.jna.bnd (100%) rename repackage/{org.argeo.tp.utils => org.argeo.tp.earth}/org.eclipse.xsd.bnd (100%) rename repackage/{org.argeo.tp => org.argeo.tp.httpd}/javax.servlet.bnd (100%) rename repackage/{org.argeo.tp => org.argeo.tp.httpd}/javax.websocket.bnd (100%) rename repackage/{org.argeo.tp => org.argeo.tp.httpd}/org.apache.commons.fileupload.bnd (100%) rename repackage/{org.argeo.tp => org.argeo.tp.img}/batik/common.bnd (100%) rename repackage/{org.argeo.tp => org.argeo.tp.img}/batik/merge.bnd (100%) rename repackage/{org.argeo.tp => org.argeo.tp.img}/batik/org.apache.batik.constants.bnd (100%) rename repackage/{org.argeo.tp => org.argeo.tp.img}/batik/org.apache.batik.css.bnd (100%) rename repackage/{org.argeo.tp => org.argeo.tp.img}/batik/org.apache.batik.i18n.bnd (100%) rename repackage/{org.argeo.tp => org.argeo.tp.img}/batik/org.apache.batik.util.bnd (100%) rename repackage/{org.argeo.tp.utils/com.adobe.xmp.xmpcore.bnd => org.argeo.tp.img/com.adobe.xmp.xmpcore.bnd.disabled} (100%) rename repackage/{org.argeo.tp.utils => org.argeo.tp.img}/com.drew.metadata.bnd (62%) rename repackage/{org.argeo.tp.utils => org.argeo.tp.img}/org.apache.commons.imaging.bnd (100%) rename repackage/{org.argeo.tp => org.argeo.tp.img}/xmlgraphics/merge.bnd (100%) rename repackage/{org.argeo.tp => org.argeo.tp.img}/xmlgraphics/services/org.apache.xmlgraphics.image.loader.spi.ImageConverter (100%) rename repackage/{org.argeo.tp => org.argeo.tp.img}/xmlgraphics/services/org.apache.xmlgraphics.image.loader.spi.ImageLoaderFactory (100%) rename repackage/{org.argeo.tp => org.argeo.tp.img}/xmlgraphics/services/org.apache.xmlgraphics.image.loader.spi.ImagePreloader (100%) rename repackage/{org.argeo.tp.utils => org.argeo.tp.sys}/com.googlecode.javaewah.JavaEWAH.bnd (100%) rename repackage/{org.argeo.tp => org.argeo.tp.sys}/com.sun.jna.platform.bnd (100%) rename repackage/{org.argeo.tp.utils => org.argeo.tp.sys}/de.thjom.java.systemd.bnd (100%) rename repackage/{org.argeo.tp => org.argeo.tp.sys}/jackson/com.fasterxml.jackson.core.jackson.annotations.bnd (100%) rename repackage/{org.argeo.tp => org.argeo.tp.sys}/jackson/com.fasterxml.jackson.core.jackson.core.bnd (100%) rename repackage/{org.argeo.tp => org.argeo.tp.sys}/jackson/com.fasterxml.jackson.core.jackson.databind.bnd (100%) rename repackage/{org.argeo.tp => org.argeo.tp.sys}/jackson/common.bnd (100%) rename repackage/{org.argeo.tp.utils => org.argeo.tp.sys}/javax.activation.bnd (100%) rename repackage/{org.argeo.tp.utils => org.argeo.tp.sys}/javax.mail.bnd (100%) rename repackage/{org.argeo.tp => org.argeo.tp.sys}/org.apache.commons.codec.bnd (100%) rename repackage/{org.argeo.tp => org.argeo.tp.sys}/org.apache.commons.compress.bnd (100%) rename repackage/{org.argeo.tp.utils => org.argeo.tp.sys}/org.apache.commons.exec.bnd (100%) rename repackage/{org.argeo.tp.utils => org.argeo.tp.sys}/org.apache.commons.vfs2.bnd (100%) rename repackage/{org.argeo.tp => org.argeo.tp.sys}/org.apache.httpcomponents.httpclient.bnd (100%) rename repackage/{org.argeo.tp => org.argeo.tp.sys}/org.apache.httpcomponents.httpcore.bnd (100%) rename repackage/{org.argeo.tp => org.argeo.tp.sys}/org.apache.httpcomponents.httpmime.bnd (100%) rename repackage/{org.argeo.tp => org.argeo.tp.sys}/org.apache.tomcat.jni.bnd (100%) rename repackage/{org.argeo.tp.utils => org.argeo.tp.sys}/org.eclipse.jgit.bnd (100%) rename repackage/{org.argeo.tp => org.argeo.tp.sys}/org.jline.bnd (100%) rename repackage/{org.argeo.tp => org.argeo.tp.sys}/org.mozilla.universalchardet.bnd (100%) rename repackage/{org.argeo.tp => org.argeo.tp.sys}/org.tukaani.xz.bnd (100%) rename repackage/org.argeo.tp.utils/{org.apache.commons.csv.bnd => org.apache.commons.csv.bnd.disabled} (100%) rename repackage/org.argeo.tp.utils/{org.apache.commons.text.bnd => org.apache.commons.text.bnd.disabled} (100%) rename repackage/org.argeo.tp.utils/{org.mozilla.rhino.bnd => org.mozilla.rhino.bnd.disabled} (100%) rename repackage/{org.argeo.tp => org.argeo.tp.utils}/org.w3c.dom.smil.bnd (100%) rename repackage/{org.argeo.tp => org.argeo.tp.utils}/org.w3c.dom.svg.bnd (100%) rename repackage/org.argeo.tp/{com.apicatalog.jsonld.bnd => com.apicatalog.jsonld.bnd.disabled} (100%) diff --git a/rebuild/org.argeo.tp.utils/Makefile b/rebuild/org.argeo.tp.utils/Makefile index 95dcab8..5a1fa46 100644 --- a/rebuild/org.argeo.tp.utils/Makefile +++ b/rebuild/org.argeo.tp.utils/Makefile @@ -27,10 +27,10 @@ retrieve-ee4j-mbox: # jni rsync -a $(SRC_DIR)/mbox/src/main/cpp/com/sun/mail/mbox/ $(MBOX_JNI_SRC) mkdir -p com.sun.mail.mbox/bin - javac -h jni/com_sun_mail_mbox/ -cp "$(A2_OUTPUT)/org.argeo.tp.utils/*" com.sun.mail.mbox/src/com/sun/mail/mbox/*.java + javac -h jni/com_sun_mail_mbox/ -cp "$(A2_OUTPUT)/org.argeo.tp.sys/*" com.sun.mail.mbox/src/com/sun/mail/mbox/*.java rm -rf com.sun.mail.mbox/bin -A2_CATEGORY = org.argeo.tp.utils +A2_CATEGORY = org.argeo.tp.sys BUNDLES = \ com.sun.mail.mbox \ @@ -38,7 +38,7 @@ com.sun.mail.mbox \ clean: rm -rf $(BUILD_BASE) -DEP_CATEGORIES = org.argeo.tp.utils +DEP_CATEGORIES = org.argeo.tp.sys include $(SDK_SRC_BASE)/sdk/argeo-build/osgi.mk diff --git a/repackage/Makefile b/repackage/Makefile index c509174..d48c6a4 100644 --- a/repackage/Makefile +++ b/repackage/Makefile @@ -11,15 +11,16 @@ osgi/equinox/org.argeo.tp.eclipse \ CATEGORIES=\ $(CATEGORIES_CMS) \ +org.argeo.tp.sys \ org.argeo.tp.sdk \ osgi/api/org.argeo.tp.osgi \ swt/rap/org.argeo.tp.swt \ swt/rap/org.argeo.tp.swt.workbench \ swt/rcp/org.argeo.tp.swt \ -lib/linux/x86_64/org.argeo.tp \ -lib/linux/aarch64/org.argeo.tp \ -lib/win32/x86_64/org.argeo.tp \ -lib/macosx/x86_64/org.argeo.tp \ +lib/linux/x86_64/org.argeo.tp.sys \ +lib/linux/aarch64/org.argeo.tp.sys \ +lib/win32/x86_64/org.argeo.tp.sys \ +lib/macosx/x86_64/org.argeo.tp.sys \ lib/linux/x86_64/swt/rcp/org.argeo.tp.swt \ lib/linux/aarch64/swt/rcp/org.argeo.tp.swt \ lib/win32/x86_64/swt/rcp/org.argeo.tp.swt \ @@ -28,6 +29,7 @@ lib/macosx/x86_64/swt/rcp/org.argeo.tp.swt.workbench \ swt/rcp/org.argeo.tp.swt \ swt/rcp/org.argeo.tp.swt.workbench \ org.argeo.tp.utils \ +org.argeo.tp.img \ org.argeo.tp.publish \ org.argeo.tp.math \ org.argeo.tp.jcr \ diff --git a/repackage/lib/linux/aarch64/org.argeo.tp/com.sun.jna.bnd b/repackage/lib/linux/aarch64/org.argeo.tp.sys/com.sun.jna.bnd similarity index 100% rename from repackage/lib/linux/aarch64/org.argeo.tp/com.sun.jna.bnd rename to repackage/lib/linux/aarch64/org.argeo.tp.sys/com.sun.jna.bnd diff --git a/repackage/lib/linux/x86_64/org.argeo.tp/com.sun.jna.bnd b/repackage/lib/linux/x86_64/org.argeo.tp.sys/com.sun.jna.bnd similarity index 100% rename from repackage/lib/linux/x86_64/org.argeo.tp/com.sun.jna.bnd rename to repackage/lib/linux/x86_64/org.argeo.tp.sys/com.sun.jna.bnd diff --git a/repackage/lib/macosx/x86_64/org.argeo.tp/com.sun.jna.bnd b/repackage/lib/macosx/x86_64/org.argeo.tp.sys/com.sun.jna.bnd similarity index 100% rename from repackage/lib/macosx/x86_64/org.argeo.tp/com.sun.jna.bnd rename to repackage/lib/macosx/x86_64/org.argeo.tp.sys/com.sun.jna.bnd diff --git a/repackage/lib/win32/x86_64/org.argeo.tp/com.sun.jna.bnd b/repackage/lib/win32/x86_64/org.argeo.tp.sys/com.sun.jna.bnd similarity index 100% rename from repackage/lib/win32/x86_64/org.argeo.tp/com.sun.jna.bnd rename to repackage/lib/win32/x86_64/org.argeo.tp.sys/com.sun.jna.bnd diff --git a/repackage/org.argeo.tp.earth/geotools/merge.bnd b/repackage/org.argeo.tp.earth/geotools/merge.bnd index 0904371..3ad4141 100644 --- a/repackage/org.argeo.tp.earth/geotools/merge.bnd +++ b/repackage/org.argeo.tp.earth/geotools/merge.bnd @@ -49,6 +49,7 @@ org.parboiled.test;resolution:="optional",\ org.parboiled.transform;resolution:="optional",\ org.parboiled.trees;resolution:="optional",\ org.parboiled.*;resolution:="optional",\ +org.apache.commons.text.*;resolution:="optional",\ * Argeo-Origin-M2-Merge: \ diff --git a/repackage/org.argeo.tp.utils/org.eclipse.xsd.bnd b/repackage/org.argeo.tp.earth/org.eclipse.xsd.bnd similarity index 100% rename from repackage/org.argeo.tp.utils/org.eclipse.xsd.bnd rename to repackage/org.argeo.tp.earth/org.eclipse.xsd.bnd diff --git a/repackage/org.argeo.tp/javax.servlet.bnd b/repackage/org.argeo.tp.httpd/javax.servlet.bnd similarity index 100% rename from repackage/org.argeo.tp/javax.servlet.bnd rename to repackage/org.argeo.tp.httpd/javax.servlet.bnd diff --git a/repackage/org.argeo.tp/javax.websocket.bnd b/repackage/org.argeo.tp.httpd/javax.websocket.bnd similarity index 100% rename from repackage/org.argeo.tp/javax.websocket.bnd rename to repackage/org.argeo.tp.httpd/javax.websocket.bnd diff --git a/repackage/org.argeo.tp/org.apache.commons.fileupload.bnd b/repackage/org.argeo.tp.httpd/org.apache.commons.fileupload.bnd similarity index 100% rename from repackage/org.argeo.tp/org.apache.commons.fileupload.bnd rename to repackage/org.argeo.tp.httpd/org.apache.commons.fileupload.bnd diff --git a/repackage/org.argeo.tp/batik/common.bnd b/repackage/org.argeo.tp.img/batik/common.bnd similarity index 100% rename from repackage/org.argeo.tp/batik/common.bnd rename to repackage/org.argeo.tp.img/batik/common.bnd diff --git a/repackage/org.argeo.tp/batik/merge.bnd b/repackage/org.argeo.tp.img/batik/merge.bnd similarity index 100% rename from repackage/org.argeo.tp/batik/merge.bnd rename to repackage/org.argeo.tp.img/batik/merge.bnd diff --git a/repackage/org.argeo.tp/batik/org.apache.batik.constants.bnd b/repackage/org.argeo.tp.img/batik/org.apache.batik.constants.bnd similarity index 100% rename from repackage/org.argeo.tp/batik/org.apache.batik.constants.bnd rename to repackage/org.argeo.tp.img/batik/org.apache.batik.constants.bnd diff --git a/repackage/org.argeo.tp/batik/org.apache.batik.css.bnd b/repackage/org.argeo.tp.img/batik/org.apache.batik.css.bnd similarity index 100% rename from repackage/org.argeo.tp/batik/org.apache.batik.css.bnd rename to repackage/org.argeo.tp.img/batik/org.apache.batik.css.bnd diff --git a/repackage/org.argeo.tp/batik/org.apache.batik.i18n.bnd b/repackage/org.argeo.tp.img/batik/org.apache.batik.i18n.bnd similarity index 100% rename from repackage/org.argeo.tp/batik/org.apache.batik.i18n.bnd rename to repackage/org.argeo.tp.img/batik/org.apache.batik.i18n.bnd diff --git a/repackage/org.argeo.tp/batik/org.apache.batik.util.bnd b/repackage/org.argeo.tp.img/batik/org.apache.batik.util.bnd similarity index 100% rename from repackage/org.argeo.tp/batik/org.apache.batik.util.bnd rename to repackage/org.argeo.tp.img/batik/org.apache.batik.util.bnd diff --git a/repackage/org.argeo.tp.utils/com.adobe.xmp.xmpcore.bnd b/repackage/org.argeo.tp.img/com.adobe.xmp.xmpcore.bnd.disabled similarity index 100% rename from repackage/org.argeo.tp.utils/com.adobe.xmp.xmpcore.bnd rename to repackage/org.argeo.tp.img/com.adobe.xmp.xmpcore.bnd.disabled diff --git a/repackage/org.argeo.tp.utils/com.drew.metadata.bnd b/repackage/org.argeo.tp.img/com.drew.metadata.bnd similarity index 62% rename from repackage/org.argeo.tp.utils/com.drew.metadata.bnd rename to repackage/org.argeo.tp.img/com.drew.metadata.bnd index 86e37b3..94689c5 100644 --- a/repackage/org.argeo.tp.utils/com.drew.metadata.bnd +++ b/repackage/org.argeo.tp.img/com.drew.metadata.bnd @@ -1,2 +1,5 @@ SPDX-License-Identifier: Apache-2.0 Argeo-Origin-M2: com.drewnoakes:metadata-extractor:2.18.0 +Import-Package: \ +com.adobe.*;resolution:=optional, \ +* diff --git a/repackage/org.argeo.tp.utils/org.apache.commons.imaging.bnd b/repackage/org.argeo.tp.img/org.apache.commons.imaging.bnd similarity index 100% rename from repackage/org.argeo.tp.utils/org.apache.commons.imaging.bnd rename to repackage/org.argeo.tp.img/org.apache.commons.imaging.bnd diff --git a/repackage/org.argeo.tp/xmlgraphics/merge.bnd b/repackage/org.argeo.tp.img/xmlgraphics/merge.bnd similarity index 100% rename from repackage/org.argeo.tp/xmlgraphics/merge.bnd rename to repackage/org.argeo.tp.img/xmlgraphics/merge.bnd diff --git a/repackage/org.argeo.tp/xmlgraphics/services/org.apache.xmlgraphics.image.loader.spi.ImageConverter b/repackage/org.argeo.tp.img/xmlgraphics/services/org.apache.xmlgraphics.image.loader.spi.ImageConverter similarity index 100% rename from repackage/org.argeo.tp/xmlgraphics/services/org.apache.xmlgraphics.image.loader.spi.ImageConverter rename to repackage/org.argeo.tp.img/xmlgraphics/services/org.apache.xmlgraphics.image.loader.spi.ImageConverter diff --git a/repackage/org.argeo.tp/xmlgraphics/services/org.apache.xmlgraphics.image.loader.spi.ImageLoaderFactory b/repackage/org.argeo.tp.img/xmlgraphics/services/org.apache.xmlgraphics.image.loader.spi.ImageLoaderFactory similarity index 100% rename from repackage/org.argeo.tp/xmlgraphics/services/org.apache.xmlgraphics.image.loader.spi.ImageLoaderFactory rename to repackage/org.argeo.tp.img/xmlgraphics/services/org.apache.xmlgraphics.image.loader.spi.ImageLoaderFactory diff --git a/repackage/org.argeo.tp/xmlgraphics/services/org.apache.xmlgraphics.image.loader.spi.ImagePreloader b/repackage/org.argeo.tp.img/xmlgraphics/services/org.apache.xmlgraphics.image.loader.spi.ImagePreloader similarity index 100% rename from repackage/org.argeo.tp/xmlgraphics/services/org.apache.xmlgraphics.image.loader.spi.ImagePreloader rename to repackage/org.argeo.tp.img/xmlgraphics/services/org.apache.xmlgraphics.image.loader.spi.ImagePreloader diff --git a/repackage/org.argeo.tp.utils/com.googlecode.javaewah.JavaEWAH.bnd b/repackage/org.argeo.tp.sys/com.googlecode.javaewah.JavaEWAH.bnd similarity index 100% rename from repackage/org.argeo.tp.utils/com.googlecode.javaewah.JavaEWAH.bnd rename to repackage/org.argeo.tp.sys/com.googlecode.javaewah.JavaEWAH.bnd diff --git a/repackage/org.argeo.tp/com.sun.jna.platform.bnd b/repackage/org.argeo.tp.sys/com.sun.jna.platform.bnd similarity index 100% rename from repackage/org.argeo.tp/com.sun.jna.platform.bnd rename to repackage/org.argeo.tp.sys/com.sun.jna.platform.bnd diff --git a/repackage/org.argeo.tp.utils/de.thjom.java.systemd.bnd b/repackage/org.argeo.tp.sys/de.thjom.java.systemd.bnd similarity index 100% rename from repackage/org.argeo.tp.utils/de.thjom.java.systemd.bnd rename to repackage/org.argeo.tp.sys/de.thjom.java.systemd.bnd diff --git a/repackage/org.argeo.tp/jackson/com.fasterxml.jackson.core.jackson.annotations.bnd b/repackage/org.argeo.tp.sys/jackson/com.fasterxml.jackson.core.jackson.annotations.bnd similarity index 100% rename from repackage/org.argeo.tp/jackson/com.fasterxml.jackson.core.jackson.annotations.bnd rename to repackage/org.argeo.tp.sys/jackson/com.fasterxml.jackson.core.jackson.annotations.bnd diff --git a/repackage/org.argeo.tp/jackson/com.fasterxml.jackson.core.jackson.core.bnd b/repackage/org.argeo.tp.sys/jackson/com.fasterxml.jackson.core.jackson.core.bnd similarity index 100% rename from repackage/org.argeo.tp/jackson/com.fasterxml.jackson.core.jackson.core.bnd rename to repackage/org.argeo.tp.sys/jackson/com.fasterxml.jackson.core.jackson.core.bnd diff --git a/repackage/org.argeo.tp/jackson/com.fasterxml.jackson.core.jackson.databind.bnd b/repackage/org.argeo.tp.sys/jackson/com.fasterxml.jackson.core.jackson.databind.bnd similarity index 100% rename from repackage/org.argeo.tp/jackson/com.fasterxml.jackson.core.jackson.databind.bnd rename to repackage/org.argeo.tp.sys/jackson/com.fasterxml.jackson.core.jackson.databind.bnd diff --git a/repackage/org.argeo.tp/jackson/common.bnd b/repackage/org.argeo.tp.sys/jackson/common.bnd similarity index 100% rename from repackage/org.argeo.tp/jackson/common.bnd rename to repackage/org.argeo.tp.sys/jackson/common.bnd diff --git a/repackage/org.argeo.tp.utils/javax.activation.bnd b/repackage/org.argeo.tp.sys/javax.activation.bnd similarity index 100% rename from repackage/org.argeo.tp.utils/javax.activation.bnd rename to repackage/org.argeo.tp.sys/javax.activation.bnd diff --git a/repackage/org.argeo.tp.utils/javax.mail.bnd b/repackage/org.argeo.tp.sys/javax.mail.bnd similarity index 100% rename from repackage/org.argeo.tp.utils/javax.mail.bnd rename to repackage/org.argeo.tp.sys/javax.mail.bnd diff --git a/repackage/org.argeo.tp/org.apache.commons.codec.bnd b/repackage/org.argeo.tp.sys/org.apache.commons.codec.bnd similarity index 100% rename from repackage/org.argeo.tp/org.apache.commons.codec.bnd rename to repackage/org.argeo.tp.sys/org.apache.commons.codec.bnd diff --git a/repackage/org.argeo.tp/org.apache.commons.compress.bnd b/repackage/org.argeo.tp.sys/org.apache.commons.compress.bnd similarity index 100% rename from repackage/org.argeo.tp/org.apache.commons.compress.bnd rename to repackage/org.argeo.tp.sys/org.apache.commons.compress.bnd diff --git a/repackage/org.argeo.tp.utils/org.apache.commons.exec.bnd b/repackage/org.argeo.tp.sys/org.apache.commons.exec.bnd similarity index 100% rename from repackage/org.argeo.tp.utils/org.apache.commons.exec.bnd rename to repackage/org.argeo.tp.sys/org.apache.commons.exec.bnd diff --git a/repackage/org.argeo.tp.utils/org.apache.commons.vfs2.bnd b/repackage/org.argeo.tp.sys/org.apache.commons.vfs2.bnd similarity index 100% rename from repackage/org.argeo.tp.utils/org.apache.commons.vfs2.bnd rename to repackage/org.argeo.tp.sys/org.apache.commons.vfs2.bnd diff --git a/repackage/org.argeo.tp/org.apache.httpcomponents.httpclient.bnd b/repackage/org.argeo.tp.sys/org.apache.httpcomponents.httpclient.bnd similarity index 100% rename from repackage/org.argeo.tp/org.apache.httpcomponents.httpclient.bnd rename to repackage/org.argeo.tp.sys/org.apache.httpcomponents.httpclient.bnd diff --git a/repackage/org.argeo.tp/org.apache.httpcomponents.httpcore.bnd b/repackage/org.argeo.tp.sys/org.apache.httpcomponents.httpcore.bnd similarity index 100% rename from repackage/org.argeo.tp/org.apache.httpcomponents.httpcore.bnd rename to repackage/org.argeo.tp.sys/org.apache.httpcomponents.httpcore.bnd diff --git a/repackage/org.argeo.tp/org.apache.httpcomponents.httpmime.bnd b/repackage/org.argeo.tp.sys/org.apache.httpcomponents.httpmime.bnd similarity index 100% rename from repackage/org.argeo.tp/org.apache.httpcomponents.httpmime.bnd rename to repackage/org.argeo.tp.sys/org.apache.httpcomponents.httpmime.bnd diff --git a/repackage/org.argeo.tp/org.apache.tomcat.jni.bnd b/repackage/org.argeo.tp.sys/org.apache.tomcat.jni.bnd similarity index 100% rename from repackage/org.argeo.tp/org.apache.tomcat.jni.bnd rename to repackage/org.argeo.tp.sys/org.apache.tomcat.jni.bnd diff --git a/repackage/org.argeo.tp.utils/org.eclipse.jgit.bnd b/repackage/org.argeo.tp.sys/org.eclipse.jgit.bnd similarity index 100% rename from repackage/org.argeo.tp.utils/org.eclipse.jgit.bnd rename to repackage/org.argeo.tp.sys/org.eclipse.jgit.bnd diff --git a/repackage/org.argeo.tp/org.jline.bnd b/repackage/org.argeo.tp.sys/org.jline.bnd similarity index 100% rename from repackage/org.argeo.tp/org.jline.bnd rename to repackage/org.argeo.tp.sys/org.jline.bnd diff --git a/repackage/org.argeo.tp/org.mozilla.universalchardet.bnd b/repackage/org.argeo.tp.sys/org.mozilla.universalchardet.bnd similarity index 100% rename from repackage/org.argeo.tp/org.mozilla.universalchardet.bnd rename to repackage/org.argeo.tp.sys/org.mozilla.universalchardet.bnd diff --git a/repackage/org.argeo.tp/org.tukaani.xz.bnd b/repackage/org.argeo.tp.sys/org.tukaani.xz.bnd similarity index 100% rename from repackage/org.argeo.tp/org.tukaani.xz.bnd rename to repackage/org.argeo.tp.sys/org.tukaani.xz.bnd diff --git a/repackage/org.argeo.tp.utils/org.apache.commons.csv.bnd b/repackage/org.argeo.tp.utils/org.apache.commons.csv.bnd.disabled similarity index 100% rename from repackage/org.argeo.tp.utils/org.apache.commons.csv.bnd rename to repackage/org.argeo.tp.utils/org.apache.commons.csv.bnd.disabled diff --git a/repackage/org.argeo.tp.utils/org.apache.commons.text.bnd b/repackage/org.argeo.tp.utils/org.apache.commons.text.bnd.disabled similarity index 100% rename from repackage/org.argeo.tp.utils/org.apache.commons.text.bnd rename to repackage/org.argeo.tp.utils/org.apache.commons.text.bnd.disabled diff --git a/repackage/org.argeo.tp.utils/org.mozilla.rhino.bnd b/repackage/org.argeo.tp.utils/org.mozilla.rhino.bnd.disabled similarity index 100% rename from repackage/org.argeo.tp.utils/org.mozilla.rhino.bnd rename to repackage/org.argeo.tp.utils/org.mozilla.rhino.bnd.disabled diff --git a/repackage/org.argeo.tp/org.w3c.dom.smil.bnd b/repackage/org.argeo.tp.utils/org.w3c.dom.smil.bnd similarity index 100% rename from repackage/org.argeo.tp/org.w3c.dom.smil.bnd rename to repackage/org.argeo.tp.utils/org.w3c.dom.smil.bnd diff --git a/repackage/org.argeo.tp/org.w3c.dom.svg.bnd b/repackage/org.argeo.tp.utils/org.w3c.dom.svg.bnd similarity index 100% rename from repackage/org.argeo.tp/org.w3c.dom.svg.bnd rename to repackage/org.argeo.tp.utils/org.w3c.dom.svg.bnd diff --git a/repackage/org.argeo.tp/com.apicatalog.jsonld.bnd b/repackage/org.argeo.tp/com.apicatalog.jsonld.bnd.disabled similarity index 100% rename from repackage/org.argeo.tp/com.apicatalog.jsonld.bnd rename to repackage/org.argeo.tp/com.apicatalog.jsonld.bnd.disabled diff --git a/sdk/output-argeo-tp-apps.target b/sdk/output-argeo-tp-apps.target index ab4040a..4347af1 100644 --- a/sdk/output-argeo-tp-apps.target +++ b/sdk/output-argeo-tp-apps.target @@ -3,6 +3,7 @@ + diff --git a/sdk/output-argeo-tp-platform.target b/sdk/output-argeo-tp-platform.target index 08e0cb7..893afc0 100644 --- a/sdk/output-argeo-tp-platform.target +++ b/sdk/output-argeo-tp-platform.target @@ -5,12 +5,13 @@ - + + \ No newline at end of file diff --git a/sdk/output-argeo-tp-rcp-win.target b/sdk/output-argeo-tp-rcp-win.target index 8696d84..c692070 100644 --- a/sdk/output-argeo-tp-rcp-win.target +++ b/sdk/output-argeo-tp-rcp-win.target @@ -3,6 +3,7 @@ + diff --git a/sdk/output-argeo-tp-rcp.target b/sdk/output-argeo-tp-rcp.target index bd35257..2f2d6ac 100644 --- a/sdk/output-argeo-tp-rcp.target +++ b/sdk/output-argeo-tp-rcp.target @@ -3,6 +3,7 @@ + diff --git a/sdk/output-argeo-tp-swt.target b/sdk/output-argeo-tp-swt.target index 40bee2f..76a1b32 100644 --- a/sdk/output-argeo-tp-swt.target +++ b/sdk/output-argeo-tp-swt.target @@ -3,7 +3,6 @@ - -- 2.30.2