move src directories

Author: joeferner

.devcontainer/Dockerfile

@@ -1,4 +1,4 @@
 FROM mcr.microsoft.com/devcontainers/javascript-node:22
 
 RUN apt-get update
-RUN apt-get install -y openjdk-17-jdk gdb clang-format
+RUN apt-get install -y openjdk-17-jdk maven gdb clang-format

.vscode/settings.json

@@ -4,6 +4,7 @@
         "clazzclazz",
         "Ferner",
         "jarray",
+        "javac",
         "jboolean",
         "jbyte",
         "jchar",

README.md

@@ -13,13 +13,13 @@
         'target_arch': 's390'
       }],
       ['OS=="win"', {
-        'javahome%': '<!(node findJavaHome.js)'
+        'javahome%': '<!(node ./scripts/findJavaHome.js)'
       }],
       ['OS=="linux" or OS=="mac" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" or OS=="zos"', {
-        'javahome%': '<!(node findJavaHome.js)'
+        'javahome%': '<!(node ./scripts/findJavaHome.js)'
       }],
       ['OS=="linux" or OS=="mac" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" or OS=="zos"', {
-        'javalibdir%': "<!(./find_java_libdir.sh <(target_arch) <(OS))"
+        'javalibdir%': "<!(./scripts/find_java_libdir.sh <(target_arch) <(OS))"
       }],
       ['OS=="zos"', {
         'nodever%': '<!(node -e "console.log(process.versions.node)" | cut -d"." -f1)'
@@ -30,12 +30,12 @@
     {
       'target_name': 'nodejavabridge_bindings',
       'sources': [
-        'src/java.cpp',
-        'src/javaObject.cpp',
-        'src/javaScope.cpp',
-        'src/methodCallBaton.cpp',
-        'src/nodeJavaBridge.cpp',
-        'src/utils.cpp'
+        'src-cpp/java.cpp',
+        'src-cpp/javaObject.cpp',
+        'src-cpp/javaScope.cpp',
+        'src-cpp/methodCallBaton.cpp',
+        'src-cpp/nodeJavaBridge.cpp',
+        'src-cpp/utils.cpp'
       ],
       'include_dirs': [
         '<(javahome)/include',

binding.gyp

@@ -1 +1 @@
-module.exports = require("./lib/nodeJavaBridge");
+module.exports = require("./src-node/nodeJavaBridge");

compile-java.sh

@@ -43,11 +43,12 @@
   },
   "scripts": {
     "install": "node-gyp rebuild",
-    "test": "node testRunner.js",
-    "postinstall": "node postInstall.js",
+    "clean": "rm -rf build",
+    "test": "node ./scripts/testRunner.js",
+    "postinstall": "node ./scripts/postInstall.js",
     "lint": "eslint --ext js,ts,tsx --report-unused-disable-directives --max-warnings 0 .",
     "format": "prettier --write .",
-    "format-cpp": "clang-format --version; find src/ -iname '*.h' -o -iname '*.cpp' | xargs clang-format -i",
+    "format-cpp": "clang-format --version; find src-cpp/ -iname '*.h' -o -iname '*.cpp' | xargs clang-format -i",
     "precommit": "npm run format-cpp && npm run format && npm run lint && npm test"
   },
   "main": "./index.js"

index.js

@@ -0,0 +1,17 @@
+#!/bin/sh
+set -eu
+
+SCRIPT_DIR=$(dirname "$0")
+cd "${SCRIPT_DIR}/.."
+
+if [ -z "${JAVA_HOME:-}" ] && [ -e "/usr/libexec/java_home" ]; then
+    export JAVA_HOME=$(/usr/libexec/java_home -v 11)
+fi
+
+echo "Using $(javac -version)."
+set -x
+
+javac -source 1.8 -target 1.8 src-java/node/*.java
+javac -source 1.8 -target 1.8 test/*.java
+javac -classpath src-java -h ./src-cpp src-java/node/NodeDynamicProxyClass.java
+echo "complete!"

jarjar.rule

@@ -1,7 +1,9 @@
 #!/usr/bin/env bash
-
 set -eu
 
+SCRIPT_DIR=$(dirname "$0")
+cd "${SCRIPT_DIR}/.."
+
 error() {
   echo "error: $*" >&2
   exit 1
@@ -12,7 +14,7 @@ main () {
   local os=$2
 
   local java_home full_java_version java_version
-  java_home=$(node findJavaHome.js)
+  java_home=$(node ./scripts/findJavaHome.js)
   full_java_version=$(${java_home}/bin/java -version 2>&1 | grep version | sed -e 's/.*version "\(.*\)"\(.*\)/\1/; 1q')
 
   if [[ "${full_java_version}" = "1."* ]]

package.json

@@ -17,7 +17,7 @@ require("find-java-home")((err, home) => {
     const binary = dll ?? dylib ?? so;
 
     fs.writeFileSync(
-      path.resolve(__dirname, "./build/jvm_dll_path.json"),
+      path.resolve(__dirname, "../build/jvm_dll_path.json"),
       binary ? JSON.stringify(path.delimiter + path.dirname(path.resolve(home, binary))) : '""'
     );
   }

scripts/compile-java.sh

@@ -10,7 +10,7 @@ const glob = require("glob");
 const path = require("node:path");
 
 const tests = glob
-  .sync(path.join("testAsyncOptions", "*.test.js"))
+  .sync("*.test.js", { cwd: path.join(__dirname, "..", "testAsyncOptions") })
   .sort((a, b) => a.toLocaleLowerCase().localeCompare(b.toLocaleLowerCase()));
 
 tests.unshift("test"); // Arrange to run the primary tests first, in a single process
@@ -19,7 +19,7 @@ function runTest(testArgs, done) {
   const vitest = path.join("node_modules", ".bin", "vitest");
   const cmd = testArgs === "test" ? `vitest --dir test` : `${vitest} ${testArgs}`;
   console.log(`running "${cmd}"...`);
-  childProcess.exec(cmd, function (error, stdout, stderr) {
+  childProcess.exec(cmd, (error, stdout, stderr) => {
     const errText = stderr.toString();
     if (errText !== "") {
       console.error(chalk.bold.red(errText));
@@ -30,7 +30,8 @@ function runTest(testArgs, done) {
   });
 }
 
-async.eachSeries(tests, runTest, function (err) {
+console.log('test to run', tests);
+async.eachSeries(tests, runTest, (err) => {
   if (err) {
     console.error(chalk.bold.red(err));
     process.exit(1);

findJavaHome.js renamed to scripts/findJavaHome.js

@@ -0,0 +1,20 @@
+#!/bin/sh
+set -eu
+
+SCRIPT_DIR=$(dirname "$0")
+cd "${SCRIPT_DIR}/.."
+
+if [ -d build/commons-lang ]; then
+  cd build/commons-lang
+  git pull
+else
+  mkdir -p build
+  cd build
+  git clone --depth 1 [email protected]:apache/commons-lang.git
+  cd commons-lang
+fi
+
+mvn clean compile package -DskipTests
+java -jar ../../src-java/jarjar-1.4.jar process ../../src-java/commons-lang.jarjar.rules target/commons-lang3*-SNAPSHOT.jar ../../src-java/commons-lang3-node-java.jar
+
+echo "complete!"

find_java_libdir.sh renamed to scripts/find_java_libdir.sh

@@ -20,7 +20,7 @@ if (!binaryPath) {
 const bindings = require(binaryPath);
 
 const java = (module.exports = new bindings.Java());
-java.classpath.push(path.resolve(__dirname, "../commons-lang3-node-java.jar"));
+java.classpath.push(path.resolve(__dirname, "../src-java/commons-lang3-node-java.jar"));
 java.classpath.push(path.resolve(__dirname, __dirname, "../src-java"));
 java.classpath.pushDir = function (dir) {
   fs.readdirSync(dir).forEach(function (file) {

postInstall.js renamed to scripts/postInstall.js

@@ -26,7 +26,7 @@ describe("allThreeSuffix", () => {
   });
 
   test("importClass", () => {
-    // Note: java.import executes javascript code in lib/nodeJavaBridge that makes sync calls to java classes.
+    // Note: java.import executes javascript code in src-node/nodeJavaBridge that makes sync calls to java classes.
     const ArrayList = java.import("java.util.ArrayList");
     expect(ArrayList).toBeTruthy();
     const arrayList = new ArrayList();
@@ -54,7 +54,7 @@ describe("allThreeSuffix", () => {
   });
 
   test("staticSyncCalls", () => {
-    // Note: java.import executes javascript code in lib/nodeJavaBridge that makes sync calls to java classes.
+    // Note: java.import executes javascript code in src-node/nodeJavaBridge that makes sync calls to java classes.
     // Among other things, java.import creates Sync functions for static methods.
     const String = java.import("java.lang.String");
     expect(String.formatSync("%s--%s", "hello", "world")).toBe("hello--world");

testRunner.js renamed to scripts/testRunner.js

@@ -47,7 +47,7 @@ describe("asyncSuffixSyncDefault", () => {
   });
 
   test("importClass", () => {
-    // Note: java.import executes javascript code in lib/nodeJavaBridge that makes sync calls to java classes.
+    // Note: java.import executes javascript code in src-node/nodeJavaBridge that makes sync calls to java classes.
     const ArrayList = java.import("java.util.ArrayList");
     expect(ArrayList).toBeTruthy();
     const arrayList = new ArrayList();
@@ -75,7 +75,7 @@ describe("asyncSuffixSyncDefault", () => {
   });
 
   test("staticSyncCalls", () => {
-    // Note: java.import executes javascript code in lib/nodeJavaBridge that makes sync calls to java classes.
+    // Note: java.import executes javascript code in src-node/nodeJavaBridge that makes sync calls to java classes.
     // Among other things, java.import creates Sync functions for static methods.
     const String = java.import("java.lang.String");
     expect(String.format("%s--%s", "hello", "world")).toBe("hello--world");

scripts/update-commons-lang.sh

@@ -54,7 +54,7 @@ describe("defacto", () => {
   });
 
   test("importClass", () => {
-    // Note: java.import executes javascript code in lib/nodeJavaBridge that makes sync calls to java classes.
+    // Note: java.import executes javascript code in src-node/nodeJavaBridge that makes sync calls to java classes.
     const ArrayList = java.import("java.util.ArrayList");
     expect(ArrayList).toBeTruthy();
     const arrayList = new ArrayList();
@@ -82,7 +82,7 @@ describe("defacto", () => {
   });
 
   test("staticSyncCalls", () => {
-    // Note: java.import executes javascript code in lib/nodeJavaBridge that makes sync calls to java classes.
+    // Note: java.import executes javascript code in src-node/nodeJavaBridge that makes sync calls to java classes.
     // Among other things, java.import creates Sync functions for static methods.
     const String = java.import("java.lang.String");
     expect(String.formatSync("%s--%s", "hello", "world")).toBe("hello--world");

src/java.cpp renamed to src-cpp/java.cpp

@@ -49,7 +49,7 @@ describe("defactoPlusPromise", () => {
   });
 
   test("importClass", () => {
-    // Note: java.import executes javascript code in lib/nodeJavaBridge that makes sync calls to java classes.
+    // Note: java.import executes javascript code in src-node/nodeJavaBridge that makes sync calls to java classes.
     const ArrayList = java.import("java.util.ArrayList");
     expect(ArrayList).toBeTruthy();
     const arrayList = new ArrayList();
@@ -77,7 +77,7 @@ describe("defactoPlusPromise", () => {
   });
 
   test("staticSyncCalls", () => {
-    // Note: java.import executes javascript code in lib/nodeJavaBridge that makes sync calls to java classes.
+    // Note: java.import executes javascript code in src-node/nodeJavaBridge that makes sync calls to java classes.
     // Among other things, java.import creates Sync functions for static methods.
     const String = java.import("java.lang.String");
     expect(String.formatSync("%s--%s", "hello", "world")).toBe("hello--world");

src/java.h renamed to src-cpp/java.h

@@ -19,7 +19,7 @@ describe("default", () => {
   });
 
   test("importClass", () => {
-    // Note: java.import executes javascript code in lib/nodeJavaBridge that makes sync calls to java classes.
+    // Note: java.import executes javascript code in src-node/nodeJavaBridge that makes sync calls to java classes.
     const ArrayList = java.import("java.util.ArrayList");
     expect(ArrayList).toBeTruthy();
     const arrayList = new ArrayList();
@@ -47,7 +47,7 @@ describe("default", () => {
   });
 
   test("staticSyncCalls", () => {
-    // Note: java.import executes javascript code in lib/nodeJavaBridge that makes sync calls to java classes.
+    // Note: java.import executes javascript code in src-node/nodeJavaBridge that makes sync calls to java classes.
     // Among other things, java.import creates Sync functions for static methods.
     const String = java.import("java.lang.String");
     expect(String.formatSync("%s--%s", "hello", "world")).toBe("hello--world");

src/javaObject.cpp renamed to src-cpp/javaObject.cpp

@@ -58,7 +58,7 @@ describe("noAsync", () => {
   });
 
   test("importClass", () => {
-    // Note: java.import executes javascript code in lib/nodeJavaBridge that makes sync calls to java classes.
+    // Note: java.import executes javascript code in src-node/nodeJavaBridge that makes sync calls to java classes.
     const ArrayList = java.import("java.util.ArrayList");
     expect(ArrayList).toBeTruthy();
     const arrayList = new ArrayList();
@@ -86,7 +86,7 @@ describe("noAsync", () => {
   });
 
   test("sStaticSyncCalls", () => {
-    // Note: java.import executes javascript code in lib/nodeJavaBridge that makes sync calls to java classes.
+    // Note: java.import executes javascript code in src-node/nodeJavaBridge that makes sync calls to java classes.
     // Among other things, java.import creates Sync functions for static methods.
     const String = java.import("java.lang.String");
     expect(String.formatSync("%s--%s", "hello", "world")).toBe("hello--world");

src/javaObject.h renamed to src-cpp/javaObject.h

@@ -23,7 +23,7 @@ describe("syncDefaultPlusPromise", () => {
   });
 
   test("importClass", () => {
-    // Note: java.import executes javascript code in lib/nodeJavaBridge that makes sync calls to java classes.
+    // Note: java.import executes javascript code in src-node/nodeJavaBridge that makes sync calls to java classes.
     // This test verifies the import runs without error.
     const ArrayList = java.import("java.util.ArrayList");
     expect(ArrayList).toBeTruthy();
@@ -52,7 +52,7 @@ describe("syncDefaultPlusPromise", () => {
   });
 
   test("staticSyncCalls", () => {
-    // Note: java.import executes javascript code in lib/nodeJavaBridge that makes sync calls to java classes.
+    // Note: java.import executes javascript code in src-node/nodeJavaBridge that makes sync calls to java classes.
     // Among other things, java.import creates Sync functions for static methods.
     const String = java.import("java.lang.String");
     expect(String.format("%s--%s", "hello", "world")).toBe("hello--world");

src/javaScope.cpp renamed to src-cpp/javaScope.cpp

@@ -4,7 +4,6 @@ java.options.push("-Djava.awt.headless=true");
 
 java.classpath.push("test/");
 java.classpath.push("test/commons-lang3-3.1.jar");
-java.classpath.push("test8/");
 
 export function getJava(asyncOptions) {
   java.asyncOptions = asyncOptions ?? {