Merge tag 'v2.3.18' into testing
authorMathieu Baudier <mbaudier@argeo.org>
Sat, 16 Mar 2024 07:00:57 +0000 (08:00 +0100)
committerMathieu Baudier <mbaudier@argeo.org>
Sat, 16 Mar 2024 07:00:57 +0000 (08:00 +0100)
37 files changed:
rebuild/Makefile
rebuild/org.argeo.tp.sys/Makefile [new file with mode: 0644]
rebuild/org.argeo.tp.sys/jni/org_eclipse_angus_mail_mbox/.gitignore [new file with mode: 0644]
rebuild/org.argeo.tp.sys/org.eclipse.angus.mail.mbox/.classpath [new file with mode: 0644]
rebuild/org.argeo.tp.sys/org.eclipse.angus.mail.mbox/.gitignore [new file with mode: 0644]
rebuild/org.argeo.tp.sys/org.eclipse.angus.mail.mbox/.project [new file with mode: 0644]
rebuild/org.argeo.tp.sys/org.eclipse.angus.mail.mbox/META-INF/.gitignore [new file with mode: 0644]
rebuild/org.argeo.tp.sys/org.eclipse.angus.mail.mbox/bnd.bnd [new file with mode: 0644]
rebuild/org.argeo.tp.sys/org.eclipse.angus.mail.mbox/build.properties [new file with mode: 0644]
rebuild/org.argeo.tp.sys/src/.gitignore [new file with mode: 0644]
rebuild/org.argeo.tp.utils/Makefile [deleted file]
rebuild/org.argeo.tp.utils/jni/com_sun_mail_mbox/UNIXFile.c [deleted file]
rebuild/org.argeo.tp.utils/jni/com_sun_mail_mbox/UNIXInbox.c [deleted file]
rebuild/org.argeo.tp.utils/jni/com_sun_mail_mbox/com_sun_mail_mbox_UNIXFile.h [deleted file]
rebuild/org.argeo.tp.utils/jni/com_sun_mail_mbox/com_sun_mail_mbox_UNIXInbox.h [deleted file]
rebuild/org.argeo.tp.utils/jni/org_eclipse_angus_mail_mbox/.gitignore [deleted file]
rebuild/org.argeo.tp.utils/org.eclipse.angus.mail.mbox/.classpath [deleted file]
rebuild/org.argeo.tp.utils/org.eclipse.angus.mail.mbox/.gitignore [deleted file]
rebuild/org.argeo.tp.utils/org.eclipse.angus.mail.mbox/.project [deleted file]
rebuild/org.argeo.tp.utils/org.eclipse.angus.mail.mbox/META-INF/.gitignore [deleted file]
rebuild/org.argeo.tp.utils/org.eclipse.angus.mail.mbox/bnd.bnd [deleted file]
rebuild/org.argeo.tp.utils/org.eclipse.angus.mail.mbox/build.properties [deleted file]
rebuild/org.argeo.tp.utils/src/.gitignore [deleted file]
repackage/lib/linux/aarch64/org.argeo.tp.sys/jna/com.sun.jna.platform.bnd [deleted file]
repackage/lib/linux/aarch64/org.argeo.tp.sys/org.apache.tomcat.jni.bnd [new file with mode: 0644]
repackage/lib/linux/x86_64/org.argeo.tp.sys/jna/com.sun.jna.platform.bnd [deleted file]
repackage/lib/linux/x86_64/org.argeo.tp.sys/org.apache.tomcat.jni.bnd [new file with mode: 0644]
repackage/lib/macosx/x86_64/org.argeo.tp.sys/jna/com.sun.jna.platform.bnd [deleted file]
repackage/lib/win32/x86_64/org.argeo.tp.sys/jna/com.sun.jna.platform.bnd [deleted file]
repackage/org.argeo.tp.office/poi/org.apache.poi.ooxml.bnd
repackage/org.argeo.tp.sys/com.sun.jna.platform.bnd [new file with mode: 0644]
repackage/org.argeo.tp.sys/org.apache.tomcat.jni.bnd [deleted file]
repackage/osgi/equinox/org.argeo.tp.eclipse/eclipse-equinox/includes.properties
repackage/osgi/equinox/org.argeo.tp.osgi/eclipse-equinox/includes.properties
repackage/swt/rcp/org.argeo.tp.swt.workbench/com.sun.jna.bnd [new file with mode: 0644]
sdk/argeo-build
sdk/branches/unstable.bnd

index 792dfdac8af3679878a894586ab26f3b7498da04..243c3e0a1cf85641d2c620e62ab3e5c753535da7 100644 (file)
@@ -1,14 +1,13 @@
 .PHONY: clean all
 
 all:
