From 2369192502b51d5ecd819073cf5a8a75f1cfc505 Mon Sep 17 00:00:00 2001 From: Deepika Udayagiri Date: Fri, 11 Apr 2025 19:10:29 +0530 Subject: [PATCH 1/3] Alternative surrogate bundle implementation for com.sun.jna --- bundles/com.sun.jna.surrogate/.classpath | 7 +++++ bundles/com.sun.jna.surrogate/.project | 28 +++++++++++++++++++ .../org.eclipse.core.resources.prefs | 2 ++ .../.settings/org.eclipse.jdt.core.prefs | 9 ++++++ .../META-INF/MANIFEST.MF | 13 +++++++++ .../com.sun.jna.surrogate/build.properties | 4 +++ .../src/com/sun/jna/Surrogate.java | 5 ++++ .../sun/jna/platform/PlatformSurrogate.java | 5 ++++ .../win32/PlatformWin32Surrogate.java | 5 ++++ .../META-INF/MANIFEST.MF | 7 +++-- 10 files changed, 82 insertions(+), 3 deletions(-) create mode 100644 bundles/com.sun.jna.surrogate/.classpath create mode 100644 bundles/com.sun.jna.surrogate/.project create mode 100644 bundles/com.sun.jna.surrogate/.settings/org.eclipse.core.resources.prefs create mode 100644 bundles/com.sun.jna.surrogate/.settings/org.eclipse.jdt.core.prefs create mode 100644 bundles/com.sun.jna.surrogate/META-INF/MANIFEST.MF create mode 100644 bundles/com.sun.jna.surrogate/build.properties create mode 100644 bundles/com.sun.jna.surrogate/src/com/sun/jna/Surrogate.java create mode 100644 bundles/com.sun.jna.surrogate/src/com/sun/jna/platform/PlatformSurrogate.java create mode 100644 bundles/com.sun.jna.surrogate/src/com/sun/jna/platform/win32/PlatformWin32Surrogate.java diff --git a/bundles/com.sun.jna.surrogate/.classpath b/bundles/com.sun.jna.surrogate/.classpath new file mode 100644 index 00000000000..375961e4d61 --- /dev/null +++ b/bundles/com.sun.jna.surrogate/.classpath @@ -0,0 +1,7 @@ + + + + + + + diff --git a/bundles/com.sun.jna.surrogate/.project b/bundles/com.sun.jna.surrogate/.project new file mode 100644 index 00000000000..4b7a4e2475a --- /dev/null +++ b/bundles/com.sun.jna.surrogate/.project @@ -0,0 +1,28 @@ + + + com.sun.jna.surrogate + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + + org.eclipse.pde.PluginNature + org.eclipse.jdt.core.javanature + + diff --git a/bundles/com.sun.jna.surrogate/.settings/org.eclipse.core.resources.prefs b/bundles/com.sun.jna.surrogate/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 00000000000..99f26c0203a --- /dev/null +++ b/bundles/com.sun.jna.surrogate/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/bundles/com.sun.jna.surrogate/.settings/org.eclipse.jdt.core.prefs b/bundles/com.sun.jna.surrogate/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000000..23fa13b1705 --- /dev/null +++ b/bundles/com.sun.jna.surrogate/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,9 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 +org.eclipse.jdt.core.compiler.compliance=21 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=21 diff --git a/bundles/com.sun.jna.surrogate/META-INF/MANIFEST.MF b/bundles/com.sun.jna.surrogate/META-INF/MANIFEST.MF new file mode 100644 index 00000000000..8e10ebcb8f6 --- /dev/null +++ b/bundles/com.sun.jna.surrogate/META-INF/MANIFEST.MF @@ -0,0 +1,13 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: Surrogate +Bundle-SymbolicName: com.sun.jna.surrogate +Bundle-Version: 1.0.0.qualifier +Export-Package: com.sun.jna;version="5.8.0", + com.sun.jna.platform;version="5.10.0", + com.sun.jna.platform.win32;version="5.10.0" +Bundle-Vendor: SUN +Require-Bundle: org.eclipse.swt, + org.eclipse.jface +Automatic-Module-Name: com.sun.jna.surrogate +Bundle-RequiredExecutionEnvironment: JavaSE-21 diff --git a/bundles/com.sun.jna.surrogate/build.properties b/bundles/com.sun.jna.surrogate/build.properties new file mode 100644 index 00000000000..34d2e4d2dad --- /dev/null +++ b/bundles/com.sun.jna.surrogate/build.properties @@ -0,0 +1,4 @@ +source.. = src/ +output.. = bin/ +bin.includes = META-INF/,\ + . diff --git a/bundles/com.sun.jna.surrogate/src/com/sun/jna/Surrogate.java b/bundles/com.sun.jna.surrogate/src/com/sun/jna/Surrogate.java new file mode 100644 index 00000000000..ae51f8c7cfb --- /dev/null +++ b/bundles/com.sun.jna.surrogate/src/com/sun/jna/Surrogate.java @@ -0,0 +1,5 @@ +package com.sun.jna; +//Dummy surrogate plugin implementation where com.sun.jna plugin is not supported. +public class Surrogate { + +} diff --git a/bundles/com.sun.jna.surrogate/src/com/sun/jna/platform/PlatformSurrogate.java b/bundles/com.sun.jna.surrogate/src/com/sun/jna/platform/PlatformSurrogate.java new file mode 100644 index 00000000000..a61a5f36769 --- /dev/null +++ b/bundles/com.sun.jna.surrogate/src/com/sun/jna/platform/PlatformSurrogate.java @@ -0,0 +1,5 @@ +package com.sun.jna.platform; + +public class PlatformSurrogate { + +} diff --git a/bundles/com.sun.jna.surrogate/src/com/sun/jna/platform/win32/PlatformWin32Surrogate.java b/bundles/com.sun.jna.surrogate/src/com/sun/jna/platform/win32/PlatformWin32Surrogate.java new file mode 100644 index 00000000000..36cdef49516 --- /dev/null +++ b/bundles/com.sun.jna.surrogate/src/com/sun/jna/platform/win32/PlatformWin32Surrogate.java @@ -0,0 +1,5 @@ +package com.sun.jna.platform.win32; + +public class PlatformWin32Surrogate { + +} diff --git a/bundles/org.eclipse.urischeme/META-INF/MANIFEST.MF b/bundles/org.eclipse.urischeme/META-INF/MANIFEST.MF index a53634e3b88..4568e02626e 100644 --- a/bundles/org.eclipse.urischeme/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.urischeme/META-INF/MANIFEST.MF @@ -7,9 +7,10 @@ Automatic-Module-Name: org.eclipse.urischeme Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.equinox.common;bundle-version="[3.8.0,4.0.0)", org.eclipse.equinox.registry;bundle-version="[3.8.0,4.0.0)", - org.eclipse.core.runtime;bundle-version="[3.29.0,4.0.0)", - com.sun.jna;bundle-version="[5.8.0,6.0.0)", - com.sun.jna.platform;bundle-version="[5.8.0,6.0.0)" + org.eclipse.core.runtime;bundle-version="[3.29.0,4.0.0)" Export-Package: org.eclipse.urischeme;x-friends:="org.eclipse.e4.ui.workbench.swt,org.eclipse.ui.examples.uriSchemeHandler,org.eclipse.ui.browser,org.eclipse.ui.ide.application" +Import-Package: com.sun.jna;version="[5.8.0,6.0.0)", + com.sun.jna.platform;version="[5.10.0,6.0.0)", + com.sun.jna.platform.win32;version="[5.10.0,6.0.0)" Bundle-Vendor: %Plugin.Providername Bundle-Localization: plugin From 19013382310127fe4176acb977e82fde4e485b03 Mon Sep 17 00:00:00 2001 From: Eclipse Platform Bot Date: Fri, 11 Apr 2025 13:52:24 +0000 Subject: [PATCH 2/3] Version bump(s) for 4.36 stream --- bundles/org.eclipse.urischeme/META-INF/MANIFEST.MF | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundles/org.eclipse.urischeme/META-INF/MANIFEST.MF b/bundles/org.eclipse.urischeme/META-INF/MANIFEST.MF index 4568e02626e..13ccbc56632 100644 --- a/bundles/org.eclipse.urischeme/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.urischeme/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Plugin.name Bundle-SymbolicName: org.eclipse.urischeme;singleton:=true -Bundle-Version: 1.3.500.qualifier +Bundle-Version: 1.3.600.qualifier Automatic-Module-Name: org.eclipse.urischeme Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.equinox.common;bundle-version="[3.8.0,4.0.0)", From a62bb7df03b0f9b46b123ec2198d55c3d73fffc3 Mon Sep 17 00:00:00 2001 From: Deepika Udayagiri Date: Tue, 22 Apr 2025 21:18:17 +0530 Subject: [PATCH 3/3] Updated as per review comments. --- bundles/com.sun.jna.surrogate/src/com/sun/jna/Surrogate.java | 5 ----- .../src/com/sun/jna/platform/PlatformSurrogate.java | 5 ----- .../com/sun/jna/platform/win32/PlatformWin32Surrogate.java | 5 ----- .../.classpath | 0 .../.project | 0 .../.settings/org.eclipse.core.resources.prefs | 0 .../.settings/org.eclipse.jdt.core.prefs | 0 .../META-INF/MANIFEST.MF | 2 -- .../build.properties | 0 9 files changed, 17 deletions(-) delete mode 100644 bundles/com.sun.jna.surrogate/src/com/sun/jna/Surrogate.java delete mode 100644 bundles/com.sun.jna.surrogate/src/com/sun/jna/platform/PlatformSurrogate.java delete mode 100644 bundles/com.sun.jna.surrogate/src/com/sun/jna/platform/win32/PlatformWin32Surrogate.java rename bundles/{com.sun.jna.surrogate => org.eclipse.ui.comSunJnaSurrogate}/.classpath (100%) rename bundles/{com.sun.jna.surrogate => org.eclipse.ui.comSunJnaSurrogate}/.project (100%) rename bundles/{com.sun.jna.surrogate => org.eclipse.ui.comSunJnaSurrogate}/.settings/org.eclipse.core.resources.prefs (100%) rename bundles/{com.sun.jna.surrogate => org.eclipse.ui.comSunJnaSurrogate}/.settings/org.eclipse.jdt.core.prefs (100%) rename bundles/{com.sun.jna.surrogate => org.eclipse.ui.comSunJnaSurrogate}/META-INF/MANIFEST.MF (88%) rename bundles/{com.sun.jna.surrogate => org.eclipse.ui.comSunJnaSurrogate}/build.properties (100%) diff --git a/bundles/com.sun.jna.surrogate/src/com/sun/jna/Surrogate.java b/bundles/com.sun.jna.surrogate/src/com/sun/jna/Surrogate.java deleted file mode 100644 index ae51f8c7cfb..00000000000 --- a/bundles/com.sun.jna.surrogate/src/com/sun/jna/Surrogate.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.sun.jna; -//Dummy surrogate plugin implementation where com.sun.jna plugin is not supported. -public class Surrogate { - -} diff --git a/bundles/com.sun.jna.surrogate/src/com/sun/jna/platform/PlatformSurrogate.java b/bundles/com.sun.jna.surrogate/src/com/sun/jna/platform/PlatformSurrogate.java deleted file mode 100644 index a61a5f36769..00000000000 --- a/bundles/com.sun.jna.surrogate/src/com/sun/jna/platform/PlatformSurrogate.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.sun.jna.platform; - -public class PlatformSurrogate { - -} diff --git a/bundles/com.sun.jna.surrogate/src/com/sun/jna/platform/win32/PlatformWin32Surrogate.java b/bundles/com.sun.jna.surrogate/src/com/sun/jna/platform/win32/PlatformWin32Surrogate.java deleted file mode 100644 index 36cdef49516..00000000000 --- a/bundles/com.sun.jna.surrogate/src/com/sun/jna/platform/win32/PlatformWin32Surrogate.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.sun.jna.platform.win32; - -public class PlatformWin32Surrogate { - -} diff --git a/bundles/com.sun.jna.surrogate/.classpath b/bundles/org.eclipse.ui.comSunJnaSurrogate/.classpath similarity index 100% rename from bundles/com.sun.jna.surrogate/.classpath rename to bundles/org.eclipse.ui.comSunJnaSurrogate/.classpath diff --git a/bundles/com.sun.jna.surrogate/.project b/bundles/org.eclipse.ui.comSunJnaSurrogate/.project similarity index 100% rename from bundles/com.sun.jna.surrogate/.project rename to bundles/org.eclipse.ui.comSunJnaSurrogate/.project diff --git a/bundles/com.sun.jna.surrogate/.settings/org.eclipse.core.resources.prefs b/bundles/org.eclipse.ui.comSunJnaSurrogate/.settings/org.eclipse.core.resources.prefs similarity index 100% rename from bundles/com.sun.jna.surrogate/.settings/org.eclipse.core.resources.prefs rename to bundles/org.eclipse.ui.comSunJnaSurrogate/.settings/org.eclipse.core.resources.prefs diff --git a/bundles/com.sun.jna.surrogate/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.ui.comSunJnaSurrogate/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from bundles/com.sun.jna.surrogate/.settings/org.eclipse.jdt.core.prefs rename to bundles/org.eclipse.ui.comSunJnaSurrogate/.settings/org.eclipse.jdt.core.prefs diff --git a/bundles/com.sun.jna.surrogate/META-INF/MANIFEST.MF b/bundles/org.eclipse.ui.comSunJnaSurrogate/META-INF/MANIFEST.MF similarity index 88% rename from bundles/com.sun.jna.surrogate/META-INF/MANIFEST.MF rename to bundles/org.eclipse.ui.comSunJnaSurrogate/META-INF/MANIFEST.MF index 8e10ebcb8f6..9ece6d89882 100644 --- a/bundles/com.sun.jna.surrogate/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.ui.comSunJnaSurrogate/META-INF/MANIFEST.MF @@ -7,7 +7,5 @@ Export-Package: com.sun.jna;version="5.8.0", com.sun.jna.platform;version="5.10.0", com.sun.jna.platform.win32;version="5.10.0" Bundle-Vendor: SUN -Require-Bundle: org.eclipse.swt, - org.eclipse.jface Automatic-Module-Name: com.sun.jna.surrogate Bundle-RequiredExecutionEnvironment: JavaSE-21 diff --git a/bundles/com.sun.jna.surrogate/build.properties b/bundles/org.eclipse.ui.comSunJnaSurrogate/build.properties similarity index 100% rename from bundles/com.sun.jna.surrogate/build.properties rename to bundles/org.eclipse.ui.comSunJnaSurrogate/build.properties