From 5cbd7544d8243c7f0f0f5c1a78daac979aee20e4 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Fri, 8 Jul 2022 20:21:28 +0200 Subject: [PATCH] Move GraalVM compilation to SLC --- .../META-INF/native-image/jni-config.json | 33 --- .../predefined-classes-config.json | 8 - .../META-INF/native-image/proxy-config.json | 2 - .../META-INF/native-image/reflect-config.json | 86 ------ .../native-image/resource-config.json | 80 ------ .../native-image/serialization-config.json | 6 - .../src/org/argeo/cms/cli/CommandsCli.java | 7 +- .../src/org/argeo/cms/runtime/StaticCms.java | 12 + .../org/argeo/util/register/Component.java | 20 ++ .../src/org/argeo/cms/ui/rcp/CmsRcpApp.java | 7 +- .../cms/ui/rcp/CmsRcpDisplayFactory.java | 15 +- .../cms/ui/rcp/servlet/CmsRcpServlet.java | 2 +- .../META-INF/native-image/jni-config.json | 251 ------------------ .../predefined-classes-config.json | 8 - .../META-INF/native-image/proxy-config.json | 2 - .../META-INF/native-image/reflect-config.json | 5 - .../native-image/resource-config.json | 39 --- .../native-image/serialization-config.json | 6 - 18 files changed, 58 insertions(+), 531 deletions(-) delete mode 100644 org.argeo.cms/META-INF/native-image/jni-config.json delete mode 100644 org.argeo.cms/META-INF/native-image/predefined-classes-config.json delete mode 100644 org.argeo.cms/META-INF/native-image/proxy-config.json delete mode 100644 org.argeo.cms/META-INF/native-image/reflect-config.json delete mode 100644 org.argeo.cms/META-INF/native-image/resource-config.json delete mode 100644 org.argeo.cms/META-INF/native-image/serialization-config.json delete mode 100644 rcp/org.argeo.swt.minidesktop/META-INF/native-image/jni-config.json delete mode 100644 rcp/org.argeo.swt.minidesktop/META-INF/native-image/predefined-classes-config.json delete mode 100644 rcp/org.argeo.swt.minidesktop/META-INF/native-image/proxy-config.json delete mode 100644 rcp/org.argeo.swt.minidesktop/META-INF/native-image/reflect-config.json delete mode 100644 rcp/org.argeo.swt.minidesktop/META-INF/native-image/resource-config.json delete mode 100644 rcp/org.argeo.swt.minidesktop/META-INF/native-image/serialization-config.json diff --git a/org.argeo.cms/META-INF/native-image/jni-config.json b/org.argeo.cms/META-INF/native-image/jni-config.json deleted file mode 100644 index 25530bb80..000000000 --- a/org.argeo.cms/META-INF/native-image/jni-config.json +++ /dev/null @@ -1,33 +0,0 @@ -[ -{ - "name":"java.lang.Boolean", - "methods":[{"name":"getBoolean","parameterTypes":["java.lang.String"] }] -}, -{ - "name":"java.lang.ClassLoader", - "methods":[ - {"name":"getPlatformClassLoader","parameterTypes":[] }, - {"name":"loadClass","parameterTypes":["java.lang.String"] } - ] -}, -{ - "name":"jdk.internal.loader.ClassLoaders$PlatformClassLoader" -}, -{ - "name":"org.graalvm.jniutils.JNIExceptionWrapperEntryPoints", - "methods":[{"name":"getClassName","parameterTypes":["java.lang.Class"] }] -}, -{ - "name":"sun.management.VMManagementImpl", - "fields":[ - {"name":"compTimeMonitoringSupport"}, - {"name":"currentThreadCpuTimeSupport"}, - {"name":"objectMonitorUsageSupport"}, - {"name":"otherThreadCpuTimeSupport"}, - {"name":"remoteDiagnosticCommandsSupport"}, - {"name":"synchronizerUsageSupport"}, - {"name":"threadAllocatedMemorySupport"}, - {"name":"threadContentionMonitoringSupport"} - ] -} -] diff --git a/org.argeo.cms/META-INF/native-image/predefined-classes-config.json b/org.argeo.cms/META-INF/native-image/predefined-classes-config.json deleted file mode 100644 index 0e79b2c5d..000000000 --- a/org.argeo.cms/META-INF/native-image/predefined-classes-config.json +++ /dev/null @@ -1,8 +0,0 @@ -[ - { - "type":"agent-extracted", - "classes":[ - ] - } -] - diff --git a/org.argeo.cms/META-INF/native-image/proxy-config.json b/org.argeo.cms/META-INF/native-image/proxy-config.json deleted file mode 100644 index 0d4f101c7..000000000 --- a/org.argeo.cms/META-INF/native-image/proxy-config.json +++ /dev/null @@ -1,2 +0,0 @@ -[ -] diff --git a/org.argeo.cms/META-INF/native-image/reflect-config.json b/org.argeo.cms/META-INF/native-image/reflect-config.json deleted file mode 100644 index 6d7ba4b90..000000000 --- a/org.argeo.cms/META-INF/native-image/reflect-config.json +++ /dev/null @@ -1,86 +0,0 @@ -[ -{ - "name":"[B" -}, -{ - "name":"[Ljava.lang.String;" -}, -{ - "name":"[Lsun.security.pkcs.SignerInfo;" -}, -{ - "name":"com.sun.org.apache.xalan.internal.xsltc.trax.TransformerFactoryImpl", - "methods":[{"name":"","parameterTypes":[] }] -}, -{ - "name":"java.lang.String" -}, -{ - "name":"java.security.SecureRandomParameters" -}, -{ - "name":"java.util.Date" -}, -{ - "name":"javax.security.auth.login.Configuration$Parameters" -}, -{ - "name":"javax.security.auth.x500.X500Principal", - "fields":[{"name":"thisX500Name"}], - "queriedMethods":[{"name":"","parameterTypes":["sun.security.x509.X500Name"] }] -}, -{ - "name":"org.apache.xerces.impl.dv.dtd.DTDDVFactoryImpl", - "methods":[{"name":"","parameterTypes":[] }] -}, -{ - "name":"org.apache.xerces.impl.dv.dtd.XML11DTDDVFactoryImpl", - "methods":[{"name":"","parameterTypes":[] }] -}, -{ - "name":"org.apache.xerces.impl.dv.xs.ExtendedSchemaDVFactoryImpl", - "methods":[{"name":"","parameterTypes":[] }] -}, -{ - "name":"org.apache.xerces.impl.dv.xs.SchemaDVFactoryImpl", - "methods":[{"name":"","parameterTypes":[] }] -}, -{ - "name":"org.apache.xerces.impl.xs.XSMessageFormatter", - "methods":[{"name":"","parameterTypes":[] }] -}, -{ - "name":"org.apache.xerces.parsers.XIncludeAwareParserConfiguration", - "methods":[{"name":"","parameterTypes":[] }] -}, -{ - "name":"org.argeo.cms.auth.DataAdminLoginModule", - "methods":[{"name":"","parameterTypes":[] }] -}, -{ - "name":"sun.security.provider.ConfigFile$Spi", - "methods":[{"name":"","parameterTypes":["javax.security.auth.login.Configuration$Parameters"] }] -}, -{ - "name":"sun.security.provider.DRBG", - "methods":[{"name":"","parameterTypes":["java.security.SecureRandomParameters"] }] -}, -{ - "name":"sun.security.provider.NativePRNG", - "methods":[{"name":"","parameterTypes":[] }] -}, -{ - "name":"sun.security.provider.SHA", - "methods":[{"name":"","parameterTypes":[] }] -}, -{ - "name":"sun.security.provider.SHA2$SHA256", - "methods":[{"name":"","parameterTypes":[] }] -}, -{ - "name":"sun.security.util.ObjectIdentifier" -}, -{ - "name":"sun.security.x509.CertificateExtensions" -} -] diff --git a/org.argeo.cms/META-INF/native-image/resource-config.json b/org.argeo.cms/META-INF/native-image/resource-config.json deleted file mode 100644 index 347ebcea7..000000000 --- a/org.argeo.cms/META-INF/native-image/resource-config.json +++ /dev/null @@ -1,80 +0,0 @@ -{ - "resources":{ - "includes":[ - { - "pattern":"\\QMETA-INF/services/java.lang.System$LoggerFinder\\E" - }, - { - "pattern":"\\QMETA-INF/services/javax.xml.validation.SchemaFactory\\E" - }, - { - "pattern":"\\Qorg/argeo/cms/acr/schemas/DSMLv2.xsd\\E" - }, - { - "pattern":"\\Qorg/argeo/cms/acr/schemas/SVG.xsd\\E" - }, - { - "pattern":"\\Qorg/argeo/cms/acr/schemas/XForms-11-Schema.xsd\\E" - }, - { - "pattern":"\\Qorg/argeo/cms/acr/schemas/XMLSchema.dtd\\E" - }, - { - "pattern":"\\Qorg/argeo/cms/acr/schemas/XMLSchema.xsd\\E" - }, - { - "pattern":"\\Qorg/argeo/cms/acr/schemas/cr.xsd\\E" - }, - { - "pattern":"\\Qorg/argeo/cms/acr/schemas/datatypes.dtd\\E" - }, - { - "pattern":"\\Qorg/argeo/cms/acr/schemas/docbook.xsd\\E" - }, - { - "pattern":"\\Qorg/argeo/cms/acr/schemas/schema-for-xslt20.xsd\\E" - }, - { - "pattern":"\\Qorg/argeo/cms/acr/schemas/xlink.xsd\\E" - }, - { - "pattern":"\\Qorg/argeo/cms/acr/schemas/xml-events-attribs-1.xsd\\E" - }, - { - "pattern":"\\Qorg/argeo/cms/acr/schemas/xml.xsd\\E" - }, - { - "pattern":"\\Qorg/argeo/cms/internal/runtime/dc=example,dc=com.ldif\\E" - }, - { - "pattern":"\\Qorg/argeo/cms/internal/runtime/jaas.cfg\\E" - }, - { - "pattern":"\\Qorg/argeo/cms/internal/runtime/ou=roles,ou=node.ldif\\E" - }, - { - "pattern":"\\Qorg/argeo/cms/internal/runtime/ou=tokens,ou=node.ldif\\E" - } - ]}, - "bundles":[ - { - "name":"org.apache.xerces.impl.msg.XMLSchemaMessages", - "locales":[ - "en", - "und" - ] - }, - { - "name":"org.apache.xerces.impl.xpath.regex.message", - "locales":[ - "", - "en", - "und" - ] - }, - { - "name":"sun.security.util.Resources", - "classNames":["sun.security.util.Resources"] - } - ] -} diff --git a/org.argeo.cms/META-INF/native-image/serialization-config.json b/org.argeo.cms/META-INF/native-image/serialization-config.json deleted file mode 100644 index bf554e062..000000000 --- a/org.argeo.cms/META-INF/native-image/serialization-config.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "types":[ - ], - "lambdaCapturingTypes":[ - ] -} diff --git a/org.argeo.cms/src/org/argeo/cms/cli/CommandsCli.java b/org.argeo.cms/src/org/argeo/cms/cli/CommandsCli.java index d45ea33a0..b9d262dee 100644 --- a/org.argeo.cms/src/org/argeo/cms/cli/CommandsCli.java +++ b/org.argeo.cms/src/org/argeo/cms/cli/CommandsCli.java @@ -12,6 +12,7 @@ import java.util.function.Function; import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.CommandLineParser; import org.apache.commons.cli.DefaultParser; +import org.apache.commons.cli.MissingOptionException; import org.apache.commons.cli.Options; import org.apache.commons.cli.ParseException; @@ -52,7 +53,8 @@ public abstract class CommandsCli implements DescribedCommand { if (function == null) throw new IllegalArgumentException("Uknown command " + cmd); try { - return function.apply(newArgs).toString(); + Object value = function.apply(newArgs); + return value != null ? value.toString() : null; } catch (CommandArgsException e) { if (e.getCommandName() == null) { e.setCommandName(cmd); @@ -115,6 +117,9 @@ public abstract class CommandsCli implements DescribedCommand { System.exit(0); } catch (CommandArgsException e) { System.err.println("Wrong arguments " + Arrays.toString(args) + ": " + e.getMessage()); + Throwable cause = e.getCause(); + if (!(cause instanceof MissingOptionException)) + e.printStackTrace(); if (e.getCommandName() != null) { StringWriter out = new StringWriter(); HelpCommand.printHelp(e.getCommandsCli(), e.getCommandName(), out); diff --git a/org.argeo.cms/src/org/argeo/cms/runtime/StaticCms.java b/org.argeo.cms/src/org/argeo/cms/runtime/StaticCms.java index 6744700d4..f133d3049 100644 --- a/org.argeo.cms/src/org/argeo/cms/runtime/StaticCms.java +++ b/org.argeo.cms/src/org/argeo/cms/runtime/StaticCms.java @@ -132,7 +132,19 @@ public class StaticCms { .build(register); assert cmsContextC.get() == cmsContext; + addComponents(register); + register.activate(); + + postActivation(register); + } + + protected void addComponents(SimpleRegister register) { + + } + + protected void postActivation(SimpleRegister register) { + } public void stop() { diff --git a/org.argeo.util/src/org/argeo/util/register/Component.java b/org.argeo.util/src/org/argeo/util/register/Component.java index cb69b133d..275811e9d 100644 --- a/org.argeo.util/src/org/argeo/util/register/Component.java +++ b/org.argeo.util/src/org/argeo/util/register/Component.java @@ -1,8 +1,10 @@ package org.argeo.util.register; +import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; import java.util.HashSet; +import java.util.List; import java.util.Map; import java.util.Set; import java.util.concurrent.CompletableFuture; @@ -165,6 +167,24 @@ public class Component implements Supplier, Comparable> { return rankingKey.compareTo(rankingKey); } + @Override + public int hashCode() { + Long serviceId = (Long) properties.get(RankingKey.SERVICE_ID); + if (serviceId != null) + return serviceId.intValue(); + else + return super.hashCode(); + } + + @Override + public String toString() { + List classes = new ArrayList<>(); + for (Class clss : types.keySet()) { + classes.add(clss.getName()); + } + return "Component " + classes + " " + properties + ""; + } + /** A type which has been explicitly exposed by a component. */ public static class PublishedType { private Component component; diff --git a/rcp/org.argeo.cms.ui.rcp/src/org/argeo/cms/ui/rcp/CmsRcpApp.java b/rcp/org.argeo.cms.ui.rcp/src/org/argeo/cms/ui/rcp/CmsRcpApp.java index aa2a29e28..e25a9f711 100644 --- a/rcp/org.argeo.cms.ui.rcp/src/org/argeo/cms/ui/rcp/CmsRcpApp.java +++ b/rcp/org.argeo.cms.ui.rcp/src/org/argeo/cms/ui/rcp/CmsRcpApp.java @@ -35,7 +35,8 @@ import org.osgi.service.event.EventAdmin; public class CmsRcpApp implements CmsView { private final static CmsLog log = CmsLog.getLog(CmsRcpApp.class); - //private BundleContext bundleContext = FrameworkUtil.getBundle(CmsRcpApp.class).getBundleContext(); + // private BundleContext bundleContext = + // FrameworkUtil.getBundle(CmsRcpApp.class).getBundleContext(); private Shell shell; private CmsApp cmsApp; @@ -207,6 +208,10 @@ public class CmsRcpApp implements CmsView { return loginContext.getSubject(); } + public Shell getShell() { + return shell; + } + /* * DEPENDENCY INJECTION */ diff --git a/rcp/org.argeo.cms.ui.rcp/src/org/argeo/cms/ui/rcp/CmsRcpDisplayFactory.java b/rcp/org.argeo.cms.ui.rcp/src/org/argeo/cms/ui/rcp/CmsRcpDisplayFactory.java index ceab08ab6..ec471c021 100644 --- a/rcp/org.argeo.cms.ui.rcp/src/org/argeo/cms/ui/rcp/CmsRcpDisplayFactory.java +++ b/rcp/org.argeo.cms.ui.rcp/src/org/argeo/cms/ui/rcp/CmsRcpDisplayFactory.java @@ -6,6 +6,7 @@ import org.argeo.api.cms.CmsApp; import org.argeo.util.OS; import org.eclipse.swt.widgets.Display; import org.osgi.service.event.EventAdmin; +import org.eclipse.swt.events.DisposeListener; /** Creates the SWT {@link Display} in a dedicated thread. */ public class CmsRcpDisplayFactory { @@ -22,7 +23,12 @@ public class CmsRcpDisplayFactory { public void init() { uiThread = new CmsUiThread(); uiThread.start(); - + while (display == null) + try { + Thread.sleep(100); + } catch (InterruptedException e) { + // silent + } } public void destroy() { @@ -46,6 +52,8 @@ public class CmsRcpDisplayFactory { @Override public void run() { display = Display.getDefault(); + display.setRuntimeExceptionHandler((e) -> e.printStackTrace()); + display.setErrorHandler((e) -> e.printStackTrace()); // for (String contextName : cmsApps.keySet()) { // openCmsApp(contextName); @@ -64,12 +72,15 @@ public class CmsRcpDisplayFactory { return display; } - public static void openCmsApp(EventAdmin eventAdmin, CmsApp cmsApp, String uiName) { + public static void openCmsApp(EventAdmin eventAdmin, CmsApp cmsApp, String uiName, + DisposeListener disposeListener) { CmsRcpDisplayFactory.getDisplay().syncExec(() -> { CmsRcpApp cmsRcpApp = new CmsRcpApp(uiName); cmsRcpApp.setEventAdmin(eventAdmin); cmsRcpApp.setCmsApp(cmsApp, null); cmsRcpApp.initRcpApp(); + if (disposeListener != null) + cmsRcpApp.getShell().addDisposeListener(disposeListener); }); } diff --git a/rcp/org.argeo.cms.ui.rcp/src/org/argeo/cms/ui/rcp/servlet/CmsRcpServlet.java b/rcp/org.argeo.cms.ui.rcp/src/org/argeo/cms/ui/rcp/servlet/CmsRcpServlet.java index d180f195c..f8aecd39b 100644 --- a/rcp/org.argeo.cms.ui.rcp/src/org/argeo/cms/ui/rcp/servlet/CmsRcpServlet.java +++ b/rcp/org.argeo.cms.ui.rcp/src/org/argeo/cms/ui/rcp/servlet/CmsRcpServlet.java @@ -33,7 +33,7 @@ public class CmsRcpServlet extends HttpServlet { protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { String path = req.getPathInfo(); String uiName = path != null ? path.substring(path.lastIndexOf('/') + 1) : ""; - CmsRcpDisplayFactory.openCmsApp(eventAdmin, cmsApp, uiName); + CmsRcpDisplayFactory.openCmsApp(eventAdmin, cmsApp, uiName, null); logger.log(Level.DEBUG, "Opened RCP UI " + uiName + " of CMS App " + req.getServletPath()); } diff --git a/rcp/org.argeo.swt.minidesktop/META-INF/native-image/jni-config.json b/rcp/org.argeo.swt.minidesktop/META-INF/native-image/jni-config.json deleted file mode 100644 index 6f4977f47..000000000 --- a/rcp/org.argeo.swt.minidesktop/META-INF/native-image/jni-config.json +++ /dev/null @@ -1,251 +0,0 @@ -[ -{ - "name":"java.lang.Boolean", - "methods":[{"name":"getBoolean","parameterTypes":["java.lang.String"] }] -}, -{ - "name":"java.lang.ClassLoader", - "methods":[ - {"name":"getPlatformClassLoader","parameterTypes":[] }, - {"name":"loadClass","parameterTypes":["java.lang.String"] } - ] -}, -{ - "name":"java.lang.Throwable", - "methods":[{"name":"addSuppressed","parameterTypes":["java.lang.Throwable"] }] -}, -{ - "name":"jdk.internal.loader.ClassLoaders$PlatformClassLoader" -}, -{ - "name":"org.eclipse.swt.browser.WebKit", - "methods":[ - {"name":"JSDOMEventProc","parameterTypes":["long","long","long"] }, - {"name":"Proc","parameterTypes":["long","long"] }, - {"name":"Proc","parameterTypes":["long","long","long"] }, - {"name":"Proc","parameterTypes":["long","long","long","long"] }, - {"name":"Proc","parameterTypes":["long","long","long","long","long"] } - ] -}, -{ - "name":"org.eclipse.swt.browser.WebKit$WebKitExtension", - "methods":[{"name":"initializeWebExtensions_callback","parameterTypes":["long","long"] }] -}, -{ - "name":"org.eclipse.swt.browser.WebKit$Webkit2AsyncToSync", - "methods":[ - {"name":"getCookie_callback","parameterTypes":["long","long","long"] }, - {"name":"getText_callback","parameterTypes":["long","long","long"] }, - {"name":"runjavascript_callback","parameterTypes":["long","long","long"] }, - {"name":"setCookie_callback","parameterTypes":["long","long","long"] } - ] -}, -{ - "name":"org.eclipse.swt.browser.WebkitGDBus", - "methods":[ - {"name":"authenticatePeerCB","parameterTypes":["long","long","long","long"] }, - {"name":"callExtensionAsyncCB","parameterTypes":["long","long","long"] }, - {"name":"handleMethodCB","parameterTypes":["long","long","long","long","long","long","long","long"] }, - {"name":"newConnectionCB","parameterTypes":["long","long","long"] }, - {"name":"newConnectionToExtensionCB","parameterTypes":["long","long","long"] } - ] -}, -{ - "name":"org.eclipse.swt.graphics.Device", - "methods":[{"name":"logProc","parameterTypes":["long","long","long","long"] }] -}, -{ - "name":"org.eclipse.swt.internal.SessionManagerDBus", - "methods":[{"name":"g_signal_handler","parameterTypes":["long","long","long","long","long"] }] -}, -{ - "name":"org.eclipse.swt.internal.cairo.cairo_rectangle_int_t", - "fields":[ - {"name":"height"}, - {"name":"width"}, - {"name":"x"}, - {"name":"y"} - ] -}, -{ - "name":"org.eclipse.swt.internal.gtk.GTypeInfo", - "fields":[ - {"name":"base_finalize"}, - {"name":"base_init"}, - {"name":"class_data"}, - {"name":"class_finalize"}, - {"name":"class_init"}, - {"name":"class_size"}, - {"name":"instance_init"}, - {"name":"instance_size"}, - {"name":"n_preallocs"}, - {"name":"value_table"} - ] -}, -{ - "name":"org.eclipse.swt.internal.gtk.GdkKeymapKey", - "fields":[ - {"name":"group"}, - {"name":"keycode"}, - {"name":"level"} - ] -}, -{ - "name":"org.eclipse.swt.internal.gtk.GdkRGBA", - "fields":[ - {"name":"alpha"}, - {"name":"blue"}, - {"name":"green"}, - {"name":"red"} - ] -}, -{ - "name":"org.eclipse.swt.internal.gtk.GdkRectangle", - "fields":[ - {"name":"height"}, - {"name":"width"}, - {"name":"x"}, - {"name":"y"} - ] -}, -{ - "name":"org.eclipse.swt.internal.gtk.GtkAllocation", - "fields":[ - {"name":"height"}, - {"name":"width"}, - {"name":"x"}, - {"name":"y"} - ] -}, -{ - "name":"org.eclipse.swt.internal.gtk.GtkBorder", - "fields":[ - {"name":"bottom"}, - {"name":"left"}, - {"name":"right"}, - {"name":"top"} - ] -}, -{ - "name":"org.eclipse.swt.internal.gtk.GtkRequisition", - "fields":[ - {"name":"height"}, - {"name":"width"} - ] -}, -{ - "name":"org.eclipse.swt.internal.gtk3.GdkEvent", - "fields":[{"name":"type"}] -}, -{ - "name":"org.eclipse.swt.internal.gtk3.GdkEventCrossing", - "fields":[ - {"name":"detail"}, - {"name":"focus"}, - {"name":"mode"}, - {"name":"send_event"}, - {"name":"state"}, - {"name":"subwindow"}, - {"name":"time"}, - {"name":"window"}, - {"name":"x"}, - {"name":"x_root"}, - {"name":"y"}, - {"name":"y_root"} - ] -}, -{ - "name":"org.eclipse.swt.internal.gtk3.GdkEventFocus", - "fields":[ - {"name":"in"}, - {"name":"send_event"}, - {"name":"window"} - ] -}, -{ - "name":"org.eclipse.swt.internal.gtk3.GdkEventMotion", - "fields":[ - {"name":"axes"}, - {"name":"device"}, - {"name":"is_hint"}, - {"name":"send_event"}, - {"name":"state"}, - {"name":"time"}, - {"name":"window"}, - {"name":"x"}, - {"name":"x_root"}, - {"name":"y"}, - {"name":"y_root"} - ] -}, -{ - "name":"org.eclipse.swt.internal.gtk3.GdkEventWindowState", - "fields":[ - {"name":"changed_mask"}, - {"name":"new_window_state"}, - {"name":"send_event"}, - {"name":"window"} - ] -}, -{ - "name":"org.eclipse.swt.widgets.Control", - "methods":[ - {"name":"gestureBeginProc","parameterTypes":["long","long","long"] }, - {"name":"gestureEndProc","parameterTypes":["long","long","long"] }, - {"name":"magnifyProc","parameterTypes":["long","double","long"] }, - {"name":"rotateProc","parameterTypes":["long","double","double","long"] }, - {"name":"swipeProc","parameterTypes":["long","double","double","long"] } - ] -}, -{ - "name":"org.eclipse.swt.widgets.Display", - "methods":[ - {"name":"allChildrenProc","parameterTypes":["long","long"] }, - {"name":"caretProc","parameterTypes":["long"] }, - {"name":"cellDataProc","parameterTypes":["long","long","long","long","long"] }, - {"name":"changeValue","parameterTypes":["long","int","double","long"] }, - {"name":"checkIfEventProc","parameterTypes":["long","long","long"] }, - {"name":"emissionProc","parameterTypes":["long","long","long","long"] }, - {"name":"eventProc","parameterTypes":["long","long"] }, - {"name":"idleProc","parameterTypes":["long"] }, - {"name":"keysChangedProc","parameterTypes":["long","long"] }, - {"name":"mouseHoverProc","parameterTypes":["long"] }, - {"name":"notifyProc","parameterTypes":["long","long","long"] }, - {"name":"rendererClassInitProc","parameterTypes":["long","long"] }, - {"name":"rendererGetPreferredWidthProc","parameterTypes":["long","long","long","long"] }, - {"name":"rendererRenderProc","parameterTypes":["long","long","long","long","long","long"] }, - {"name":"setDirectionProc","parameterTypes":["long","long"] }, - {"name":"shellMapProc","parameterTypes":["long","long","long"] }, - {"name":"signalProc","parameterTypes":["long","long","long"] }, - {"name":"sizeAllocateProc","parameterTypes":["long","long","long"] }, - {"name":"sizeRequestProc","parameterTypes":["long","long","long"] }, - {"name":"timerProc","parameterTypes":["long"] }, - {"name":"windowProc","parameterTypes":["long","long"] }, - {"name":"windowProc","parameterTypes":["long","long","long"] }, - {"name":"windowProc","parameterTypes":["long","long","long","long"] }, - {"name":"windowProc","parameterTypes":["long","long","long","long","long"] }, - {"name":"windowTimerProc","parameterTypes":["long"] } - ] -}, -{ - "name":"org.eclipse.swt.widgets.ToolBar", - "methods":[{"name":"MenuItemSelectedProc","parameterTypes":["long","long"] }] -}, -{ - "name":"org.graalvm.jniutils.JNIExceptionWrapperEntryPoints", - "methods":[{"name":"getClassName","parameterTypes":["java.lang.Class"] }] -}, -{ - "name":"sun.management.VMManagementImpl", - "fields":[ - {"name":"compTimeMonitoringSupport"}, - {"name":"currentThreadCpuTimeSupport"}, - {"name":"objectMonitorUsageSupport"}, - {"name":"otherThreadCpuTimeSupport"}, - {"name":"remoteDiagnosticCommandsSupport"}, - {"name":"synchronizerUsageSupport"}, - {"name":"threadAllocatedMemorySupport"}, - {"name":"threadContentionMonitoringSupport"} - ] -} -] diff --git a/rcp/org.argeo.swt.minidesktop/META-INF/native-image/predefined-classes-config.json b/rcp/org.argeo.swt.minidesktop/META-INF/native-image/predefined-classes-config.json deleted file mode 100644 index 0e79b2c5d..000000000 --- a/rcp/org.argeo.swt.minidesktop/META-INF/native-image/predefined-classes-config.json +++ /dev/null @@ -1,8 +0,0 @@ -[ - { - "type":"agent-extracted", - "classes":[ - ] - } -] - diff --git a/rcp/org.argeo.swt.minidesktop/META-INF/native-image/proxy-config.json b/rcp/org.argeo.swt.minidesktop/META-INF/native-image/proxy-config.json deleted file mode 100644 index 0d4f101c7..000000000 --- a/rcp/org.argeo.swt.minidesktop/META-INF/native-image/proxy-config.json +++ /dev/null @@ -1,2 +0,0 @@ -[ -] diff --git a/rcp/org.argeo.swt.minidesktop/META-INF/native-image/reflect-config.json b/rcp/org.argeo.swt.minidesktop/META-INF/native-image/reflect-config.json deleted file mode 100644 index f83d7bde4..000000000 --- a/rcp/org.argeo.swt.minidesktop/META-INF/native-image/reflect-config.json +++ /dev/null @@ -1,5 +0,0 @@ -[ -{ - "name":"org.eclipse.swt.widgets.Display" -} -] diff --git a/rcp/org.argeo.swt.minidesktop/META-INF/native-image/resource-config.json b/rcp/org.argeo.swt.minidesktop/META-INF/native-image/resource-config.json deleted file mode 100644 index 435cdd8f7..000000000 --- a/rcp/org.argeo.swt.minidesktop/META-INF/native-image/resource-config.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "resources":{ - "includes":[ - { - "pattern":"\\Qorg/argeo/minidesktop/cheatsheet_obj@2x.png\\E" - }, - { - "pattern":"\\Qorg/argeo/minidesktop/console_view@2x.png\\E" - }, - { - "pattern":"\\Qorg/argeo/minidesktop/delete@2x.png\\E" - }, - { - "pattern":"\\Qorg/argeo/minidesktop/external_browser@2x.png\\E" - }, - { - "pattern":"\\Qorg/argeo/minidesktop/file_obj@2x.png\\E" - }, - { - "pattern":"\\Qorg/argeo/minidesktop/fldr_obj@2x.png\\E" - }, - { - "pattern":"\\Qorg/argeo/minidesktop/nav_home@2x.png\\E" - }, - { - "pattern":"\\Qorg/eclipse/swt/internal/gtk/swt_functional_gtk_3_20.css\\E" - }, - { - "pattern":"\\Qorg/eclipse/swt/internal/gtk/swt_theming_fixes_gtk_3_20.css\\E" - }, - { - "pattern":"\\Qorg/eclipse/swt/internal/gtk/swt_theming_fixes_gtk_3_24_5.css\\E" - } - ]}, - "bundles":[{ - "name":"org.eclipse.swt.internal.SWTMessages", - "locales":[""] - }] -} diff --git a/rcp/org.argeo.swt.minidesktop/META-INF/native-image/serialization-config.json b/rcp/org.argeo.swt.minidesktop/META-INF/native-image/serialization-config.json deleted file mode 100644 index bf554e062..000000000 --- a/rcp/org.argeo.swt.minidesktop/META-INF/native-image/serialization-config.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "types":[ - ], - "lambdaCapturingTypes":[ - ] -} -- 2.30.2