rjb 1.0.0-mswin32

data/ChangeLog

@@ -0,0 +1,183 @@
+Tue Aug 1 arton
+ *load.c
+ *rjb.c
+	change load pathname of the bridge class.
+ *post-install.rb
+	add for remove previous installed rjb.so.
+ *rjb.rake
+	add for build Gem.
+ *rjb.rb	
+	for preparing the pathname constant of the bridge class.
+ *depend
+	chage binary name from rjb.so to rjbcore.so
+ *extconf.rb
+	chage binary name from rjb.so to rjbcore.so
+	
+Mon Jul 31 arton
+ *load.c
+	fix buffer allocation
+
+Sun Jul 16 (Jun 22) Kuwashima and arton
+ *rjb.c
+	version 0.2.8
+ *MANIFEST
+ *depend	
+ *load.c
+ *rjbexception.c
+	change jni.h to jniwrap.h.
+	change the bridge class's header according to JDK 5.0's javah.
+ *jniwrap.h
+	wrap jni.h for Cygin
+	
+Sat Jun 10 14:10:05 2006 arton
+ *rjb.c
+   	version 0.2.7
+	support an array of arrays from ruby to java.
+
+Mon May 8 08:52:12 2006 arton
+ *load.c
+	revision 5
+	support both Intel and PPC Mac.
+	Patched version was contributed by Demetrius Nunes.
+
+Wed Apr 12 03:57:12 2006 arton
+ *rjb.c
+	version 0.2.6
+	support an array of arrays.
+ *test.rb	
+	add an array of arrays test, some tests are contributed by Darren Day.
+ *Test.java
+	add a test method that returns an array of arrays, some tests are
+         contributed by Darren Day.
+	
+Sat Dec 24 18:56:38 2005 arton
+ *rjb.c
+	version 0.2.5
+	release String, Float, Array object after method call.
+ *gctest.rb
+	add for String object gc test
+	
+Mon Sep 19 01:09:30 2005 arton
+ *rjb.c
+	version 0.2.4
+	use null instead of empty string when String argument is nil
+	omit unused local variable from jstring2val
+ *test.rb
+	add null string test (bug since utf-8 support)
+	
+Tue Jun 28 01:57:07 2005 arton
+ *rjb.c
+	version 0.2.3
+	convert result object to imported class if object is an instance of Class
+	call Class#forName if argument count is 1
+ *test.rb
+	add test_importobj contributed by Mr. Kuwashima, thanks.
+	
+Mon Jun 27 20:30:50 2005 arton
+	treat Class.forName as Rjb::import
+ *rjb.c
+	version 0.2.2
+	add method 'forName' into imported Class object
+	if pass imported object to JVM, extract Class object from ruby object
+ *test.rb
+	add above tests
+	
+Sat Jun 25 05:58:36 2005 arton
+	most bugs were reported by Mr. Micael Weller, thanks.
+ *rjb.c
+	version 0.2.1
+	correct derived static method search
+	search class methods then class's instance methods when called by class
+	avoid register non capitalized named constants into constants table
+	correct capitalized named method search 
+ *riconv.c
+	never call iconv if $KCODE is nil
+ *load.c
+	using path separator ; for cygwin (by Ryugate)
+	
+Sun Apr 24 05:26:16 2005 arton
+ *rb.c
+	version 0.2.0
+	delete localref if globalref was created.
+	load can take the second argument for jvm
+ *load.c
+	load can take the second argument for jvm
+	
+Mon Jan 17 02:40:21 2005 arton
+ *rjb.c
+	add 'throw' module function.
+	move java exception handling functions into newly created rjbexception.c
+ *rjb.h
+	declations for rjb.c and rjbexception.c
+ *rjbexception.c
+	java exception handling functions, and 'throw' module function.
+ *test.rb
+	adding throw test.
+	
+Wed Jan 12 00:01:08 2005 Kaspar Schiess and arton
+ *rjb.c
+	correct Rjb::load parameter evaluation (classpath).
+   - many thanks to Mr.Schiess.
+
+Sun Nov 21 02:51:43 2004 Kuwashima and arton
+ *rjb.c
+        move dbcs-utf-8 auto conversion feature into riconv.?
+        remove JNI version argument from Rjb::load. (bug reported by Mr.Tateishi)
+ *load.c
+        correct CLASSPATH setting (bad environment name).(bug reported by Mr.Tateishi)
+ *riconv.c riconv.h (contributed by Mr.Kuwashima)
+        DBCS - utf-8 auto conversion functions.
+ *depend MANIFEST
+        add riconv.?
+   - many tanks to Mr.Kuwashima and Mr.Tateishi.
+
+Tue Oct 5 23:08:59 2004 Kuwashima and arton
+ *test.rb
+	add kanji conversion test
+ *rjb.c	
+	add dbcs(sjis and euc-jp) - utf-8 auto conversion feature.
+	the patch was contributed by Mr.Kuwashima, many thanks.
+	
+Sun Oct 3 18:24:42 2004 arton
+ *load.c	
+	JNIEnv* now using local variable instead of global one.
+	Because AWT event use a worker thread, and JNI need thread's owned JNIEnv.
+ *rjb.c
+	JNIEnv* now using local variable instead of global one.
+	Because AWT event use a worker thread, and JNI need thread's owned JNIEnv.
+	This change was suggested by Mr.Kuwashima, he also tested the behavior,
+	 and gave me some test codes.
+	and attach_current_thread is from Mr.Kuwashima's patch.
+	Many thanks to Mr.Kuwashima.
+	
+Sat Sep 25 03:25:45 2004 arton
+ *rjb.c		
+	implements interface's method argument conversion.
+ *test.rb
+	add Comparable test (interface with method arguments)
+ *Test.java	
+	add Comparable test method.
+
+Wed Sep 22 02:30:15 2004 arton	
+ *rjb.c	
+	correct constants load, using mid-class.
+	convert null string to nil
+	
+Wed Sep 22 00:05:32 2004 arton	
+ *rjb.c	
+	correct ruby type checking. If the parameter type is java.lang.String, rjb instance is always accepted.
+	
+Mon Sep 20 22:02:53 2004 arton
+ *rjb.c
+	checking method/constructor signature with class when the argument is rjb's instance.
+Sun Sep 19 00:54:35 2004 arton
+ *rjb.c
+	convert Java exception to Ruby's StandardError derived class.
+	checking method/constructor signature when invoking if no signatur argument is supplied.
+	adding field accessor.
+	
+Sun Sep 12 21:42:00 2004 arton
+ *rjb.c	
+	call exception description when verbose = true.
+	correct recursive import call (for Boolean).
+	corrent method not found message creation.

