rjb 1.4.5 → 1.4.6

data/ChangeLog

@@ -1,9 +1,14 @@
+Sat Jan 26 2013 arton
+ *ext/rjb.c
+	RJB_VERSION -> 1.4.6 for new gem
+ *RBridge.class
+	Java Major Version -> 46
 Sun Jan 13 2013 arton
  *test/test.rb
 	add bignum argument test
  *ext/rjb.c
 	accept bignum argument for 'J' 
-	RJB_VERSION -> 1.4.5 for new gem
+	this bug(or at least mis spec.) was pointed by janroesner. Thanks janroesner !
 Tue Dec 17 arton
  *test/test.rb
 	add test_norarg_invoke

data/ext/RBridge.java

@@ -1,39 +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);
-}
+/*
+ * 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

@@ -1,23 +1,23 @@
-riconv.o : riconv.c jp_co_infoseek_hp_arton_rjb_RBridge.h
-rjb.o : rjb.c jp_co_infoseek_hp_arton_rjb_RBridge.h riconv.h rjb.h
-rjbexception.o : rjbexception.c jp_co_infoseek_hp_arton_rjb_RBridge.h riconv.h rjb.h
-load.o : load.c 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")'
+riconv.o : riconv.c jp_co_infoseek_hp_arton_rjb_RBridge.h
+rjb.o : rjb.c jp_co_infoseek_hp_arton_rjb_RBridge.h riconv.h rjb.h
+rjbexception.o : rjbexception.c jp_co_infoseek_hp_arton_rjb_RBridge.h riconv.h rjb.h
+load.o : load.c 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/extconf.h

@@ -1,6 +1,7 @@
 #ifndef EXTCONF_H
 #define EXTCONF_H
 #define HAVE_JNI_H 1
+#define HAVE_NL_LANGINFO 1
 #define HAVE_SETLOCALE 1
 #define HAVE_GETENV 1
 #define RJB_RUBY_VERSION_CODE 193

data/ext/extconf.rb

@@ -1,77 +1,77 @@
-#----------------------------------
-# extconf.rb
-# $Revision: $
-# $Date: $
-#----------------------------------
-require 'mkmf'
-
-class Path
-
-  def initialize()
-    if File::ALT_SEPARATOR.nil?
-      @file_separator = File::SEPARATOR
-    else
-      @file_separator = File::ALT_SEPARATOR
-    end
-  end
-
-  def include(parent, child)
-    inc = joint(parent, child)
-    $INCFLAGS += " -I\"#{inc}\""
-    $CFLAGS += " -I\"#{inc}\""
-    inc
-  end
-
-  def joint(parent, child)
-    parent + @file_separator + child
-  end
-
-end
-
-javahome = ENV['JAVA_HOME']
-if javahome.nil? && RUBY_PLATFORM =~ /darwin/
-  javahome = `/usr/libexec/java_home`.strip
-end
-unless javahome.nil?
-  if javahome[0] == ?" && javahome[-1] == ?"
-    javahome = javahome[1..-2]
-  end
-  raise "JAVA_HOME is not directory." unless File.directory?(javahome)
-  pt = Path.new
-  inc = pt.include(javahome, 'include')
-  if !File.exists?(inc) && RUBY_PLATFORM =~ /darwin/
-    inc = pt.include('/System/Library/Frameworks/JavaVM.framework', 'Headers')
-  end
-  Dir.open(inc).each do |d|
-    next if d[0] == ?.
-    if File.directory?(pt.joint(inc, d))
-      pt.include(inc, d)
-      break
-    end
-  end
-else
-  raise "JAVA_HOME is not set."
-end
-
-
-def create_rjb_makefile
-  if have_header("jni.h")
-    have_func("locale_charset", "iconv.h")
-    have_func("nl_langinfo", "langinfo.h")
-    have_func("setlocale", "locale.h")
-    have_func("getenv")
-    $defs << "-DRJB_RUBY_VERSION_CODE="+RUBY_VERSION.gsub(/\./, '')
-    create_header
-    create_makefile("rjbcore")
-  else
-    raise "no jni.h in " + $INCFLAGS
-  end
-end
-
-case RUBY_PLATFORM
-when /mswin32/
-  $CFLAGS += ' /W3'
-when /cygwin/, /mingw/
-  $defs << '-DNONAMELESSUNION'
-end
-create_rjb_makefile
+#----------------------------------
+# extconf.rb
+# $Revision: $
+# $Date: $
+#----------------------------------
+require 'mkmf'
+
+class Path
+
+  def initialize()
+    if File::ALT_SEPARATOR.nil?
+      @file_separator = File::SEPARATOR
+    else
+      @file_separator = File::ALT_SEPARATOR
+    end
+  end
+
+  def include(parent, child)
+    inc = joint(parent, child)
+    $INCFLAGS += " -I\"#{inc}\""
+    $CFLAGS += " -I\"#{inc}\""
+    inc
+  end
+
+  def joint(parent, child)
+    parent + @file_separator + child
+  end
+
+end
+
+javahome = ENV['JAVA_HOME']
+if javahome.nil? && RUBY_PLATFORM =~ /darwin/
+  javahome = `/usr/libexec/java_home`.strip
+end
+unless javahome.nil?
+  if javahome[0] == ?" && javahome[-1] == ?"
+    javahome = javahome[1..-2]
+  end
+  raise "JAVA_HOME is not directory." unless File.directory?(javahome)
+  pt = Path.new
+  inc = pt.include(javahome, 'include')
+  if !File.exists?(inc) && RUBY_PLATFORM =~ /darwin/
+    inc = pt.include('/System/Library/Frameworks/JavaVM.framework', 'Headers')
+  end
+  Dir.open(inc).each do |d|
+    next if d[0] == ?.
+    if File.directory?(pt.joint(inc, d))
+      pt.include(inc, d)
+      break
+    end
+  end
+else
+  raise "JAVA_HOME is not set."
+end
+
+
+def create_rjb_makefile
+  if have_header("jni.h")
+    have_func("locale_charset", "iconv.h")
+    have_func("nl_langinfo", "langinfo.h")
+    have_func("setlocale", "locale.h")
+    have_func("getenv")
+    $defs << "-DRJB_RUBY_VERSION_CODE="+RUBY_VERSION.gsub(/\./, '')
+    create_header
+    create_makefile("rjbcore")
+  else
+    raise "no jni.h in " + $INCFLAGS
+  end
+end
+
+case RUBY_PLATFORM
+when /mswin32/
+  $CFLAGS += ' /W3'
+when /cygwin/, /mingw/
+  $defs << '-DNONAMELESSUNION'
+end
+create_rjb_makefile

data/ext/jp_co_infoseek_hp_arton_rjb_RBridge.h

@@ -1,21 +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
+/* 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

@@ -1,408 +1,408 @@
-/*
- * Rjb - Ruby <-> Java Bridge
- * Copyright(c) 2004,2005,2006,2009,2010,2011 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 180 2011-12-05 16:34:29Z arton $
- */
-
-#include <stdlib.h>
-#include <stdio.h>
-#include "ruby.h"
-#include "extconf.h"
-#if RJB_RUBY_VERSION_CODE < 190
-#include "intern.h"
-#include "st.h"
-#include "util.h"
-#else
-#include "ruby/intern.h"
-#include "ruby/st.h"
-#include "ruby/util.h"
-#endif
-#include "jniwrap.h"
-#include "jp_co_infoseek_hp_arton_rjb_RBridge.h"
-#include "rjb.h"
-
-#define JVM_TYPE "client"
-#define ALT_JVM_TYPE "classic"
-
-#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 '\\'
-  #if defined(_WIN64)
-    #undef JVM_TYPE
-    #define JVM_TYPE "server"
-  #endif
- #endif
- #define CLASSPATH_SEP  ';'
-#elif defined(__APPLE__) && defined(__MACH__)
-  static char* JVMDLL = "%s/JavaVM";
-  #define DIRSEPARATOR '/'
-  #define CLASSPATH_SEP ':'
-  #define HOME_NAME "/Home"
-  #define HOME_NAME_LEN strlen(HOME_NAME)
-  #define DEFAULT_HOME "/System/Library/Frameworks/JavaVM.framework"
-#elif defined(_AIX)
-  #define ARCH "ppc"
-  #undef JVM_TYPE
-  #define JVM_TYPE "j9vm"
-#elif defined(__hpux)
-  #define JVMDLL "%s/jre/lib/%s/%s/libjvm.sl"
-  #define ARCH "PA_RISC"
-  #undef JVM_TYPE
-  #define JVM_TYPE "server"
-  #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(__amd64__)
-   #define ARCH "amd64"
-   #undef JVM_TYPE
-   #define JVM_TYPE "server"
- #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
-
-#if defined(__APPLE__) && defined(__MACH__)
- static char* CREATEJVM = "JNI_CreateJavaVM";
- static char* GETDEFAULTJVMINITARGS = "JNI_GetDefaultJavaVMInitArgs";
-#else
- #define CREATEJVM "JNI_CreateJavaVM"
- #define GETDEFAULTJVMINITARGS "JNI_GetDefaultJavaVMInitArgs"
-#endif
-
-typedef int (JNICALL *GETDEFAULTJAVAVMINITARGS)(void*);
-typedef int (JNICALL *CREATEJAVAVM)(JavaVM**, JNIEnv**, void*);
-
-
-static VALUE jvmdll = Qnil;
-static VALUE getdefaultjavavminitargsfunc;
-static VALUE createjavavmfunc;
-
-static int open_jvm(char* libpath)
-{
-    int sstat;
-    VALUE* argv;
-
-    rb_require("dl");
-#if !defined(RUBINIUS)
-    if (!rb_const_defined_at(rb_cObject, rb_intern("DL")))
-    {
-	rb_raise(rb_eRuntimeError, "Constants DL is not defined.");
-	return 0;
-    }
-#endif
-    argv = ALLOCA_N(VALUE, 4);
-    *argv = rb_const_get(rb_cObject, rb_intern("DL"));
-    *(argv + 1) = rb_intern("dlopen");
-    *(argv + 2) = 1;
-    *(argv + 3) = rb_str_new2(libpath);
-    jvmdll = rb_protect(rjb_safe_funcall, (VALUE)argv, &sstat);
-    if (sstat)
-    {
-        return 0;
-    }
-    /* get function pointers of JNI */
-#if RJB_RUBY_VERSION_CODE < 190
-    getdefaultjavavminitargsfunc = rb_funcall(rb_funcall(rb_funcall(jvmdll, rb_intern("[]"), 2, rb_str_new2(GETDEFAULTJVMINITARGS), rb_str_new2("IP")), rb_intern("to_ptr"), 0), rb_intern("to_i"), 0); 
-    createjavavmfunc = rb_funcall(rb_funcall(rb_funcall(jvmdll, rb_intern("[]"), 2, rb_str_new2(CREATEJVM), rb_str_new2("IPPP")), rb_intern("to_ptr"), 0), rb_intern("to_i"), 0); 
-#else
-    getdefaultjavavminitargsfunc = rb_funcall(jvmdll, rb_intern("[]"), 1, rb_str_new2(GETDEFAULTJVMINITARGS));
-    createjavavmfunc = rb_funcall(jvmdll, rb_intern("[]"), 1, rb_str_new2(CREATEJVM));
-#endif
-    return 1;
-}
-
-#if defined(__APPLE__) && defined(__MACH__)
-static int file_exist(const char* dir, const char* file)
-{
-    VALUE path = rb_funcall(rb_cFile, rb_intern("join"), 2,
-                            rb_str_new2(dir), rb_str_new2(file));
-    VALUE ret = rb_funcall(rb_cFile, rb_intern("exist?"), 1, path);
-    return RTEST(ret);
-}
-#endif
-
-/*
- * not completed, only valid under some circumstances.
- */
-static int load_jvm(const char* jvmtype)
-{
-    char* libpath;
-    char* java_home;
-    char* jh;
-
-    jh = getenv("JAVA_HOME");
-#if defined(__APPLE__) && defined(__MACH__)
-    if (!jh)
-    {
-        jh = DEFAULT_HOME;
-    }
-    else
-    {
-        if (strlen(jh) > HOME_NAME_LEN)
-        {
-            size_t len = strlen(jh);
-            char* p = ALLOCA_N(char, len + 8);
-            jh = strcpy(p, jh);
-            if (*(jh + len - 1) == '/')
-            {
-                --len;
-                *(jh + len) = '\0';
-            }
-            if (strcasecmp(jh + len - HOME_NAME_LEN, HOME_NAME) == 0)
-            {
-                strcpy(p + len, "/..");
-            }
-        }
-        if (!jvmtype && !file_exist(jh, "JavaVM"))
-        {
-            jh = DEFAULT_HOME;
-        }
-    }
-#endif
-    if (!jh)
-    {
-        if (RTEST(ruby_verbose))
-        {
-            fprintf(stderr, "no JAVA_HOME environment\n");
-        }
-        return 0;
-    }
-#if defined(_WIN32)
-    if (*jh == '"' && *(jh + strlen(jh) - 1) == '"')
-    {
-        char* p = ALLOCA_N(char, strlen(jh) + 1);
-        strcpy(p, jh + 1);
-        *(p + strlen(p) - 1) = '\0';
-        jh = p;
-    }
-#endif    
-    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
-    return open_jvm(libpath);
-}
-
-static int load_bridge(JNIEnv* jenv)
-{
-    JNINativeMethod nmethod[1];
-    jbyte buff[8192];
-    char* bridge;
-    size_t len;
-    FILE* f;
-#if defined(RUBINIUS)
-    VALUE v = rb_const_get(rb_cObject, rb_intern("RjbConf"));
-    v = rb_const_get(v, rb_intern("BRIDGE_FILE"));
-#else
-    VALUE v = rb_const_get_at(rb_const_get(rb_cObject, rb_intern("RjbConf")), 
-			      rb_intern("BRIDGE_FILE"));
-#endif
-    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);
-    rjb_rbridge = (*jenv)->DefineClass(jenv,
-            "jp/co/infoseek/hp/arton/rjb/RBridge", get_systemloader(jenv), buff, len);
-    if (rjb_rbridge == NULL)
-    {
-	rjb_check_exception(jenv, 1);
-    }
-    rjb_register_bridge = (*jenv)->GetMethodID(jenv, rjb_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, rjb_rbridge, nmethod, 1);
-    rjb_rbridge = (*jenv)->NewGlobalRef(jenv, rjb_rbridge);
-    return 0;
-}
-
-void rjb_unload_vm()
-{
-    if (RTEST(jvmdll))
-    {
-        rb_funcall(jvmdll, rb_intern("close"), 0);
-        jvmdll = Qnil;
-    }
-}
-
-int rjb_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;
-    size_t len;
-    int result;
-    GETDEFAULTJAVAVMINITARGS initargs;
-    CREATEJAVAVM createjavavm;
-    JavaVMOption* options;
-    size_t optlen;
-    int i;
-    VALUE optval;
-
-    if (!RTEST(jvmdll))
-    {
-        char* libjvm = getenv("JVM_LIB");
-#if defined(_WIN32)
-        if (libjvm && *libjvm == '"' && *(libjvm + strlen(libjvm) - 1) == '"')
-        {
-            char* p = ALLOCA_N(char, strlen(libjvm) + 1);
-            strcpy(p, libjvm + 1);
-            *(p + strlen(p) - 1) = '\0';
-            libjvm = p;
-        }
-#endif    
-        if (libjvm == NULL || !open_jvm(libjvm))
-        {
-#if defined(__APPLE__) && defined(__MACH__)
-            if (!(load_jvm(NULL)))
-            {
-                JVMDLL = "%s/Libraries/libjvm.dylib";
-                CREATEJVM = "JNI_CreateJavaVM_Impl";
-                GETDEFAULTJVMINITARGS = "JNI_GetDefaultJavaVMInitArgs_Impl";
-#endif
-	        if (!(load_jvm(JVM_TYPE) || load_jvm(ALT_JVM_TYPE)))
-                {
-                    return -1;
-                }
-#if defined(__APPLE__) && defined(__MACH__)
-            }
-#endif
-        }
- 
-#if RJB_RUBY_VERSION_CODE < 190 && !defined(RUBINIUS)
-        ruby_errinfo = Qnil;
-#else
-        rb_set_errinfo(Qnil);
-#endif
-    }
-
-    if (NIL_P(getdefaultjavavminitargsfunc))
-    {
-	return -1;
-    }
-    initargs = (GETDEFAULTJAVAVMINITARGS)NUM2ULONG(getdefaultjavavminitargsfunc);
-    result = initargs(vm_args);
-    if (0 > result)
-    {
-        return result;
-    }
-    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_LEN(argv);
-    }
-    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 = (int)optlen;
-    vm_args->options = options;
-    vm_args->ignoreUnrecognized = JNI_TRUE;
-    if (NIL_P(createjavavmfunc))
-    {
-	return -1;
-    }
-    createjavavm = (CREATEJAVAVM)NUM2ULONG(createjavavmfunc);
-    result = createjavavm(&rjb_jvm, pjenv, vm_args);
-    if (!result)
-    {
-	result = load_bridge(*pjenv);
-        if (RTEST(ruby_verbose) && result < 0)
-        {
-            fprintf(stderr, "failed to load the bridge class\n");
-        }
-    }
-    return result;
-}
+/*
+ * Rjb - Ruby <-> Java Bridge
+ * Copyright(c) 2004,2005,2006,2009,2010,2011 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 180 2011-12-05 16:34:29Z arton $
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include "ruby.h"
+#include "extconf.h"
+#if RJB_RUBY_VERSION_CODE < 190
+#include "intern.h"
+#include "st.h"
+#include "util.h"
+#else
+#include "ruby/intern.h"
+#include "ruby/st.h"
+#include "ruby/util.h"
+#endif
+#include "jniwrap.h"
+#include "jp_co_infoseek_hp_arton_rjb_RBridge.h"
+#include "rjb.h"
+
+#define JVM_TYPE "client"
+#define ALT_JVM_TYPE "classic"
+
+#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 '\\'
+  #if defined(_WIN64)
+    #undef JVM_TYPE
+    #define JVM_TYPE "server"
+  #endif
+ #endif
+ #define CLASSPATH_SEP  ';'
+#elif defined(__APPLE__) && defined(__MACH__)
+  static char* JVMDLL = "%s/JavaVM";
+  #define DIRSEPARATOR '/'
+  #define CLASSPATH_SEP ':'
+  #define HOME_NAME "/Home"
+  #define HOME_NAME_LEN strlen(HOME_NAME)
+  #define DEFAULT_HOME "/System/Library/Frameworks/JavaVM.framework"
+#elif defined(_AIX)
+  #define ARCH "ppc"
+  #undef JVM_TYPE
+  #define JVM_TYPE "j9vm"
+#elif defined(__hpux)
+  #define JVMDLL "%s/jre/lib/%s/%s/libjvm.sl"
+  #define ARCH "PA_RISC"
+  #undef JVM_TYPE
+  #define JVM_TYPE "server"
+  #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(__amd64__)
+   #define ARCH "amd64"
+   #undef JVM_TYPE
+   #define JVM_TYPE "server"
+ #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
+
+#if defined(__APPLE__) && defined(__MACH__)
+ static char* CREATEJVM = "JNI_CreateJavaVM";
+ static char* GETDEFAULTJVMINITARGS = "JNI_GetDefaultJavaVMInitArgs";
+#else
+ #define CREATEJVM "JNI_CreateJavaVM"
+ #define GETDEFAULTJVMINITARGS "JNI_GetDefaultJavaVMInitArgs"
+#endif
+
+typedef int (JNICALL *GETDEFAULTJAVAVMINITARGS)(void*);
+typedef int (JNICALL *CREATEJAVAVM)(JavaVM**, JNIEnv**, void*);
+
+
+static VALUE jvmdll = Qnil;
+static VALUE getdefaultjavavminitargsfunc;
+static VALUE createjavavmfunc;
+
+static int open_jvm(char* libpath)
+{
+    int sstat;
+    VALUE* argv;
+
+    rb_require("dl");
+#if !defined(RUBINIUS)
+    if (!rb_const_defined_at(rb_cObject, rb_intern("DL")))
+    {
+	rb_raise(rb_eRuntimeError, "Constants DL is not defined.");
+	return 0;
+    }
+#endif
+    argv = ALLOCA_N(VALUE, 4);
+    *argv = rb_const_get(rb_cObject, rb_intern("DL"));
+    *(argv + 1) = rb_intern("dlopen");
+    *(argv + 2) = 1;
+    *(argv + 3) = rb_str_new2(libpath);
+    jvmdll = rb_protect(rjb_safe_funcall, (VALUE)argv, &sstat);
+    if (sstat)
+    {
+        return 0;
+    }
+    /* get function pointers of JNI */
+#if RJB_RUBY_VERSION_CODE < 190
+    getdefaultjavavminitargsfunc = rb_funcall(rb_funcall(rb_funcall(jvmdll, rb_intern("[]"), 2, rb_str_new2(GETDEFAULTJVMINITARGS), rb_str_new2("IP")), rb_intern("to_ptr"), 0), rb_intern("to_i"), 0); 
+    createjavavmfunc = rb_funcall(rb_funcall(rb_funcall(jvmdll, rb_intern("[]"), 2, rb_str_new2(CREATEJVM), rb_str_new2("IPPP")), rb_intern("to_ptr"), 0), rb_intern("to_i"), 0); 
+#else
+    getdefaultjavavminitargsfunc = rb_funcall(jvmdll, rb_intern("[]"), 1, rb_str_new2(GETDEFAULTJVMINITARGS));
+    createjavavmfunc = rb_funcall(jvmdll, rb_intern("[]"), 1, rb_str_new2(CREATEJVM));
+#endif
+    return 1;
+}
+
+#if defined(__APPLE__) && defined(__MACH__)
+static int file_exist(const char* dir, const char* file)
+{
+    VALUE path = rb_funcall(rb_cFile, rb_intern("join"), 2,
+                            rb_str_new2(dir), rb_str_new2(file));
+    VALUE ret = rb_funcall(rb_cFile, rb_intern("exist?"), 1, path);
+    return RTEST(ret);
+}
+#endif
+
+/*
+ * not completed, only valid under some circumstances.
+ */
+static int load_jvm(const char* jvmtype)
+{
+    char* libpath;
+    char* java_home;
+    char* jh;
+
+    jh = getenv("JAVA_HOME");
+#if defined(__APPLE__) && defined(__MACH__)
+    if (!jh)
+    {
+        jh = DEFAULT_HOME;
+    }
+    else
+    {
+        if (strlen(jh) > HOME_NAME_LEN)
+        {
+            size_t len = strlen(jh);
+            char* p = ALLOCA_N(char, len + 8);
+            jh = strcpy(p, jh);
+            if (*(jh + len - 1) == '/')
+            {
+                --len;
+                *(jh + len) = '\0';
+            }
+            if (strcasecmp(jh + len - HOME_NAME_LEN, HOME_NAME) == 0)
+            {
+                strcpy(p + len, "/..");
+            }
+        }
+        if (!jvmtype && !file_exist(jh, "JavaVM"))
+        {
+            jh = DEFAULT_HOME;
+        }
+    }
+#endif
+    if (!jh)
+    {
+        if (RTEST(ruby_verbose))
+        {
+            fprintf(stderr, "no JAVA_HOME environment\n");
+        }
+        return 0;
+    }
+#if defined(_WIN32)
+    if (*jh == '"' && *(jh + strlen(jh) - 1) == '"')
+    {
+        char* p = ALLOCA_N(char, strlen(jh) + 1);
+        strcpy(p, jh + 1);
+        *(p + strlen(p) - 1) = '\0';
+        jh = p;
+    }
+#endif    
+    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
+    return open_jvm(libpath);
+}
+
+static int load_bridge(JNIEnv* jenv)
+{
+    JNINativeMethod nmethod[1];
+    jbyte buff[8192];
+    char* bridge;
+    size_t len;
+    FILE* f;
+#if defined(RUBINIUS)
+    VALUE v = rb_const_get(rb_cObject, rb_intern("RjbConf"));
+    v = rb_const_get(v, rb_intern("BRIDGE_FILE"));
+#else
+    VALUE v = rb_const_get_at(rb_const_get(rb_cObject, rb_intern("RjbConf")), 
+			      rb_intern("BRIDGE_FILE"));
+#endif
+    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);
+    rjb_rbridge = (*jenv)->DefineClass(jenv,
+            "jp/co/infoseek/hp/arton/rjb/RBridge", get_systemloader(jenv), buff, len);
+    if (rjb_rbridge == NULL)
+    {
+	rjb_check_exception(jenv, 1);
+    }
+    rjb_register_bridge = (*jenv)->GetMethodID(jenv, rjb_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, rjb_rbridge, nmethod, 1);
+    rjb_rbridge = (*jenv)->NewGlobalRef(jenv, rjb_rbridge);
+    return 0;
+}
+
+void rjb_unload_vm()
+{
+    if (RTEST(jvmdll))
+    {
+        rb_funcall(jvmdll, rb_intern("close"), 0);
+        jvmdll = Qnil;
+    }
+}
+
+int rjb_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;
+    size_t len;
+    int result;
+    GETDEFAULTJAVAVMINITARGS initargs;
+    CREATEJAVAVM createjavavm;
+    JavaVMOption* options;
+    size_t optlen;
+    int i;
+    VALUE optval;
+
+    if (!RTEST(jvmdll))
+    {
+        char* libjvm = getenv("JVM_LIB");
+#if defined(_WIN32)
+        if (libjvm && *libjvm == '"' && *(libjvm + strlen(libjvm) - 1) == '"')
+        {
+            char* p = ALLOCA_N(char, strlen(libjvm) + 1);
+            strcpy(p, libjvm + 1);
+            *(p + strlen(p) - 1) = '\0';
+            libjvm = p;
+        }
+#endif    
+        if (libjvm == NULL || !open_jvm(libjvm))
+        {
+#if defined(__APPLE__) && defined(__MACH__)
+            if (!(load_jvm(NULL)))
+            {
+                JVMDLL = "%s/Libraries/libjvm.dylib";
+                CREATEJVM = "JNI_CreateJavaVM_Impl";
+                GETDEFAULTJVMINITARGS = "JNI_GetDefaultJavaVMInitArgs_Impl";
+#endif
+	        if (!(load_jvm(JVM_TYPE) || load_jvm(ALT_JVM_TYPE)))
+                {
+                    return -1;
+                }
+#if defined(__APPLE__) && defined(__MACH__)
+            }
+#endif
+        }
+ 
+#if RJB_RUBY_VERSION_CODE < 190 && !defined(RUBINIUS)
+        ruby_errinfo = Qnil;
+#else
+        rb_set_errinfo(Qnil);
+#endif
+    }
+
+    if (NIL_P(getdefaultjavavminitargsfunc))
+    {
+	return -1;
+    }
+    initargs = (GETDEFAULTJAVAVMINITARGS)NUM2ULONG(getdefaultjavavminitargsfunc);
+    result = initargs(vm_args);
+    if (0 > result)
+    {
+        return result;
+    }
+    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_LEN(argv);
+    }
+    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 = (int)optlen;
+    vm_args->options = options;
+    vm_args->ignoreUnrecognized = JNI_TRUE;
+    if (NIL_P(createjavavmfunc))
+    {
+	return -1;
+    }
+    createjavavm = (CREATEJAVAVM)NUM2ULONG(createjavavmfunc);
+    result = createjavavm(&rjb_jvm, pjenv, vm_args);
+    if (!result)
+    {
+	result = load_bridge(*pjenv);
+        if (RTEST(ruby_verbose) && result < 0)
+        {
+            fprintf(stderr, "failed to load the bridge class\n");
+        }
+    }
+    return result;
+}