move cef.win32 to browser.lib

.github/workflows/ci.yml

@@ -107,15 +107,19 @@ jobs:
         tar xf cef.tar.bz2 $VERSION/LICENSE.txt $VERSION/Resources --strip-components 1
         tar xf cef.tar.bz2 $VERSION/Release/libcef.lib --strip-components 2
         tar xf cef.tar.bz2 --wildcards $VERSION/Release/*.dll --wildcards $VERSION/Release/*.bin --strip-components 2
-        cp -r *.dll *.bin Resources/* LICENSE.txt ../../java/org.eclipse.set.browser.cef.win32/res/cef
-        ls -avl ../../java/org.eclipse.set.browser.cef.win32/res/cef
+        cp -r *.dll *.bin Resources/* LICENSE.txt ../../java/org.eclipse.set.browser.lib/res
+        ls -avl ../../java/org.eclipse.set.browser.lib/res
       working-directory: cef/Release
 
     - name: Fetch Rust binaries
       uses: actions/download-artifact@v8
       with:
         name: chromium-swt-libs
         path: java/org.eclipse.set.browser.lib/res/
+
+    - name: Copy CEF
+      run: |
+        cp -a java/org.eclipse.set.browser.cef.win32/res/cef/. java/org.eclipse.set.browser.lib/res/
 
     - name: Build
       working-directory: java

java/org.eclipse.set.browser.lib/META-INF/MANIFEST.MF

@@ -6,13 +6,14 @@ Bundle-Version: 2.8.0.qualifier
 Automatic-Module-Name: org.eclipse.set.browser.bin
 Bundle-RequiredExecutionEnvironment: JavaSE-21
 Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.swt,
- org.eclipse.set.browser.cef.win32
+ org.eclipse.swt
 Import-Package: 
  org.apache.commons.io,
  org.eclipse.swt.internal,
  org.osgi.framework
-Export-Package: org.eclipse.set.browser.lib
+Export-Package: org.eclipse.set.browser.cef.win32,
+ org.eclipse.set.browser.lib
 Bundle-ClassPath: res/,
  .
 Bundle-Vendor: Eclipse Signalling Engineering Toolbox
+Eclipse-BundleShape: dir

java/org.eclipse.set.browser.cef.win32/src/org/eclipse/set/browser/cef/win32/CEFResource.java → java/org.eclipse.set.browser.lib/src/org/eclipse/set/browser/cef/win32/CEFResource.java

@@ -31,61 +31,78 @@
 public class CEFResource {
 	private static boolean hasBeenExtracted = false;
 
-	private static Path getTempPathForExtraction() {
-		return Paths.get(System.getenv("APPDATA"), "Eclipse SET", "cef", "dev", "extracted").toAbsolutePath();
-	}
-
 	/**
 	 * @return the path to the extracted CEF files
 	 */
 	public static Path getPath() {
-		final Bundle bundle = FrameworkUtil.getBundle(CEFResource.class.getClassLoader()).orElseThrow();
-		Path bundleLocation = FileLocator.getBundleFileLocation(bundle).orElseThrow().toPath().toAbsolutePath();
-		if (Files.isDirectory(bundleLocation))
-			return bundleLocation.resolve("cef");
+		final Bundle bundle = FrameworkUtil
+				.getBundle(CEFResource.class.getClassLoader())
+				.orElseThrow();
+		final Path bundleLocation = FileLocator.getBundleFileLocation(bundle)
+				.orElseThrow()
+				.toPath()
+				.toAbsolutePath();
+		if (Files.isDirectory(bundleLocation)) {
+			return bundleLocation.resolve("res");
+		}
 
-		// Due to a M2E limitation, Eclipse-BundleShape is not respected when working
-		// with a maven dependency from within Eclipse (Tycho handles this correctly for
-		// production builds). For development, instead extract the jar to a temporary
+		// Due to a M2E limitation, Eclipse-BundleShape is not respected when
+		// working
+		// with a maven dependency from within Eclipse (Tycho handles this
+		// correctly for
+		// production builds). For development, instead extract the jar to a
+		// temporary
 		// path, once per execution
-		Path tempPath = getTempPathForExtraction();
+		final Path tempPath = getTempPathForExtraction();
 
 		if (hasBeenExtracted) {
-			return tempPath.resolve("cef");
+			return tempPath.resolve("res");
 		}
 		hasBeenExtracted = true;
 		try (Stream<Path> files = Files.walk(tempPath)) {
-			files.sorted(Comparator.reverseOrder()).map(Path::toFile).forEach(File::delete);
-		} catch (IOException e) {
+			files.sorted(Comparator.reverseOrder())
+					.map(Path::toFile)
+					.forEach(File::delete);
+		} catch (final IOException e) {
 			// ignore
 		}
 		try (JarFile jar = new JarFile(bundleLocation.toString())) {
 			// Create directories
 			Enumeration<JarEntry> entries = jar.entries();
 			while (entries.hasMoreElements()) {
-				JarEntry entry = entries.nextElement();
+				final JarEntry entry = entries.nextElement();
 				if (entry.isDirectory()) {
-					new File(tempPath.resolve(entry.getName()).toString()).mkdirs();
+					new File(tempPath.resolve(entry.getName()).toString())
+							.mkdirs();
 				}
 			}
 
 			// Write files
 			entries = jar.entries();
 			while (entries.hasMoreElements()) {
-				JarEntry entry = entries.nextElement();
+				final JarEntry entry = entries.nextElement();
 				if (!entry.isDirectory()) {
-					File file = new File(tempPath.resolve(entry.getName()).toString());
-					try (InputStream is = jar.getInputStream(entry); FileOutputStream os = new FileOutputStream(file)) {
+					final File file = new File(
+							tempPath.resolve(entry.getName()).toString());
+					try (InputStream is = jar.getInputStream(entry);
+							FileOutputStream os = new FileOutputStream(file)) {
 						is.transferTo(os);
 					}
 
 				}
 			}
 
-			return tempPath.resolve("cef");
-		} catch (IOException e) {
+			return tempPath.resolve("res");
+		} catch (final IOException e) {
 			// ignore
 		}
 		return null;
 	}
+
+	private static Path getTempPathForExtraction() {
+		return Paths
+				.get(System.getenv("APPDATA"), "Eclipse SET", "cef", "dev",
+						"extracted")
+				.toAbsolutePath();
+	}
 }

java/org.eclipse.set.browser/META-INF/MANIFEST.MF

@@ -6,8 +6,7 @@ Bundle-Version: 2.8.0.qualifier
 Automatic-Module-Name: org.eclipse.set.browser
 Bundle-RequiredExecutionEnvironment: JavaSE-21
 Require-Bundle: org.eclipse.swt,
- org.eclipse.set.browser.lib,
- org.eclipse.set.browser.cef.win32
+ org.eclipse.set.browser.lib
 Bundle-ClassPath: .
 Export-Package: org.eclipse.set.browser,
  org.eclipse.set.browser.cef,

java/pom.xml

@@ -17,7 +17,6 @@
 	<modules>
 		<module>org.eclipse.set.browser</module>
 		<module>org.eclipse.set.browser.lib</module>
-		<module>org.eclipse.set.browser.cef.win32</module>
 		<module>org.eclipse.set.browser.releng.target</module>
 	</modules>