data/ext/RBridge.java

@@ -0,0 +1,39 @@
+/*
+ * Rjb - Ruby <-> Java Bridge
+ * Copyright(c) 2004 arton
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * $Id: RBridge.java 2 2006-04-11 19:04:40Z arton $
+ * $Log: RBridge.java,v $
+ * Revision 1.2  2004/06/19 09:05:00  arton
+ * delete debug lines
+ *
+ * Revision 1.1  2004/06/19 09:00:19  arton
+ * Initial revision
+ *
+ */
+package jp.co.infoseek.hp.arton.rjb;
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+
+public class RBridge implements InvocationHandler {
+    public Object register(Class itf) {
+	return Proxy.newProxyInstance(itf.getClassLoader(),
+		      new Class[] { itf }, this);
+    }
+    public Object invoke(Object proxy, Method method, Object[] args)
+	throws Throwable {
+	return call(method.getName(), proxy, args);
+    }
+    private native Object call(String methodName, Object target, Object[] args);
+}

data/ext/depend

@@ -0,0 +1,23 @@
+riconv.o : riconv.c $(hdrdir)/ruby.h $(hdrdir)/config.h $(hdrdir)/defines.h jp_co_infoseek_hp_arton_rjb_RBridge.h
+rjb.o : rjb.c $(hdrdir)/ruby.h $(hdrdir)/config.h $(hdrdir)/defines.h jp_co_infoseek_hp_arton_rjb_RBridge.h riconv.h rjb.h
+rjbexception.o : rjbexception.c $(hdrdir)/ruby.h $(hdrdir)/config.h $(hdrdir)/defines.h jp_co_infoseek_hp_arton_rjb_RBridge.h riconv.h rjb.h
+load.o : load.c $(hdrdir)/ruby.h $(hdrdir)/config.h $(hdrdir)/defines.h jp_co_infoseek_hp_arton_rjb_RBridge.h
+jp_co_infoseek_hp_arton_rjb_RBridge.h : jniwrap.h ../data/rjb/jp/co/infoseek/hp/arton/rjb/RBridge.class
+	javah -classpath ../data/rjb jp.co.infoseek.hp.arton.rjb.RBridge
+../data/rjb/jp/co/infoseek/hp/arton/rjb/RBridge.class : RBridge.java
+	mkdir -p ../data/rjb/jp/co/infoseek/hp/arton/rjb
+	javac -d ../data/rjb RBridge.java
+test : rjbcore.so ../test/jp/co/infoseek/hp/arton/rjb/Test.class ../test/jp/co/infoseek/hp/arton/rjb/IBase.class ../test/jp/co/infoseek/hp/arton/rjb/Base.class ../test/jp/co/infoseek/hp/arton/rjb/ExtBase.class 
+	ruby ../test/test.rb
+../test/jp/co/infoseek/hp/arton/rjb/Test.class : ../test/Test.java 
+	javac ../test/Test.java
+	$(RUBY) -r fileutils -e 'FileUtils.mkdir_p "../test/jp/co/infoseek/hp/arton/rjb";FileUtils.mv("../test/Test.class", "../test/jp/co/infoseek/hp/arton/rjb")'
+../test/jp/co/infoseek/hp/arton/rjb/IBase.class : ../test/IBase.java 
+	javac ../test/IBase.java
+	$(RUBY) -r fileutils -e 'FileUtils.mkdir_p "../test/jp/co/infoseek/hp/arton/rjb";FileUtils.mv("../test/IBase.class", "../test/jp/co/infoseek/hp/arton/rjb")'
+../test/jp/co/infoseek/hp/arton/rjb/Base.class : ../test/Base.java ../test/jp/co/infoseek/hp/arton/rjb/IBase.class
+	javac -classpath ../test ../test/Base.java
+	$(RUBY) -r fileutils -e 'FileUtils.mkdir_p "../test/jp/co/infoseek/hp/arton/rjb";FileUtils.mv("../test/Base.class", "../test/jp/co/infoseek/hp/arton/rjb")'
+../test/jp/co/infoseek/hp/arton/rjb/ExtBase.class : ../test/ExtBase.java 
+	javac -classpath ../test ../test/ExtBase.java
+	$(RUBY) -r fileutils -e 'FileUtils.mkdir_p "../test/jp/co/infoseek/hp/arton/rjb";FileUtils.mv("../test/ExtBase.class", "../test/jp/co/infoseek/hp/arton/rjb")'

