Permalink
Browse files

RUBY-279 update to Java driver 2.6.5

  • Loading branch information...
1 parent 50ca353 commit d552d603a8728adb8c80e2c36bb5483a8a38d9a6 @banker banker committed Aug 10, 2011
View
@@ -22,12 +22,11 @@ namespace :build do
jar_dir = File.join(java_dir, 'jar')
jruby_jar = File.join(jar_dir, 'jruby.jar')
- mongo_jar = File.join(jar_dir, 'mongo-2.4.jar')
- bson_jar = File.join(jar_dir, 'bson-2.2.jar')
+ mongo_jar = File.join(jar_dir, 'mongo-2.6.5.jar')
src_base = File.join(java_dir, 'src')
- system("javac -Xlint:unchecked -classpath #{jruby_jar}:#{mongo_jar}:#{bson_jar} #{File.join(src_base, 'org', 'jbson', '*.java')}")
+ system("javac -Xlint:deprecation -Xlint:unchecked -classpath #{jruby_jar}:#{mongo_jar} #{File.join(src_base, 'org', 'jbson', '*.java')}")
system("cd #{src_base} && jar cf #{File.join(jar_dir, 'jbson.jar')} #{File.join('.', 'org', 'jbson', '*.class')}")
end
end
View
Binary file not shown.
@@ -297,14 +297,9 @@ private RubyArray ja2ra( byte[] b ) {
return result;
}
+ @Deprecated
public void gotBinaryArray( String name , byte[] b ) {
- RubyArray a = ja2ra( b );
-
- Object[] args = new Object[] { a, 2 };
-
- Object result = JavaEmbedUtils.invokeMethod(_runtime, _rbclsBinary, "new", args, Object.class);
-
- _put( name, (RubyObject)result );
+ /* Deprecated */
}
// TODO: fix abs stuff here. some kind of bad type issue
@@ -12,7 +12,7 @@
import org.bson.io.*;
import org.bson.types.*;
-public class RubyBSONDecoder extends BSONDecoder {
+public class RubyBSONDecoder extends BasicBSONDecoder {
protected void _binary( String name )
throws IOException {
View
@@ -56,7 +56,7 @@ def self.read_bson_document(io)
if RUBY_PLATFORM =~ /java/
jar_dir = File.join(File.dirname(__FILE__), '..', 'ext', 'java', 'jar')
- require File.join(jar_dir, 'mongo-2.4.jar')
+ require File.join(jar_dir, 'mongo-2.6.5.jar')
require File.join(jar_dir, 'jbson.jar')
require 'bson/bson_java'
module BSON

0 comments on commit d552d60

Please sign in to comment.