Permalink
Browse files

Minor bugfixes/enhancements.

+ Updated reference to Configgy to have a Scala version attached; this was causing issues on some mixed-version users' systems.
+ Corrected massive stupidity from lack of testing on my part and disabled ScalaJDeserializers - in most cases these caused runtime ClassCastExceptions.  *SERIALIZERS* still in place - Deserializers were just plain a bad idea.
  • Loading branch information...
1 parent 42c48d3 commit 8fe206cbc37c01019a0c0319d80e37fe9569b2cf @bwmcadams bwmcadams committed Aug 1, 2010
View
@@ -0,0 +1,4 @@
+Minor bugfixes/enhancements.
+
++ Updated reference to Configgy to have a Scala version attached; this was causing issues on some mixed-version users' systems.
++ Corrected massive stupidity from lack of testing on my part and disabled ScalaJDeserializers - in most cases these caused runtime ClassCastExceptions. *SERIALIZERS* still in place - Deserializers were just plain a bad idea.
View
@@ -3,7 +3,7 @@
project.organization=com.novus
project.name=casbah
sbt.version=0.7.4
-project.version=1.0.6
+project.version=1.0.7
def.scala.version=2.7.7
build.scala.versions=2.8.0
project.initialize=false
@@ -5,7 +5,7 @@ class CasbahProject(info: ProjectInfo) extends DefaultProject(info) with rsync.R
val scalaTime = "org.scala-tools" % "time" % "2.8.0-0.2-SNAPSHOT"
- val configgy = "net.lag" % "configgy" % "1.5.2"
+ val configgy = "net.lag" % "configgy_2.8.0" % "1.5.2"
val scalatest = "org.scalatest" % "scalatest" % "1.2-for-scala-2.8.0.final-SNAPSHOT" % "test"
val scalajCollection = "org.scalaj" % "scalaj-collection_2.8.0" % "1.0"
@@ -82,8 +82,7 @@ object DeregisterConversionHelpers extends Serializers
* @version 1.0, 06/22/10
* @since 1.0
*/
-trait Deserializers extends MongoConversionHelper
- with ScalaJCollectionDeserializer {
+trait Deserializers extends MongoConversionHelper {
override def register() = {
log.info("Deserializers for Scala Conversions registering")
super.register()
@@ -262,16 +261,16 @@ trait ScalaJCollectionSerializer extends MongoConversionHelper {
}
}
-trait ScalaJCollectionDeserializer extends MongoConversionHelper {
+/*trait ScalaJCollectionDeserializer extends MongoConversionHelper {
private val transformer = new Transformer {
import scalaj.collection.Imports._
def transform(o: AnyRef): AnyRef = o match {
case l: java.util.List[_] => l.asScala
case s: java.util.Set[_] => s.asScala
- /*case m: java.util.Map[_, _] => m.asScala
- case d: java.util.Dictionary[_, _] => d.asScala*/
+ [>case m: java.util.Map[_, _] => m.asScala
+ case d: java.util.Dictionary[_, _] => d.asScala<]
case e: java.util.Enumeration[_] => e.asScala
case i: java.util.Iterator[_] => i.asScala
case i: java.lang.Iterable[_] => i.asScala
@@ -286,9 +285,9 @@ trait ScalaJCollectionDeserializer extends MongoConversionHelper {
BSON.addDecodingHook(classOf[java.lang.Iterable[_]], transformer)
BSON.addDecodingHook(classOf[java.util.List[_]], transformer)
BSON.addDecodingHook(classOf[java.util.Set[_]], transformer)
- /*BSON.addDecodingHook(classOf[java.util.Map[_, _]], transformer)
- BSON.addDecodingHook(classOf[java.util.Dictionary[_, _]], transformer)*/
+ [>BSON.addDecodingHook(classOf[java.util.Map[_, _]], transformer)
+ BSON.addDecodingHook(classOf[java.util.Dictionary[_, _]], transformer)<]
super.register()
}
-}
+}*/
// vim: set ts=2 sw=2 sts=2 et:

0 comments on commit 8fe206c

Please sign in to comment.