-       make -C org.argeo.tp.utils all
-
+       make -C org.argeo.tp.sys
 install:
-       make -C org.argeo.tp.utils install
+       make -C org.argeo.tp.sys install
        
 uninstall:
-       make -C org.argeo.tp.utils uninstall
+       make -C org.argeo.tp.sys uninstall
        
 clean:
-       make -C org.argeo.tp.utils clean
+       make -C org.argeo.tp.sys clean
        
\ No newline at end of file
diff --git a/rebuild/org.argeo.tp.sys/Makefile b/rebuild/org.argeo.tp.sys/Makefile
new file mode 100644 (file)
index 0000000..ad9857c
--- /dev/null
@@ -0,0 +1,63 @@
+include ../../sdk.mk
+.PHONY: clean all osgi
+
+export NO_SDK_LEGAL := true
+
+A2_CATEGORY = org.argeo.tp.sys
+
+MBOX_JNI_SRC=jni/org_eclipse_angus_mail_mbox
+MBOX_TARGET_EXEC=libmbox.so
+
+## FIXME - DON'T FORGET TO UPDATE THE VERSION IN THE RELATED bnd.bnd FILE!
+ANGUS_BRANCH=2.0
+ANGUS_VERSION=$(ANGUS_BRANCH).2
+
+all: retrieve-angus-mbox osgi jni-angus-mbox
+
+install:
+       mkdir -p $(A2_NATIVE_INSTALL_TARGET)/$(A2_CATEGORY)
+       # Angus mbox
+       $(INSTALL) $(A2_NATIVE_INSTALL_TARGET)/$(A2_CATEGORY) $(SDK_BUILD_BASE)/a2/$(A2_CATEGORY)/org.eclipse.angus.mail.mbox.$(ANGUS_BRANCH).jar
+       $(INSTALL) $(A2_NATIVE_INSTALL_TARGET) $(A2_NATIVE_CATEGORY)/$(MBOX_TARGET_EXEC)
+       
+uninstall: osgi-uninstall
+       $(RM) $(A2_NATIVE_INSTALL_TARGET)/$(MBOX_TARGET_EXEC)
+       @if [ -d $(A2_NATIVE_INSTALL_TARGET) ]; then find $(A2_NATIVE_INSTALL_TARGET) -empty -type d -delete; fi
+
+retrieve-angus-mbox: SRC_DIR=src/angus-mail
+retrieve-angus-mbox:
+       rm -rf $(SRC_DIR)
+       mkdir -p $(SRC_DIR)
+#git -C $(SRC_DIR) init
+#git -C $(SRC_DIR) remote add -f origin https://github.com/eclipse-ee4j/mail.git
+#git -C $(SRC_DIR) config core.sparseCheckout true
+#echo "mbox" >> $(SRC_DIR)/.git/info/sparse-checkout
+#git -C $(SRC_DIR) pull origin 1.6.7
+       git clone --branch $(ANGUS_VERSION) https://github.com/eclipse-ee4j/angus-mail.git $(SRC_DIR)
+       rm -rf $(SRC_DIR)/.git
+       rsync -a --delete --exclude module-info.java $(SRC_DIR)/providers/mbox/src/main/java/ org.eclipse.angus.mail.mbox/src
+       # jni
+       rsync -a $(SRC_DIR)/providers/mbox/src/main/cpp/org/eclipse/angus/mail/mbox/ $(MBOX_JNI_SRC)
+       mkdir -p org.eclipse.angus.mail.mbox/bin
+       javac -h $(MBOX_JNI_SRC) -cp "$(A2_OUTPUT)/org.argeo.tp.sys/*" org.eclipse.angus.mail.mbox/src/org/eclipse/angus/mail/mbox/*.java
+       rm -rf org.eclipse.angus.mail.mbox/bin
+
+
+BUNDLES = \
+org.eclipse.angus.mail.mbox \
+
+clean:
+       rm -rf $(BUILD_BASE)
+
+DEP_CATEGORIES = org.argeo.tp.sys
+
+include $(SDK_SRC_BASE)/sdk/argeo-build/osgi.mk
+
+A2_NATIVE_CATEGORY=$(A2_OUTPUT)/lib/linux/$(shell uname -m)/$(A2_CATEGORY)
+
+jni-angus-mbox:
+       mkdir -p $(A2_NATIVE_CATEGORY)
+       $(CC) -o $(A2_NATIVE_CATEGORY)/$(MBOX_TARGET_EXEC) \
+        -shared -fPIC -fpic -Wl,-soname,$(MBOX_TARGET_EXEC).$(ANGUS_BRANCH) \
+        -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux $(MBOX_JNI_SRC)/*.c
+
diff --git a/rebuild/org.argeo.tp.sys/jni/org_eclipse_angus_mail_mbox/.gitignore b/rebuild/org.argeo.tp.sys/jni/org_eclipse_angus_mail_mbox/.gitignore
new file mode 100644 (file)
index 0000000..9b838de
--- /dev/null
@@ -0,0 +1,2 @@
+/*.h
+/*.c
diff --git a/rebuild/org.argeo.tp.sys/org.eclipse.angus.mail.mbox/.classpath b/rebuild/org.argeo.tp.sys/org.eclipse.angus.mail.mbox/.classpath
new file mode 100644 (file)
index 0000000..ca9ba96
--- /dev/null
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
+       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
+               <attributes>
+                       <attribute name="module" value="true"/>
+               </attributes>
+       </classpathentry>
+       <classpathentry kind="src" path="src"/>
+       <classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/rebuild/org.argeo.tp.sys/org.eclipse.angus.mail.mbox/.gitignore b/rebuild/org.argeo.tp.sys/org.eclipse.angus.mail.mbox/.gitignore
new file mode 100644 (file)
index 0000000..668266f
--- /dev/null
@@ -0,0 +1,2 @@
+/src/
+/bin/
\ No newline at end of file
diff --git a/rebuild/org.argeo.tp.sys/org.eclipse.angus.mail.mbox/.project b/rebuild/org.argeo.tp.sys/org.eclipse.angus.mail.mbox/.project
new file mode 100644 (file)
index 0000000..c003462
--- /dev/null
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+       <name>com.sun.mail.mbox</name>
+       <comment></comment>
+       <projects>
+       </projects>
+       <buildSpec>
+               <buildCommand>
+                       <name>org.eclipse.jdt.core.javabuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+               <buildCommand>
+                       <name>org.eclipse.pde.ManifestBuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+               <buildCommand>
+                       <name>org.eclipse.pde.SchemaBuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+       </buildSpec>
+       <natures>
+               <nature>org.eclipse.pde.PluginNature</nature>
+               <nature>org.eclipse.jdt.core.javanature</nature>
+       </natures>
+</projectDescription>
diff --git a/rebuild/org.argeo.tp.sys/org.eclipse.angus.mail.mbox/META-INF/.gitignore b/rebuild/org.argeo.tp.sys/org.eclipse.angus.mail.mbox/META-INF/.gitignore
new file mode 100644 (file)
index 0000000..4854a41
--- /dev/null
@@ -0,0 +1 @@
+/MANIFEST.MF
diff --git a/rebuild/org.argeo.tp.sys/org.eclipse.angus.mail.mbox/bnd.bnd b/rebuild/org.argeo.tp.sys/org.eclipse.angus.mail.mbox/bnd.bnd
new file mode 100644 (file)
index 0000000..b486982
--- /dev/null
@@ -0,0 +1,10 @@
+Export-Package: org.eclipse.angus.mail.*
+
+Import-Package: \
+jakarta.mail.event,\
+org.graalvm.*;resolution:="optional",\
+*
+
+major: 2
+minor: 0
+micro: 2
diff --git a/rebuild/org.argeo.tp.sys/org.eclipse.angus.mail.mbox/build.properties b/rebuild/org.argeo.tp.sys/org.eclipse.angus.mail.mbox/build.properties
new file mode 100644 (file)
index 0000000..34d2e4d
--- /dev/null
@@ -0,0 +1,4 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .
diff --git a/rebuild/org.argeo.tp.sys/src/.gitignore b/rebuild/org.argeo.tp.sys/src/.gitignore
new file mode 100644 (file)
index 0000000..a738803
--- /dev/null
@@ -0,0 +1 @@
+angus-mail/
\ No newline at end of file
diff --git a/rebuild/org.argeo.tp.utils/Makefile b/rebuild/org.argeo.tp.utils/Makefile
deleted file mode 100644 (file)
index 6217ae6..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-include ../../sdk.mk
-.PHONY: clean all osgi
-
-export NO_SDK_LEGAL := true
-
-A2_CATEGORY = org.argeo.tp.sys
-
-# GNU
-prefix ?= /usr/local
-exec_prefix ?= $(prefix)
-libdir ?= $(exec_prefix)/lib
-A2_NATIVE_INSTALL_TARGET ?= $(DESTDIR)$(libdir)/a2
-
-MBOX_JNI_SRC=jni/org_eclipse_angus_mail_mbox
-MBOX_TARGET_EXEC=libmbox.so
-
-## FIXME - DON'T FORGET TO UPDATE THE VERSION IN THE RELATED bnd.bnd FILE!
-ANGUS_BRANCH=2.0
-ANGUS_VERSION=$(ANGUS_BRANCH).2
-
-all: retrieve-angus-mbox osgi jni-angus-mbox
-
-install:
-       mkdir -p $(A2_NATIVE_INSTALL_TARGET)/$(A2_CATEGORY)
-       # Angus mbox
-       cp -Rv $(SDK_BUILD_BASE)/a2/$(A2_CATEGORY)/org.eclipse.angus.mail.mbox.$(ANGUS_BRANCH).jar $(A2_INSTALL_TARGET)/$(A2_CATEGORY)
-       cp -v $(A2_NATIVE_CATEGORY)/$(MBOX_TARGET_EXEC) $(A2_NATIVE_INSTALL_TARGET)/$(A2_CATEGORY)
-       
-uninstall: osgi-uninstall
-
-retrieve-angus-mbox: SRC_DIR=src/angus-mail
-retrieve-angus-mbox:
-       rm -rf $(SRC_DIR)
-       mkdir -p $(SRC_DIR)
-#git -C $(SRC_DIR) init
-#git -C $(SRC_DIR) remote add -f origin https://github.com/eclipse-ee4j/mail.git
-#git -C $(SRC_DIR) config core.sparseCheckout true
-#echo "mbox" >> $(SRC_DIR)/.git/info/sparse-checkout
-#git -C $(SRC_DIR) pull origin 1.6.7
-       git clone --branch $(ANGUS_VERSION) https://github.com/eclipse-ee4j/angus-mail.git $(SRC_DIR)
-       rm -rf $(SRC_DIR)/.git
-       rsync -a --delete --exclude module-info.java $(SRC_DIR)/providers/mbox/src/main/java/ org.eclipse.angus.mail.mbox/src
-       # jni
-       rsync -a $(SRC_DIR)/providers/mbox/src/main/cpp/org/eclipse/angus/mail/mbox/ $(MBOX_JNI_SRC)
-       mkdir -p org.eclipse.angus.mail.mbox/bin
-       javac -h $(MBOX_JNI_SRC) -cp "$(A2_OUTPUT)/org.argeo.tp.sys/*" org.eclipse.angus.mail.mbox/src/org/eclipse/angus/mail/mbox/*.java
-       rm -rf org.eclipse.angus.mail.mbox/bin
-
-
-BUNDLES = \
-org.eclipse.angus.mail.mbox \
-
-clean:
-       rm -rf $(BUILD_BASE)
-
-DEP_CATEGORIES = org.argeo.tp.sys
-
-include  $(SDK_SRC_BASE)/sdk/argeo-build/osgi.mk
-
-A2_NATIVE_CATEGORY=$(A2_OUTPUT)/lib/linux/$(shell uname -m)/$(A2_CATEGORY)
-
-jni-angus-mbox:
-       mkdir -p $(A2_NATIVE_CATEGORY)
-       $(CC) -o $(A2_NATIVE_CATEGORY)/$(MBOX_TARGET_EXEC) \
-        -shared -fPIC -fpic -Wl,-soname,$(MBOX_TARGET_EXEC).$(ANGUS_BRANCH) \
-        -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux $(MBOX_JNI_SRC)/*.c
-
diff --git a/rebuild/org.argeo.tp.utils/jni/com_sun_mail_mbox/UNIXFile.c b/rebuild/org.argeo.tp.utils/jni/com_sun_mail_mbox/UNIXFile.c
deleted file mode 100644 (file)
index e66a772..0000000
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-#include <jni.h>
-#include <fcntl.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-
-extern int _fcntl();
-
-#include "com_sun_mail_mbox_UNIXFile.h"
-
-static jfieldID IO_fd_fdID;
-static int fd_offset;
-
-/*
- * Class:     com_sun_mail_mbox_UNIXFile
- * Method:    initIDs
- * Signature: (Ljava/lang/Class;Ljava/io/FileDescriptor;)V
- */
-JNIEXPORT void JNICALL
-Java_com_sun_mail_mbox_UNIXFile_initIDs(JNIEnv *env, jclass ufClass,
-    jclass fdClass, jobject stdin_obj)
-{
-       IO_fd_fdID = (*env)->GetFieldID(env, fdClass, "fd", "I");
-       /*
-        * Because pre-JDK 1.2 stored the "fd" as one more than
-        * its actual value, we remember the value it stored for
-        * stdin, which should be zero, and use it as the offset
-        * for other fd's we extract.
-        */
-       fd_offset = (*env)->GetIntField(env, stdin_obj, IO_fd_fdID);
-}
-
-/*
- * Class:     com_sun_mail_mbox_UNIXFile
- * Method:    lock0
- * Signature: (Ljava/io/FileDescriptor;Ljava/lang/String;Z)Z
- */
-JNIEXPORT jboolean JNICALL
-Java_com_sun_mail_mbox_UNIXFile_lock0(JNIEnv *env, jclass clazz,
-    jobject fdobj, jstring umode, jboolean block)
-{
-       int fd;
-       const char *mode;
-       static struct flock flock0;
-       struct flock flock = flock0;
-
-       fd = (*env)->GetIntField(env, fdobj, IO_fd_fdID);
-       fd -= fd_offset;
-       /* XXX - a lot of work to examine one character in a string */
-       mode = (*env)->GetStringUTFChars(env, umode, 0);
-       flock.l_type = mode[1] == 'w' ? F_WRLCK : F_RDLCK;
-       (*env)->ReleaseStringUTFChars(env, umode, mode);
-       flock.l_whence = SEEK_SET;
-       flock.l_start = 0;
-       flock.l_len = 0;
-       return (_fcntl(fd, block ? F_SETLKW : F_SETLK, &flock) == 0 ?
-               JNI_TRUE : JNI_FALSE);
-}
-
-/*
- * Class:     com_sun_mail_mbox_UNIXFile
- * Method:    lastAccessed0
- * Signature: (Ljava/lang/String;)J
- */
-JNIEXPORT jlong JNICALL
-Java_com_sun_mail_mbox_UNIXFile_lastAccessed0(JNIEnv *env, jclass clazz,
-       jstring uname)
-{
-       const char *name;
-       jlong ret = -1;
-       struct stat st;
-
-       name = (*env)->GetStringUTFChars(env, uname, 0);
-       if (stat(name, &st) == 0) {
-               /*
-                * Should be...
-               ret = (jlong)st.st_atim.tv_sec * 1000 +
-                       st.st_atim.tv_nsec / 1000000;
-                * but for compatibility with lastModified we use...
-                */
-               ret = (jlong)st.st_atime * 1000;
-       }
-       (*env)->ReleaseStringUTFChars(env, uname, name);
-       return ret;
-}
diff --git a/rebuild/org.argeo.tp.utils/jni/com_sun_mail_mbox/UNIXInbox.c b/rebuild/org.argeo.tp.utils/jni/com_sun_mail_mbox/UNIXInbox.c
deleted file mode 100644 (file)
index 274a44e..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-#include <jni.h>
-#include <maillock.h>
-extern void touchlock();       /* XXX - should be in maillock.h */
-
-#include "com_sun_mail_mbox_UNIXInbox.h"
-
-/*
- * Class:     com_sun_mail_mbox_UNIXInbox
- * Method:    maillock
- * Signature: (Ljava/lang/String;I)Z
- */
-JNIEXPORT jboolean JNICALL
-Java_com_sun_mail_mbox_UNIXInbox_maillock(JNIEnv *env, jobject obj,
-    jstring user, jint retry_count)
-{
-       jboolean ret;
-       const char *name = (*env)->GetStringUTFChars(env, user, 0);
-       ret = maillock((char *)name, retry_count) == L_SUCCESS ?
-           JNI_TRUE : JNI_FALSE;
-       (*env)->ReleaseStringUTFChars(env, user, name);
-       return (ret);
-}
-
-/*
- * Class:     com_sun_mail_mbox_UNIXInbox
- * Method:    mailunlock
- * Signature: ()V
- */
-JNIEXPORT void JNICALL
-Java_com_sun_mail_mbox_UNIXInbox_mailunlock(JNIEnv *env, jobject obj)
-{
-       (void) mailunlock();
-}
-
-/*
- * Class:     com_sun_mail_mbox_UNIXInbox
- * Method:    touchlock0
- * Signature: ()V
- */
-JNIEXPORT void JNICALL
-Java_com_sun_mail_mbox_UNIXInbox_touchlock0(JNIEnv *env, jobject obj)
-{
-       (void) touchlock();
-}
diff --git a/rebuild/org.argeo.tp.utils/jni/com_sun_mail_mbox/com_sun_mail_mbox_UNIXFile.h b/rebuild/org.argeo.tp.utils/jni/com_sun_mail_mbox/com_sun_mail_mbox_UNIXFile.h
deleted file mode 100644 (file)
index c85274f..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class com_sun_mail_mbox_UNIXFile */
-
-#ifndef _Included_com_sun_mail_mbox_UNIXFile
-#define _Included_com_sun_mail_mbox_UNIXFile
-#ifdef __cplusplus
-extern "C" {
-#endif
-#undef com_sun_mail_mbox_UNIXFile_serialVersionUID
-#define com_sun_mail_mbox_UNIXFile_serialVersionUID 301077366599181567LL
-#undef com_sun_mail_mbox_UNIXFile_serialVersionUID
-#define com_sun_mail_mbox_UNIXFile_serialVersionUID -7972156315284146651LL
-#undef com_sun_mail_mbox_UNIXFile_NONE
-#define com_sun_mail_mbox_UNIXFile_NONE 0L
-#undef com_sun_mail_mbox_UNIXFile_NATIVE
-#define com_sun_mail_mbox_UNIXFile_NATIVE 1L
-#undef com_sun_mail_mbox_UNIXFile_JAVA
-#define com_sun_mail_mbox_UNIXFile_JAVA 2L
-/*
- * Class:     com_sun_mail_mbox_UNIXFile
- * Method:    initIDs
- * Signature: (Ljava/lang/Class;Ljava/io/FileDescriptor;)V
- */
-JNIEXPORT void JNICALL Java_com_sun_mail_mbox_UNIXFile_initIDs
-  (JNIEnv *, jclass, jclass, jobject);
-
-/*
- * Class:     com_sun_mail_mbox_UNIXFile
- * Method:    lock0
- * Signature: (Ljava/io/FileDescriptor;Ljava/lang/String;Z)Z
- */
-JNIEXPORT jboolean JNICALL Java_com_sun_mail_mbox_UNIXFile_lock0
-  (JNIEnv *, jclass, jobject, jstring, jboolean);
-
-/*
- * Class:     com_sun_mail_mbox_UNIXFile
- * Method:    lastAccessed0
- * Signature: (Ljava/lang/String;)J
- */
-JNIEXPORT jlong JNICALL Java_com_sun_mail_mbox_UNIXFile_lastAccessed0
-  (JNIEnv *, jclass, jstring);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/rebuild/org.argeo.tp.utils/jni/com_sun_mail_mbox/com_sun_mail_mbox_UNIXInbox.h b/rebuild/org.argeo.tp.utils/jni/com_sun_mail_mbox/com_sun_mail_mbox_UNIXInbox.h
deleted file mode 100644 (file)
index 9f24cb9..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class com_sun_mail_mbox_UNIXInbox */
-
-#ifndef _Included_com_sun_mail_mbox_UNIXInbox
-#define _Included_com_sun_mail_mbox_UNIXInbox
-#ifdef __cplusplus
-extern "C" {
-#endif
-#undef com_sun_mail_mbox_UNIXInbox_serialVersionUID
-#define com_sun_mail_mbox_UNIXInbox_serialVersionUID 301077366599181567LL
-#undef com_sun_mail_mbox_UNIXInbox_serialVersionUID
-#define com_sun_mail_mbox_UNIXInbox_serialVersionUID -7972156315284146651LL
-#undef com_sun_mail_mbox_UNIXInbox_NONE
-#define com_sun_mail_mbox_UNIXInbox_NONE 0L
-#undef com_sun_mail_mbox_UNIXInbox_NATIVE
-#define com_sun_mail_mbox_UNIXInbox_NATIVE 1L
-#undef com_sun_mail_mbox_UNIXInbox_JAVA
-#define com_sun_mail_mbox_UNIXInbox_JAVA 2L
-#undef com_sun_mail_mbox_UNIXInbox_serialVersionUID
-#define com_sun_mail_mbox_UNIXInbox_serialVersionUID -254578891263785591LL
-#undef com_sun_mail_mbox_UNIXInbox_serialVersionUID
-#define com_sun_mail_mbox_UNIXInbox_serialVersionUID 651261842162777620LL
-/*
- * Class:     com_sun_mail_mbox_UNIXInbox
- * Method:    maillock
- * Signature: (Ljava/lang/String;I)Z
- */
-JNIEXPORT jboolean JNICALL Java_com_sun_mail_mbox_UNIXInbox_maillock
-  (JNIEnv *, jobject, jstring, jint);
-
-/*
- * Class:     com_sun_mail_mbox_UNIXInbox
- * Method:    mailunlock
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_com_sun_mail_mbox_UNIXInbox_mailunlock
-  (JNIEnv *, jobject);
-
-/*
- * Class:     com_sun_mail_mbox_UNIXInbox
- * Method:    touchlock0
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_com_sun_mail_mbox_UNIXInbox_touchlock0
-  (JNIEnv *, jobject);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/rebuild/org.argeo.tp.utils/jni/org_eclipse_angus_mail_mbox/.gitignore b/rebuild/org.argeo.tp.utils/jni/org_eclipse_angus_mail_mbox/.gitignore
deleted file mode 100644 (file)
index 9b838de..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-/*.h
-/*.c
diff --git a/rebuild/org.argeo.tp.utils/org.eclipse.angus.mail.mbox/.classpath b/rebuild/org.argeo.tp.utils/org.eclipse.angus.mail.mbox/.classpath
deleted file mode 100644 (file)
index ca9ba96..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
-       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
-               <attributes>
-                       <attribute name="module" value="true"/>
-               </attributes>
-       </classpathentry>
-       <classpathentry kind="src" path="src"/>
-       <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/rebuild/org.argeo.tp.utils/org.eclipse.angus.mail.mbox/.gitignore b/rebuild/org.argeo.tp.utils/org.eclipse.angus.mail.mbox/.gitignore
deleted file mode 100644 (file)
index 668266f..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-/src/
-/bin/
\ No newline at end of file
diff --git a/rebuild/org.argeo.tp.utils/org.eclipse.angus.mail.mbox/.project b/rebuild/org.argeo.tp.utils/org.eclipse.angus.mail.mbox/.project
deleted file mode 100644 (file)
index c003462..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-       <name>com.sun.mail.mbox</name>
-       <comment></comment>
-       <projects>
-       </projects>
-       <buildSpec>
-               <buildCommand>
-                       <name>org.eclipse.jdt.core.javabuilder</name>
-                       <arguments>
-                       </arguments>
-               </buildCommand>
-               <buildCommand>
-                       <name>org.eclipse.pde.ManifestBuilder</name>
-                       <arguments>
-                       </arguments>
-               </buildCommand>
-               <buildCommand>
-                       <name>org.eclipse.pde.SchemaBuilder</name>
-                       <arguments>
-                       </arguments>
-               </buildCommand>
-       </buildSpec>
-       <natures>
-               <nature>org.eclipse.pde.PluginNature</nature>
-               <nature>org.eclipse.jdt.core.javanature</nature>
-       </natures>
-</projectDescription>
diff --git a/rebuild/org.argeo.tp.utils/org.eclipse.angus.mail.mbox/META-INF/.gitignore b/rebuild/org.argeo.tp.utils/org.eclipse.angus.mail.mbox/META-INF/.gitignore
deleted file mode 100644 (file)
index 4854a41..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/MANIFEST.MF
diff --git a/rebuild/org.argeo.tp.utils/org.eclipse.angus.mail.mbox/bnd.bnd b/rebuild/org.argeo.tp.utils/org.eclipse.angus.mail.mbox/bnd.bnd
deleted file mode 100644 (file)
index b486982..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-Export-Package: org.eclipse.angus.mail.*
-
-Import-Package: \
-jakarta.mail.event,\
-org.graalvm.*;resolution:="optional",\
-*
-
-major: 2
-minor: 0
-micro: 2
diff --git a/rebuild/org.argeo.tp.utils/org.eclipse.angus.mail.mbox/build.properties b/rebuild/org.argeo.tp.utils/org.eclipse.angus.mail.mbox/build.properties
deleted file mode 100644 (file)
index 34d2e4d..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .
diff --git a/rebuild/org.argeo.tp.utils/src/.gitignore b/rebuild/org.argeo.tp.utils/src/.gitignore
deleted file mode 100644 (file)
index a738803..0000000
+++ /dev/null
@@ -1 +0,0 @@
-angus-mail/
\ No newline at end of file
diff --git a/repackage/lib/linux/aarch64/org.argeo.tp.sys/jna/com.sun.jna.platform.bnd b/repackage/lib/linux/aarch64/org.argeo.tp.sys/jna/com.sun.jna.platform.bnd
deleted file mode 100644 (file)
index 11a8eb3..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-Argeo-Origin-M2: net.java.dev.jna:jna-platform
-Argeo-Origin-NoMetadataGeneration: true
diff --git a/repackage/lib/linux/aarch64/org.argeo.tp.sys/org.apache.tomcat.jni.bnd b/repackage/lib/linux/aarch64/org.argeo.tp.sys/org.apache.tomcat.jni.bnd
new file mode 100644 (file)
index 0000000..b42bd2a
--- /dev/null
@@ -0,0 +1,2 @@
+SPDX-License-Identifier: Apache-2.0
+Argeo-Origin-M2: org.apache.tomcat:tomcat-jni:10.1.19
\ No newline at end of file
diff --git a/repackage/lib/linux/x86_64/org.argeo.tp.sys/jna/com.sun.jna.platform.bnd b/repackage/lib/linux/x86_64/org.argeo.tp.sys/jna/com.sun.jna.platform.bnd
deleted file mode 100644 (file)
index 11a8eb3..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-Argeo-Origin-M2: net.java.dev.jna:jna-platform
-Argeo-Origin-NoMetadataGeneration: true
diff --git a/repackage/lib/linux/x86_64/org.argeo.tp.sys/org.apache.tomcat.jni.bnd b/repackage/lib/linux/x86_64/org.argeo.tp.sys/org.apache.tomcat.jni.bnd
new file mode 100644 (file)
index 0000000..b42bd2a
--- /dev/null
@@ -0,0 +1,2 @@
+SPDX-License-Identifier: Apache-2.0
+Argeo-Origin-M2: org.apache.tomcat:tomcat-jni:10.1.19
\ No newline at end of file
diff --git a/repackage/lib/macosx/x86_64/org.argeo.tp.sys/jna/com.sun.jna.platform.bnd b/repackage/lib/macosx/x86_64/org.argeo.tp.sys/jna/com.sun.jna.platform.bnd
deleted file mode 100644 (file)
index 11a8eb3..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-Argeo-Origin-M2: net.java.dev.jna:jna-platform
-Argeo-Origin-NoMetadataGeneration: true
diff --git a/repackage/lib/win32/x86_64/org.argeo.tp.sys/jna/com.sun.jna.platform.bnd b/repackage/lib/win32/x86_64/org.argeo.tp.sys/jna/com.sun.jna.platform.bnd
deleted file mode 100644 (file)
index 11a8eb3..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-Argeo-Origin-M2: net.java.dev.jna:jna-platform
-Argeo-Origin-NoMetadataGeneration: true
index 2a8bcf6d16d97443fc3517ac870802e68aa7cd9e..f043ee1be8b7410fe4cab67e06c893809342bb69 100644 (file)
@@ -3,5 +3,6 @@ com.graphbuilder.*;resolution:=optional,\
 com.graphbuilder.*;resolution:=optional,\
 org.etsi.uri.*;resolution:=optional,\
 org.apache.logging.log4j.*;resolution:=optional,\
+org.bouncycastle.*;resolution:=optional,\
 *
 Argeo-Origin-M2: org.apache.poi:poi-ooxml
diff --git a/repackage/org.argeo.tp.sys/com.sun.jna.platform.bnd b/repackage/org.argeo.tp.sys/com.sun.jna.platform.bnd
new file mode 100644 (file)
index 0000000..a36ded7
--- /dev/null
@@ -0,0 +1,2 @@
+Argeo-Origin-M2: net.java.dev.jna:jna-platform:5.13.0
+SPDX-License-Identifier: Apache-2.0
diff --git a/repackage/org.argeo.tp.sys/org.apache.tomcat.jni.bnd b/repackage/org.argeo.tp.sys/org.apache.tomcat.jni.bnd
deleted file mode 100644 (file)
index d09967e..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-SPDX-License-Identifier: Apache-2.0
-# Use Tomcat v9 to stay compatible with JNI library v1.2 provided by Debian 11
-Argeo-Origin-M2: org.apache.tomcat:tomcat-jni:9.0.78
\ No newline at end of file
index ac8b8b7a7393bb4367779810765e57d18da03b21..4aaa9470eb3164cbc538ee041afa42647f991099 100644 (file)
@@ -1,6 +1,5 @@
 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=
index e96922c7fe975c39b031a434b0b5cb2d698860ca..3ce71c63d3abbda01486b76bb073ff00efef682d 100644 (file)
@@ -8,3 +8,4 @@ plugins/org.apache.felix.gogo.*.jar=
 plugins/org.apache.felix.scr*.jar=
 plugins/org.eclipse.equinox.console_*.jar=
 plugins/org.eclipse.equinox.console.source_*.jar=
+plugins/org.eclipse.equinox.common*.jar=
diff --git a/repackage/swt/rcp/org.argeo.tp.swt.workbench/com.sun.jna.bnd b/repackage/swt/rcp/org.argeo.tp.swt.workbench/com.sun.jna.bnd
new file mode 100644 (file)
index 0000000..ac2786b
--- /dev/null
@@ -0,0 +1,5 @@
+# Fake JNA bundle
+# FIXME make it smaller
+Argeo-Origin-M2: net.java.dev.jna:jna:5.13.0
+SPDX-License-Identifier: Apache-2.0
+Export-Package:
index cabcc3462226b71849ca42301c21e05b63f150c2..979b11e352bda7d783c921a62e8cb5ed950a7564 160000 (submodule)
@@ -1 +1 @@
-Subproject commit cabcc3462226b71849ca42301c21e05b63f150c2
+Subproject commit 979b11e352bda7d783c921a62e8cb5ed950a7564
index 76ea33ecc51a8b900f26221e8090f6d4e3f89b60..f0ace70c5731ad8de4a35e9309f952a37f4b7942 100644 (file)
@@ -1,4 +1,4 @@
 major=2
 minor=3
-micro=17
+micro=18
 qualifier=