Conflicts: persistence/mapper/src/main/scala/net/liftweb/mapper/Mapper.scala persistence/mapper/src/main/scala/net/liftweb/mapper/MetaMapper.scala persistence/mongodb/src/main/scala/net/liftweb/mongodb/Mongo.scala web/webkit/src/main/scala/net/liftweb/http/Wizard.scala
2.6: Deprecate xbind-related things in Mapper. This includes a bunch of field binding and form snippet helpers. New versions are added for doing similar things with CssSels instead. They don't map 1-to-1 because CSS selector transforms don't support namespaces, amongst other things. Transforms are combined using andThen in case they match the same element or match a parent element and something else needs to affect the child.
…nator Conflicts: core/util/src/main/scala/net/liftweb/util/TimeHelpers.scala persistence/mongodb-record/src/main/scala/net/liftweb/mongodb/record/MongoRecord.scala persistence/mongodb-record/src/test/scala/net/liftweb/mongodb/record/MongoTestKit.scala persistence/mongodb/src/main/scala/net/liftweb/mongodb/Mongo.scala persistence/mongodb/src/test/scala/net/liftweb/mongodb/MongoSpec.scala persistence/record/src/main/scala/net/liftweb/record/MetaRecord.scala project/Dependencies.scala web/webkit/src/main/scala/net/liftweb/http/CometActor.scala web/webkit/src/main/scala/net/liftweb/http/S.scala web/webkit/src/main/scala/net/liftweb/http/SHtml.scala
Move ConnectionIdentifier to util package. I also replaced the use of MongoIdentifier with ConnectionIdentifier. Then, I added RecordRules.fieldName that takes a ConnectionIdentifier as an argument. I had to add def connectionIdentifier to MetaRecord for this to work.
Issue #1498 - Mongo -> MongoClient Transition Deprecates old constructors that interact with Mongo and Lift's abstractions over it and adds versions that deal with MongoClient. Also deals with WriteConcern differences in MongoClient vs Mongo, and adds a couple of new convenience methods to MongoRecord.
Deprecated MongoAddress, MongoHostBase, MongoHost, MongoSet, and the MongoDB functions that take them as an argument. Deprecated the MongoDB functions that take Mongo as an argument and added ones that take MongoClient as an argument. Deprecated MongoRecord.save (no arguments). Added default argument of `true` to MongoRecord.save(safe: Boolean) function. Added MongoRecord.save(inst: BaseRecord) function that uses the WriteConcern configured in Mongo/MongoClient. Added saveBox(), updateBox(), and deleteBox_! functions to MongoRecord that all wrap the related functions in tryo and return a Box. Internally, MongoDB still uses Mongo, so no behavior will change unless MongoClient (or MongoOptions with a different WriteConcern) is used.