data/ext/jniwrap.h

@@ -0,0 +1,32 @@
+/*
+ * Rjb - Ruby <-> Java Bridge
+ * Copyright(c) 2006 Kuwashima
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * $Id:$
+ */
+#ifndef _Included_jniwrap
+#define _Included_jniwrap
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#if defined(__GNUC__) && (defined(__CYGWIN32__) || defined(__MINGW32__))
+typedef long long __int64;
+#endif
+
+#include <jni.h>
+
+#ifdef __cplusplus
+}
+#endif
+#endif                    

data/ext/jp_co_infoseek_hp_arton_rjb_RBridge.h

@@ -0,0 +1,21 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class jp_co_infoseek_hp_arton_rjb_RBridge */
+
+#ifndef _Included_jp_co_infoseek_hp_arton_rjb_RBridge
+#define _Included_jp_co_infoseek_hp_arton_rjb_RBridge
+#ifdef __cplusplus
+extern "C" {
+#endif
+/*
+ * Class:     jp_co_infoseek_hp_arton_rjb_RBridge
+ * Method:    call
+ * Signature: (Ljava/lang/String;Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
+ */
+JNIEXPORT jobject JNICALL Java_jp_co_infoseek_hp_arton_rjb_RBridge_call
+  (JNIEnv *, jobject, jstring, jobject, jobjectArray);
+
+#ifdef __cplusplus
+}
+#endif
+#endif

data/ext/load.c

