merge from master to my fork (#1)

gcstang · web-flow · commit 4ed122e99cab · 2016-09-13T12:04:26.000-05:00
* fixed arm stuff

* added raspi hack

* issue with opensdk on arm

* Update README.md

* v0.7.1

* added compile java (1.7) for windows

* added event listener test

* fixed a bug on win-64bit

* v0.7.2
diff --git a/README.md b/README.md
@@ -58,6 +58,12 @@ npm test
 
 _NOTE: You will need node-gyp installed using "npm install -g node-gyp"_
 
+On Raspian you might need a: 
+
+* sudo ln -s /usr/lib/jvm/jdk-7-oracle-arm-vfp-hflt /opt/jdk
+
+Some issues with the OpenSDK7 so take the Oracle version for compiling.
+
 ## Docker
 
 If you want to play with node-java but don't want to setup the build environment you can run it in docker.
diff --git a/binding.gyp b/binding.gyp
@@ -24,6 +24,9 @@
       ['OS=="mac"', {
       	'javaver%' : "<!(awk -F/ -v h=`node findJavaHome.js` 'BEGIN {n=split(h, a); print a[2]; exit}')"
       }],
+      ['OS=="linux" and target_arch=="arm"', {
+        'javalibdir%': "<!(h=\"`node findJavaHome.js`\" sh -c 'if [ -d \"$h/jre/lib/arm/classic\" ]; then echo $h/jre/arm/i386/classic; else echo $h/jre/lib/arm/server; fi')"
+      }],
       ['OS=="linux" and target_arch=="ia32"', {
         'javalibdir%': "<!(h=\"`node findJavaHome.js`\" sh -c 'if [ -d \"$h/jre/lib/i386/classic\" ]; then echo $h/jre/lib/i386/classic; else echo $h/jre/lib/i386/server; fi')"
       }],
diff --git a/compile-java-code.cmd b/compile-java-code.cmd
@@ -0,0 +1,16 @@
+set JAVA_VERSION=1.7
+
+set OUTFILE="%TMP%\findJavaHome.txt"
+node findJavaHome.js > %OUTFILE%
+set /p JAVA_HOME=<%OUTFILE%
+
+set JAVAC_OPTS=-source %JAVA_VERSION% -target %JAVA_VERSION% -bootclasspath "%JAVA_HOME%\jre\lib\rt.jar"
+
+cd test
+"%JAVA_HOME%\bin\javac" %JAVAC_OPTS% *.java
+
+cd ..\src-java\node
+"%JAVA_HOME%\bin\javac" %JAVAC_OPTS% *.java
+
+cd ..\..\
+"%JAVA_HOME%\bin\javah" -classpath src-java -d .\src node.NodeDynamicProxyClass
diff --git a/compile-java8-code.cmd b/compile-java8-code.cmd
@@ -0,0 +1,8 @@
+set JAVA_VERSION=1.8
+
+set OUTFILE="%TMP%\findJavaHome.txt"
+node findJavaHome.js > %OUTFILE%
+set /p JAVA_HOME=<%OUTFILE%
+
+cd test8
+"%JAVA_HOME%\bin\javac" -source %JAVA_VERSION% *.java
diff --git a/package.json b/package.json
@@ -7,7 +7,7 @@
     "jvm",
     "bridge"
   ],
-  "version": "0.7.0",
+  "version": "0.7.2",
   "engines": {
     "node": ">=0.10.0"
   },
diff --git a/src/java.cpp b/src/java.cpp
@@ -452,7 +452,7 @@ NAN_METHOD(Java::newProxy) {
   jclass objectClazz = env->FindClass("java/lang/Object");
   jobjectArray methodArgs = env->NewObjectArray(2, objectClazz, NULL);
   env->SetObjectArrayElement(methodArgs, 0, v8ToJava(env, Nan::New<v8::String>(s_nativeBindingLocation.c_str()).ToLocalChecked()));
-  env->SetObjectArrayElement(methodArgs, 1, longToJavaLongObj(env, (long)dynamicProxyData));
+  env->SetObjectArrayElement(methodArgs, 1, longToJavaLongObj(env, (jlong)dynamicProxyData));
   jobject method = javaFindConstructor(env, clazz, methodArgs);
   if(method == NULL) {
     std::ostringstream errStr;
diff --git a/test/ListenerInterface.class b/test/ListenerInterface.class
diff --git a/test/ListenerInterface.java b/test/ListenerInterface.java
@@ -0,0 +1,3 @@
+public interface ListenerInterface {
+    void onEvent(java.util.ArrayList<String> list, java.lang.Runtime runtime);
+}
diff --git a/test/ListenerTester.class b/test/ListenerTester.class
diff --git a/test/ListenerTester.java b/test/ListenerTester.java
@@ -0,0 +1,19 @@
+public class ListenerTester {
+    private ListenerInterface _listener;
+
+    public void setListener(ListenerInterface listener) {
+        this._listener = listener;
+    }
+
+    public void raiseEvent() {
+        if(this._listener == null)
+            return;
+
+        java.util.ArrayList<String> list = new java.util.ArrayList<String>();
+        list.add("hello");
+        list.add("from");
+        list.add("Java");
+        
+        this._listener.onEvent(list, java.lang.Runtime.getRuntime());
+    }
+}
diff --git a/test/dynamicProxy-test.js b/test/dynamicProxy-test.js
@@ -54,6 +54,24 @@ exports['Dynamic Proxy'] = nodeunit.testCase({
     test.done();
   },
 
+  "Listener test": function (test) {
+    var runData = '';
+
+    var myProxy = java.newProxy('ListenerInterface', {
+      onEvent: function (list, runtime) {
+        runData = 'onEvent';
+      }
+    });
+
+    var listenerTester = java.newInstanceSync("ListenerTester");
+    listenerTester.setListenerSync(myProxy);
+    listenerTester.raiseEventSync();
+
+    test.equals(runData, 'onEvent');
+
+    test.done();
+  },  
+
   "thread": function (test) {
     var callCount = 0;
 
diff --git a/testRunner.js b/testRunner.js
@@ -14,7 +14,10 @@ var tests = glob.sync(path.join('testAsyncOptions', '*.js'));
 tests.unshift('test test8');  // Arrange to run the primary tests first, in a single process
 
 function runTest(testArgs, done) {
-  var cmd = 'node_modules/.bin/nodeunit ' + testArgs;
+  var cmd = 'node_modules/.bin/nodeunit ';
+  if(process.platform == "win32")
+    cmd = 'node_modules\\.bin\\nodeunit ';  
+  cmd += testArgs;
   childProcess.exec(cmd, function (error, stdout, stderr) {
     // It appears that nodeunit merges error output into the stdout
     // so these three lines are probably useless.

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+public interface ListenerInterface {`
	`2`	`+ void onEvent(java.util.ArrayList<String> list, java.lang.Runtime runtime);`
	`3`	`+}`