jmongo.rb in jmongo-1.1.0

- old
+ new

@@ -1,9 +1,9 @@
-# Copyright (C) 2010 Chuck Remes
+# Copyright (C) 2010 Chuck Remes, Guy Boertje
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
+# you may not use this file except in coSmpliance with the License.
 # You may obtain a copy of the License at
 #
 #     http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
@@ -15,21 +15,13 @@
 unless RUBY_PLATFORM =~ /java/
   error "This gem is only compatible with a java-based ruby environment like JRuby."
   exit 255
 end
 
+require 'timeout'
+require 'java'
+
 require 'require_all'
 require_rel 'jmongo/*.jar'
 
-# import all of the java packages we'll need into the JMongo namespace
-require 'jmongo/jmongo_jext'
-require_rel 'jmongo/*.rb'
+require_rel 'jmongo/**/*.rb'
 
-module Mongo
-  ASCENDING  =  1
-  DESCENDING = -1
-  GEO2D      = '2d'
-
-  module Constants
-    DEFAULT_BATCH_SIZE = 100
-  end
-end