Merge branch 'master' into mapper

novus · Aug 25, 2010 · c4d507a · c4d507a
2 parents 99106e1 + 903acb1
commit c4d507a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 107 deletions.
diff --git a/casbah-core/src/main/scala/DeprecatedTypeAliases.scala b/casbah-core/src/main/scala/DeprecatedTypeAliases.scala
@@ -19,7 +19,7 @@
  * 
  */
 
-import com.novus.casbah.Imports._
+//import com.novus.casbah.Imports._
 
 /** 
  * BRIDGE CODE.
@@ -75,7 +75,7 @@ package com.novus.casbah {
     type MongoCursor = com.novus.casbah.MongoCursor
 
     @deprecated("The com.novus.casbah.mongodb package has been deprecated in favor of com.novus.casbah; please update your code accordingly.")
-    type MongoCursorWrapper[A <: DBObject] = com.novus.casbah.MongoCursorWrapper[A]
+    type MongoCursorWrapper[A <: com.mongodb.DBObject] = com.novus.casbah.MongoCursorWrapper[A]
 
     @deprecated("The com.novus.casbah.mongodb package has been deprecated in favor of com.novus.casbah; please update your code accordingly.")
     type MongoDB = com.novus.casbah.MongoDB
@@ -92,10 +92,10 @@ package com.novus.casbah {
     type MongoDBObjectBuilder = com.novus.casbah.commons.MongoDBObjectBuilder
 
     @deprecated("The com.novus.casbah.mongodb package has been deprecated in favor of com.novus.casbah; please update your code accordingly.")
-    type MongoTypedCollection[A <: DBObject] = com.novus.casbah.MongoTypedCollection[A]
+    type MongoTypedCollection[A <: com.mongodb.DBObject] = com.novus.casbah.MongoTypedCollection[A]
 
     @deprecated("The com.novus.casbah.mongodb package has been deprecated in favor of com.novus.casbah; please update your code accordingly.")
-    type MongoTypedCursor[A <: DBObject] = com.novus.casbah.MongoTypedCursor[A]
+    type MongoTypedCursor[A <: com.mongodb.DBObject] = com.novus.casbah.MongoTypedCursor[A]
   }
   package mongodb {
     package object conversions {

diff --git a/old_tests/ConversionSpec.scala b/old_tests/ConversionSpec.scala