@@ -0,0 +1,250 @@
+/*
+ * Rjb - Ruby <-> Java Bridge
+ * Copyright(c) 2004,2005,2006 arton
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * $Id: load.c 14 2006-08-01 13:51:41Z arton $
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include "ruby.h"
+#include "intern.h"
+#include "st.h"
+#include "util.h"
+#include "jniwrap.h"
+#include "jp_co_infoseek_hp_arton_rjb_RBridge.h"
+#include "rjb.h"
+
+#define JVM_TYPE "client"
+
+#if defined(_WIN32) || defined(__CYGWIN__)
+ #if defined(__CYGWIN__)
+  #define JVMDLL "%s/jre/bin/%s/jvm.dll"
+  #define DIRSEPARATOR '/'
+ #else
+  #define JVMDLL "%s\\jre\\bin\\%s\\jvm.dll"
+  #define DIRSEPARATOR '\\'
+ #endif
+ #define CLASSPATH_SEP  ';'
+#elif defined(__APPLE__) && defined(__MACH__)
+  #define JVMDLL "%s/Libraries/libjvm_compat.dylib"
+  #define DIRSEPARATOR '/'
+  #define CLASSPATH_SEP ':'
+#else /* defined(_WIN32) || defined(__CYGWIN__) */
+ #if defined(__sparc_v9__)
+   #define ARCH "sparcv9"
+ #elif defined(__sparc__)
+   #define ARCH "sparc"
+ #elif defined(i586) || defined(__i386__)
+  #define ARCH "i386"
+ #endif
+ #ifndef ARCH
+  #include <sys/systeminfo.h>
+ #endif
+ #define JVMDLL "%s/jre/lib/%s/%s/libjvm.so"
+ #define DIRSEPARATOR '/'
+ #define CLASSPATH_SEP ':'
+#endif
+
+typedef void (*GETDEFAULTJAVAVMINITARGS)(void*);
+typedef int (*CREATEJAVAVM)(JavaVM**, void**, void*);
+
+extern JavaVM* jvm;
+extern jclass rbridge;
+extern jmethodID register_bridge;
+static VALUE jvmdll = Qnil;
+static VALUE GetDefaultJavaVMInitArgs;
+static VALUE CreateJavaVM;
+
+/*
+ * not completed, only valid under some circumstances.
+ */
+static VALUE load_jvm(char* jvmtype)
+{
+    char* libpath;
+    char* java_home;
+    char* jh;
+    VALUE dl;
+
+#if defined(__APPLE__) && defined(__MACH__)
+    jh = "/System/Library/Frameworks/JavaVM.framework";
+#else
+    jh = getenv("JAVA_HOME");
+#endif
+    if (!jh)
+    {
+        return Qnil;
+    }
+    java_home = ALLOCA_N(char, strlen(jh) + 1);
+    strcpy(java_home, jh);
+    if (*(java_home + strlen(jh) - 1) == DIRSEPARATOR)
+    {
+	*(java_home + strlen(jh) - 1) = '\0';
+    }
+#if defined(_WIN32) || defined(__CYGWIN__)
+    libpath = ALLOCA_N(char, sizeof(JVMDLL) + strlen(java_home)
+		       + strlen(jvmtype) + 1);
+    sprintf(libpath, JVMDLL, java_home, jvmtype);
+#elif defined(__APPLE__) && defined(__MACH__)
+    libpath = ALLOCA_N(char, sizeof(JVMDLL) + strlen(java_home) + 1);
+    sprintf(libpath, JVMDLL, java_home);
+#else /* not Windows / MAC OS-X */
+    libpath = ALLOCA_N(char, sizeof(JVMDLL) + strlen(java_home)
+		       + strlen(ARCH) + strlen(jvmtype) + 1);
+    sprintf(libpath, JVMDLL, java_home, ARCH, jvmtype);
+#endif
+    rb_require("dl");
+    dl = rb_eval_string("DL");
+    jvmdll = rb_funcall(dl, rb_intern("dlopen"), 1, rb_str_new2(libpath));
+    GetDefaultJavaVMInitArgs = rb_funcall(jvmdll, rb_intern("sym"),
+			  2, rb_str_new2("JNI_GetDefaultJavaVMInitArgs"),
+			     rb_str_new2("0p"));
+    CreateJavaVM = rb_funcall(jvmdll, rb_intern("sym"),
+			      2, rb_str_new2("JNI_CreateJavaVM"),
+			         rb_str_new2("pppp"));
+    return Qtrue;
+}
+
+int load_bridge(JNIEnv* jenv)
+{
+    JNINativeMethod nmethod[1];
+    jbyte buff[8192];
+    char* bridge;
+    int len;
+    FILE* f;
+    jclass loader = (*jenv)->FindClass(jenv, "java/lang/ClassLoader");
+    jmethodID getSysLoader = (*jenv)->GetStaticMethodID(jenv, loader,
+		   "getSystemClassLoader", "()Ljava/lang/ClassLoader;");
+    jobject iloader = (*jenv)->CallStaticObjectMethod(jenv, loader, getSysLoader);
+    VALUE v = rb_const_get_at(rb_const_get(rb_cObject, rb_intern("RjbConf")), 
+			      rb_intern("BRIDGE_FILE"));
+    bridge = StringValuePtr(v);
+#if defined(DOSISH)
+    bridge = ALLOCA_N(char, strlen(bridge) + 8);
+    strcpy(bridge, StringValuePtr(v));
+    for (len = 0; bridge[len]; len++)
+    {
+	if (bridge[len] == '/')
+	{
+	    bridge[len] = '\\';
+	}
+    }
+#endif
+    f = fopen(bridge, "rb");
+    if (f == NULL)
+    {
+	return -1;
+    }
+    len = fread(buff, 1, sizeof(buff), f);
+    fclose(f);
+    rbridge = (*jenv)->DefineClass(jenv,
+		   "jp/co/infoseek/hp/arton/rjb/RBridge", iloader, buff, len);
+    if (rbridge == NULL)
+    {
+	check_exception(jenv, 1);
+    }
+    register_bridge = (*jenv)->GetMethodID(jenv, rbridge, "register",
+			   "(Ljava/lang/Class;)Ljava/lang/Object;");
+    nmethod[0].name = "call";
+    nmethod[0].signature = "(Ljava/lang/String;Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;";
+    nmethod[0].fnPtr = Java_jp_co_infoseek_hp_arton_rjb_RBridge_call;
+    (*jenv)->RegisterNatives(jenv, rbridge, nmethod, 1);
+    rbridge = (*jenv)->NewGlobalRef(jenv, rbridge);
+    return 0;
+}
+
+int create_jvm(JNIEnv** pjenv, JavaVMInitArgs* vm_args, char* userpath, VALUE argv)
+{
+    static JavaVMOption soptions[] = {
+#if defined(__sparc_v9__) || defined(__sparc__)
+      { "-Xusealtsigs", NULL },
+#elif defined(linux) || defined(__linux__)
+      { "-Xrs", NULL },
+#elif defined(__APPLE__) && defined(_ARCH_PPC)
+      { "-Xrs", NULL },
+#endif
+#if defined(SHOW_JAVAGC)
+      { "-verbose:gc", NULL },
+#endif
+      { "DUMMY", NULL },   /* for classpath count */
+    };
+    char* newpath;
+    VALUE ptr;
+    int len;
+    int result;
+    GETDEFAULTJAVAVMINITARGS initargs;
+    CREATEJAVAVM createjavavm;
+    JavaVMOption* options;
+    int optlen;
+    int i;
+    VALUE optval;
+
+    if (jvmdll == Qnil)
+    {
+	if (load_jvm(JVM_TYPE) == Qnil)
+	{
+	    return -1;
+	}
+    }
+
+    ptr = rb_funcall(GetDefaultJavaVMInitArgs, rb_intern("to_i"), 0);
+    initargs = *(GETDEFAULTJAVAVMINITARGS*)FIX2INT(ptr);
+    initargs(vm_args);
+    len = strlen(userpath);
+    if (getenv("CLASSPATH"))
+    {
+        len += strlen(getenv("CLASSPATH"));
+    }
+    newpath = ALLOCA_N(char, len + 32);
+    if (getenv("CLASSPATH"))
+    {
+        sprintf(newpath, "-Djava.class.path=%s%c%s",
+		userpath, CLASSPATH_SEP, getenv("CLASSPATH"));
+    }
+    else
+    {
+        sprintf(newpath, "-Djava.class.path=%s", userpath);
+    }
+    optlen = 0;
+    if (!NIL_P(argv))
+    {
+        optlen += RARRAY(argv)->len;
+    }
+    optlen += COUNTOF(soptions);
+    options = ALLOCA_N(JavaVMOption, optlen);
+    options->optionString = newpath;
+    options->extraInfo = NULL;
+    for (i = 1; i < COUNTOF(soptions); i++)
+    {
+	*(options + i) = soptions[i - 1];
+    }
+    for (; i < optlen; i++)
+    {
+        optval = rb_ary_entry(argv, i - COUNTOF(soptions));
+	Check_Type(optval, T_STRING);
+	(options + i)->optionString = StringValueCStr(optval);
+	(options + i)->extraInfo = NULL;
+    }
+    vm_args->nOptions = optlen;
+    vm_args->options = options;
+    vm_args->ignoreUnrecognized = JNI_TRUE;
+    ptr = rb_funcall(CreateJavaVM, rb_intern("to_i"), 0);
+    createjavavm = *(CREATEJAVAVM*)FIX2INT(ptr);
+    result = createjavavm(&jvm, (void**)pjenv, vm_args);
+    if (!result)
+    {
+	result = load_bridge(*pjenv);
+    }
+    return result;
+}
+