Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #1292 from lift/diego_issue_1292

change all deprecated messages to be 2.9.x compatible
  • Loading branch information...
commit 517a9bc014421e593efe08ca7bae269557a85cbe 2 parents 001d956 + c82e783
David Pollak dpp authored
Showing with 125 additions and 154 deletions.
  1. +6 −12 core/common/src/main/scala/net/liftweb/common/Box.scala
  2. +1 −1  core/common/src/main/scala/net/liftweb/common/HList.scala
  3. +1 −1  core/common/src/main/scala/net/liftweb/common/ParseDouble.scala
  4. +4 −8 core/json/benchmark/Serbench.scala
  5. +3 −3 core/json/src/main/scala/net/liftweb/json/Formats.scala
  6. +1 −1  core/json/src/main/scala/net/liftweb/json/JsonAST.scala
  7. +1 −1  core/json/src/main/scala/net/liftweb/json/JsonParser.scala
  8. +1 −1  core/json/src/main/scala/net/liftweb/json/Meta.scala
  9. +6 −6 core/util/src/main/scala/net/liftweb/util/BindHelpers.scala
  10. +6 −3 core/util/src/main/scala/net/liftweb/util/ClassHelpers.scala
  11. +1 −1  core/util/src/main/scala/net/liftweb/util/StringHelpers.scala
  12. +1 −1  core/util/src/main/scala/net/liftweb/util/TimeHelpers.scala
  13. +1 −1  core/util/src/main/scala/net/liftweb/util/ValueHolder.scala
  14. +1 −1  core/util/src/main/scala/net/liftweb/util/package.scala
  15. +2 −2 persistence/db/src/main/scala/net/liftweb/db/DB.scala
  16. +2 −3 persistence/mapper/src/main/scala/net/liftweb/mapper/MappedField.scala
  17. +3 −3 persistence/mapper/src/main/scala/net/liftweb/mapper/MappedForeignKey.scala
  18. +1 −1  persistence/mapper/src/main/scala/net/liftweb/mapper/MappedString.scala
  19. +2 −2 persistence/mapper/src/main/scala/net/liftweb/mapper/MappedUniqueId.scala
  20. +1 −2  persistence/mapper/src/main/scala/net/liftweb/mapper/Mapper.scala
  21. +6 −6 persistence/mapper/src/main/scala/net/liftweb/mapper/ProtoUser.scala
  22. +1 −1  persistence/mapper/src/main/scala/net/liftweb/mapper/package.scala
  23. +1 −1  persistence/mongodb/src/main/scala/net/liftweb/mongodb/JObjectParser.scala
  24. +3 −3 persistence/mongodb/src/main/scala/net/liftweb/mongodb/Meta.scala
  25. +1 −1  persistence/mongodb/src/main/scala/net/liftweb/mongodb/Mongo.scala
  26. +6 −6 persistence/record/src/main/scala/net/liftweb/record/ProtoUser.scala
  27. +1 −1  persistence/record/src/main/scala/net/liftweb/record/RecordHelpers.scala
  28. +1 −1  persistence/squeryl-record/src/main/scala/net/liftweb/squerylrecord/SquerylRecord.scala
  29. +4 −4 web/testkit/src/main/scala/net/liftweb/mocks/MockHttpServletRequest.scala
  30. +1 −1  web/webkit/src/main/scala/net/liftweb/builtin/snippet/A.scala
  31. +1 −2  web/webkit/src/main/scala/net/liftweb/builtin/snippet/Msgs.scala
  32. +5 −7 web/webkit/src/main/scala/net/liftweb/http/CometActor.scala
  33. +1 −1  web/webkit/src/main/scala/net/liftweb/http/LiftResponse.scala
  34. +11 −11 web/webkit/src/main/scala/net/liftweb/http/LiftRules.scala
  35. +1 −1  web/webkit/src/main/scala/net/liftweb/http/LiftScreen.scala
  36. +1 −1  web/webkit/src/main/scala/net/liftweb/http/LiftSession.scala
  37. +2 −2 web/webkit/src/main/scala/net/liftweb/http/Paginator.scala
  38. +3 −6 web/webkit/src/main/scala/net/liftweb/http/Req.scala
  39. +1 −8 web/webkit/src/main/scala/net/liftweb/http/RequestType.scala
  40. +16 −22 web/webkit/src/main/scala/net/liftweb/http/S.scala
  41. +2 −2 web/webkit/src/main/scala/net/liftweb/http/SHtml.scala
  42. +2 −2 web/webkit/src/main/scala/net/liftweb/http/Templates.scala
  43. +1 −1  web/webkit/src/main/scala/net/liftweb/http/jquery/JqSHtml.scala
  44. +2 −2 web/webkit/src/main/scala/net/liftweb/http/js/JsCommands.scala
  45. +3 −3 web/webkit/src/main/scala/net/liftweb/http/js/jquery/JqJsCmds.scala
  46. +1 −1  web/webkit/src/main/scala/net/liftweb/http/package.scala
  47. +1 −1  web/webkit/src/main/scala/net/liftweb/http/provider/servlet/HTTPResponseServlet.scala
  48. +0 −1  web/webkit/src/main/scala/net/liftweb/http/provider/servlet/HTTPServletSession.scala
  49. +1 −1  web/webkit/src/main/scala/net/liftweb/http/rest/RestContinuation.scala
18 core/common/src/main/scala/net/liftweb/common/Box.scala
View
@@ -106,7 +106,7 @@ sealed trait BoxTrait {
*
* @return <code>Full(in)</code> if <code>in</code> is not null; Empty otherwise
*/
- @deprecated("Use legacyNullTest")
+ @deprecated("Use legacyNullTest", "2.5")
def apply[T](in: T): Box[T] = legacyNullTest(in)
/**
@@ -192,8 +192,7 @@ sealed trait BoxTrait {
* <li> you can "pass" a Box to a function for side effects: <code>Full(1) $ { x: Box[Int] => println(x openOr 0) }</code></li>
* </ul>
*/
-@serializable
-sealed abstract class Box[+A] extends Product {
+sealed abstract class Box[+A] extends Product with Serializable{
self =>
/**
* Returns true if this Box contains no value (is Empty or Failure or ParamFailure)
@@ -472,8 +471,7 @@ sealed abstract class Box[+A] extends Product {
/**
* Full is a Box containing a value.
*/
-@serializable
-final case class Full[+A](value: A) extends Box[A] {
+final case class Full[+A](value: A) extends Box[A]{
def isEmpty: Boolean = false
@@ -551,14 +549,12 @@ final case class Full[+A](value: A) extends Box[A] {
/**
* Singleton object representing an Empty Box
*/
-@serializable
case object Empty extends EmptyBox
/**
* The EmptyBox is a Box containing no value.
*/
-@serializable
-sealed abstract class EmptyBox extends Box[Nothing] {
+sealed abstract class EmptyBox extends Box[Nothing] with Serializable {
def isEmpty: Boolean = true
@@ -600,8 +596,7 @@ object Failure {
* A Failure is an EmptyBox with an additional failure message explaining the reason for its being empty.
* It can also optionally provide an exception or a chain of causes represented as a list of other Failure objects
*/
-@serializable
-sealed case class Failure(msg: String, exception: Box[Throwable], chain: Box[Failure]) extends EmptyBox {
+sealed case class Failure(msg: String, exception: Box[Throwable], chain: Box[Failure]) extends EmptyBox{
type A = Nothing
/**
@@ -683,11 +678,10 @@ sealed case class Failure(msg: String, exception: Box[Throwable], chain: Box[Fai
* A ParamFailure is a Failure with an additional typesafe parameter that can
* allow an application to store other information related to the failure.
*/
-@serializable
final class ParamFailure[T](override val msg: String,
override val exception: Box[Throwable],
override val chain: Box[Failure], val param: T) extends
- Failure(msg, exception, chain) {
+ Failure(msg, exception, chain) with Serializable{
override def toString(): String = "ParamFailure("+msg+", "+exception+
", "+chain+", "+param+")"
2  core/common/src/main/scala/net/liftweb/common/HList.scala
View
@@ -101,7 +101,7 @@ sealed trait ExcludeThisType[A, B]
* that a type is not a subtype of another type
*/
object ExcludeThisType {
- def unexpected: Nothing = error("Unexpected invocation")
+ def unexpected: Nothing = sys.error("Unexpected invocation")
// Uses ambiguity to rule out the cases we're trying to exclude
implicit def nsub[A, B]: A ExcludeThisType B = null
2  core/common/src/main/scala/net/liftweb/common/ParseDouble.scala
View
@@ -27,7 +27,7 @@ package common
*
* @see http://blogs.oracle.com/security/entry/security_alert_for_cve-2010-44
*/
-@deprecated("Use a newer or patched JVM instead.")
+@deprecated("Use a newer or patched JVM instead.", "2.5")
object ParseDouble {
private val BrokenDouble = BigDecimal("2.2250738585072012e-308")
12 core/json/benchmark/Serbench.scala
View
@@ -41,12 +41,8 @@ object Serbench extends Benchmark {
}
}
- @serializable
- case class Project(name: String, startDate: Date, lang: Option[Language], teams: List[Team])
- @serializable
- case class Language(name: String, version: Double)
- @serializable
- case class Team(role: String, members: List[Employee])
- @serializable
- case class Employee(name: String, experience: Int)
+ case class Project(name: String, startDate: Date, lang: Option[Language], teams: List[Team]) extends Serializable
+ case class Language(name: String, version: Double) extends Serializable
+ case class Team(role: String, members: List[Employee]) extends Serializable
+ case class Employee(name: String, experience: Int) extends Serializable
}
6 core/json/src/main/scala/net/liftweb/json/Formats.scala
View
@@ -166,7 +166,7 @@ trait TypeHints {
* Chooses most specific class.
*/
def hintFor(clazz: Class[_]): String = components.filter(_.containsHint_?(clazz))
- .map(th => (th.hintFor(clazz), th.classFor(th.hintFor(clazz)).getOrElse(error("hintFor/classFor not invertible for " + th))))
+ .map(th => (th.hintFor(clazz), th.classFor(th.hintFor(clazz)).getOrElse(sys.error("hintFor/classFor not invertible for " + th))))
.sort((x, y) => (delta(x._2, clazz) - delta(y._2, clazz)) < 0).head._1
def classFor(hint: String): Option[Class[_]] = {
@@ -197,7 +197,7 @@ private[json] object ClassDelta {
else if (class2.isAssignableFrom(class1)) {
1 + delta(class1.getSuperclass, class2)
}
- else error("Don't call delta unless one class is assignable from the other")
+ else sys.error("Don't call delta unless one class is assignable from the other")
}
}
@@ -205,7 +205,7 @@ private[json] object ClassDelta {
*/
case object NoTypeHints extends TypeHints {
val hints = Nil
- def hintFor(clazz: Class[_]) = error("NoTypeHints does not provide any type hints.")
+ def hintFor(clazz: Class[_]) = sys.error("NoTypeHints does not provide any type hints.")
def classFor(hint: String) = None
}
2  core/json/src/main/scala/net/liftweb/json/JsonAST.scala
View
@@ -396,7 +396,7 @@ object JsonAST {
case JDouble(n) => text(n.toString)
case JInt(n) => text(n.toString)
case JNull => text("null")
- case JNothing => error("can't render 'nothing'")
+ case JNothing => sys.error("can't render 'nothing'")
case JString(null) => text("null")
case JString(s) => text("\"" + quote(s) + "\"")
case JArray(arr) => text("[") :: series(trimArr(arr).map(render)) :: text("]")
2  core/json/src/main/scala/net/liftweb/json/JsonParser.scala
View
@@ -134,7 +134,7 @@ object JsonParser {
private val BrokenDouble = BigDecimal("2.2250738585072012e-308")
private[json] def parseDouble(s: String) = {
val d = BigDecimal(s)
- if (d == BrokenDouble) error("Error parsing 2.2250738585072012e-308")
+ if (d == BrokenDouble) sys.error("Error parsing 2.2250738585072012e-308")
else d.doubleValue
}
2  core/json/src/main/scala/net/liftweb/json/Meta.scala
View
@@ -394,7 +394,7 @@ private[json] object Meta {
case x: java.lang.Short => JInt(BigInt(x.asInstanceOf[Short]))
case x: Date => JString(formats.dateFormat.format(x))
case x: Symbol => JString(x.name)
- case _ => error("not a primitive " + a.asInstanceOf[AnyRef].getClass)
+ case _ => sys.error("not a primitive " + a.asInstanceOf[AnyRef].getClass)
}
}
}
12 core/util/src/main/scala/net/liftweb/util/BindHelpers.scala
View
@@ -708,7 +708,7 @@ trait BindHelpers {
/**
* transforms a Box into a Text node
*/
- @deprecated("use -> instead")
+ @deprecated("use -> instead", "2.4")
object BindParamAssoc {
implicit def canStrBoxNodeSeq(in: Box[Any]): Box[NodeSeq] = in.map(_ match {
case null => Text("null")
@@ -789,7 +789,7 @@ trait BindHelpers {
*
* @deprecated use -> instead
*/
- @deprecated("use -> instead")
+ @deprecated("use -> instead", "2.4")
class BindParamAssoc(val name: String) {
def -->(value: String): BindParam = TheBindParam(name, if (null eq value) NodeSeq.Empty else Text(value))
def -->(value: NodeSeq): BindParam = TheBindParam(name, value)
@@ -812,7 +812,7 @@ trait BindHelpers {
*
* @deprecated use -> instead
*/
- @deprecated("use -> instead")
+ @deprecated("use -> instead", "2.4")
implicit def strToBPAssoc(in: String): BindParamAssoc = new BindParamAssoc(in)
/**
@@ -822,7 +822,7 @@ trait BindHelpers {
*
* @deprecated use -> instead
*/
- @deprecated("use -> instead")
+ @deprecated("use -> instead", "2.4")
implicit def symToSAAssoc(in: Symbol): SuperArrowAssoc = new SuperArrowAssoc(in.name)
/**
@@ -831,7 +831,7 @@ trait BindHelpers {
*
* @deprecated use bind instead
*/
- @deprecated("use bind instead")
+ @deprecated("use bind instead", "2.4")
def xbind(namespace: String, xml: NodeSeq)(transform: PartialFunction[String, NodeSeq => NodeSeq]): NodeSeq = {
def rec_xbind(xml: NodeSeq): NodeSeq = {
xml.flatMap {
@@ -1133,7 +1133,7 @@ trait BindHelpers {
* @param atWhat data to bind
* @deprecated use the bind function instead
*/
- @deprecated("use the bind function instead")
+ @deprecated("use the bind function instead", "2.3")
def processBind(around: NodeSeq, atWhat: Map[String, NodeSeq]): NodeSeq = {
/** Find element matched predicate f(x).isDefined, and return f(x) if found or None otherwise. */
9 core/util/src/main/scala/net/liftweb/util/ClassHelpers.scala
View
@@ -151,9 +151,12 @@ trait ClassHelpers { self: ControlHelpers =>
def findClass(where: List[(String, List[String])]): Box[Class[AnyRef]] =
findType[AnyRef](where)
- @deprecated("Use StringHelpers.camelify") def camelCase(name : String): String = StringHelpers.camelify(name)
- @deprecated("Use StringHelpers.camelifyMethod") def camelCaseMethod(name: String): String = StringHelpers.camelifyMethod(name)
- @deprecated("Use StringHelpers.snakify") def unCamelCase(name : String) = StringHelpers.snakify(name)
+ @deprecated("Use StringHelpers.camelify", "2.3")
+ def camelCase(name : String): String = StringHelpers.camelify(name)
+ @deprecated("Use StringHelpers.camelifyMethod", "2.3")
+ def camelCaseMethod(name: String): String = StringHelpers.camelifyMethod(name)
+ @deprecated("Use StringHelpers.snakify", "2.3")
+ def unCamelCase(name : String) = StringHelpers.snakify(name)
/**
* @return true if the method is public and has no parameters
2  core/util/src/main/scala/net/liftweb/util/StringHelpers.scala
View
@@ -364,7 +364,7 @@ trait StringHelpers {
/** @return a SuperString with more available methods such as roboSplit or commafy */
implicit def listStringToSuper(in: List[String]): SuperListString = new SuperListString(in)
- @deprecated("Use blankForNull instead")
+ @deprecated("Use blankForNull instead", "2.3")
def emptyForNull(s: String) = blankForNull(s)
/**
2  core/util/src/main/scala/net/liftweb/util/TimeHelpers.scala
View
@@ -295,9 +295,9 @@ trait TimeHelpers { self: ControlHelpers =>
def currentYear: Int = Calendar.getInstance.get(Calendar.YEAR)
/**
- * @deprecated use now instead
* @return the current time as a Date object
*/
+ @deprecated("use now instead", "2.4")
def timeNow = new Date
/**
2  core/util/src/main/scala/net/liftweb/util/ValueHolder.scala
View
@@ -25,7 +25,7 @@ trait ValueHolder {
*
* @deprecated
*/
- @deprecated("Use get")
+ @deprecated("Use get", "2.4")
def is: ValueType
/**
2  core/util/src/main/scala/net/liftweb/util/package.scala
View
@@ -26,6 +26,6 @@ package object util {
/**
* Changed the name ActorPing to Schedule
*/
- @deprecated("Use Schedule")
+ @deprecated("Use Schedule", "2.3")
val ActorPing = Schedule
}
4 persistence/db/src/main/scala/net/liftweb/db/DB.scala
View
@@ -147,7 +147,7 @@ trait DB extends Loggable {
* perform this function after transaction has ended. This is helpful for sending messages to Actors after we know
* a transaction has been either committed or rolled back
*/
- @deprecated("Use appendPostTransaction {committed => ...}")
+ @deprecated("Use appendPostTransaction {committed => ...}", "2.4")
def performPostCommit(f: => Unit) {
postCommit = (() => f) :: postCommit
}
@@ -328,7 +328,7 @@ trait DB extends Loggable {
/**
* Append a function to be invoked after the transaction has ended for the given connection identifier
*/
- @deprecated("Use appendPostTransaction (name, {committed => ...})")
+ @deprecated("Use appendPostTransaction (name, {committed => ...})", "2.4")
def appendPostFunc(name: ConnectionIdentifier, func: () => Unit) {
appendPostTransaction(name, dontUse => func())
}
5 persistence/mapper/src/main/scala/net/liftweb/mapper/MappedField.scala
View
@@ -66,8 +66,7 @@ trait MixableMappedField extends BaseField {
* The base (not Typed) trait that defines a field that is mapped to a column or more than 1 column
* (e.g., MappedPassword) in the database
*/
-@serializable
-trait BaseMappedField extends SelectableField with Bindable with MixableMappedField {
+trait BaseMappedField extends SelectableField with Bindable with MixableMappedField with Serializable{
def dbDisplay_? = true
@@ -695,7 +694,7 @@ trait MappedField[FieldType <: Any,OwnerType <: Mapper[OwnerType]] extends Typed
}
object MappedField {
- @deprecated("Automatic conversion to the field's type is not safe and will be removed. Please use field.get instead")
+ @deprecated("Automatic conversion to the field's type is not safe and will be removed. Please use field.get instead", "2.5")
implicit def mapToType[T, A<:Mapper[A]](in : MappedField[T, A]): T = in.is
}
6 persistence/mapper/src/main/scala/net/liftweb/mapper/MappedForeignKey.scala
View
@@ -210,12 +210,12 @@ with LifecycleCallbacks {
}
-@deprecated("Functionality folded into MappedForeignKey, so just use MappedLongForeignKey. Will be removed in 2.5")
+@deprecated("Functionality folded into MappedForeignKey, so just use MappedLongForeignKey. Will be removed in 2.5", "2.4")
class LongMappedMapper[T<:Mapper[T], O<:KeyedMapper[Long,O]](theOwner: T, foreign: => KeyedMetaMapper[Long, O])
extends MappedLongForeignKey[T,O](theOwner, foreign)
-@deprecated("Functionality folded into MappedForeignKey, so just use MappedLongForeignKey. Will be removed in 2.5")
+@deprecated("Functionality folded into MappedForeignKey, so just use MappedLongForeignKey. Will be removed in 2.5", "2.4")
trait LongMappedForeignMapper[T<:Mapper[T],O<:KeyedMapper[Long,O]]
extends MappedLongForeignKey[T,O]
@@ -226,7 +226,7 @@ extends MappedLong[T](theOwner) with MappedForeignKey[Long,T,O] with BaseForeign
def foreignMeta = _foreignMeta
- @deprecated("Use 'box' instead")
+ @deprecated("Use 'box' instead", "2.4")
def can: Box[Long] = if (defined_?) Full(is) else Empty
def box: Box[Long] = if (defined_?) Full(is) else Empty
2  persistence/mapper/src/main/scala/net/liftweb/mapper/MappedString.scala
View
@@ -52,7 +52,7 @@ trait ValidateLength extends MixableMappedField {
}
trait HasApplyBoxString[T] {
- @deprecated("Just use apply(x openOr null). Will be removed in 2.5.")
+ @deprecated("Just use apply(x openOr null). Will be removed in 2.5.", "2.4")
def apply(ov: Box[String])(implicit disambiguateFromApplyBoxedForeign: BoxedStringToken): T = apply(ov openOr null)
def apply(x: String): T
}
4 persistence/mapper/src/main/scala/net/liftweb/mapper/MappedUniqueId.scala
View
@@ -35,10 +35,10 @@ abstract class MappedUniqueId[T<:Mapper[T]](override val fieldOwner: T, override
* A field that holds the birth year for the user
*/
abstract class MappedBirthYear[T <: Mapper[T]](owner: T, minAge: Int) extends MappedInt[T](owner) {
- override def defaultValue = year(timeNow) - minAge
+ override def defaultValue = year(now) - minAge
override def _toForm: Box[NodeSeq] = {
- val end = (year(timeNow) - minAge)
+ val end = (year(now) - minAge)
val start = end - 100
Full(SHtml.selectObj((start to end).
toList.
3  persistence/mapper/src/main/scala/net/liftweb/mapper/Mapper.scala
View
@@ -32,8 +32,7 @@ trait BaseMapper extends FieldContainer {
def save: Boolean
}
-@serializable
-trait Mapper[A<:Mapper[A]] extends BaseMapper {
+trait Mapper[A<:Mapper[A]] extends BaseMapper with Serializable{
self: A =>
type MapperType = A
12 persistence/mapper/src/main/scala/net/liftweb/mapper/ProtoUser.scala
View
@@ -78,7 +78,7 @@ trait ProtoUser[T <: ProtoUser[T]] extends KeyedMapper[Long, T] with UserIdAsStr
/**
* The string name for the first name field
*/
- def firstNameDisplayName = ??("first.name")
+ def firstNameDisplayName = S.?("first.name")
/**
* The last field for the User. You can override the behavior
@@ -99,7 +99,7 @@ trait ProtoUser[T <: ProtoUser[T]] extends KeyedMapper[Long, T] with UserIdAsStr
/**
* The last name string
*/
- def lastNameDisplayName = ??("last.name")
+ def lastNameDisplayName = S.?("last.name")
/**
* The email field for the User. You can override the behavior
@@ -122,7 +122,7 @@ trait ProtoUser[T <: ProtoUser[T]] extends KeyedMapper[Long, T] with UserIdAsStr
/**
* The email first name
*/
- def emailDisplayName = ??("email.address")
+ def emailDisplayName = S.?("email.address")
/**
* The password field for the User. You can override the behavior
@@ -142,7 +142,7 @@ trait ProtoUser[T <: ProtoUser[T]] extends KeyedMapper[Long, T] with UserIdAsStr
/**
* The display name for the password field
*/
- def passwordDisplayName = ??("password")
+ def passwordDisplayName = S.?("password")
/**
* The superuser field for the User. You can override the behavior
@@ -422,12 +422,12 @@ trait MegaProtoUser[T <: MegaProtoUser[T]] extends ProtoUser[T] {
/**
* The string for the timezone field
*/
- def timezoneDisplayName = ??("time.zone")
+ def timezoneDisplayName = S.?("time.zone")
/**
* The string for the locale field
*/
- def localeDisplayName = ??("locale")
+ def localeDisplayName = S.?("locale")
}
2  persistence/mapper/src/main/scala/net/liftweb/mapper/package.scala
View
@@ -27,6 +27,6 @@ package object mapper {
def DefaultConnectionIdentifier = db.DefaultConnectionIdentifier
def DriverType = db.DriverType
- @deprecated("Use util.Safe instead.")
+ @deprecated("Use util.Safe instead.", "2.4")
def Safe = util.Safe
}
2  persistence/mongodb/src/main/scala/net/liftweb/mongodb/JObjectParser.scala
View
@@ -124,7 +124,7 @@ object JObjectParser extends SimpleInjector {
case JInt(n) => renderInteger(n)
case JDouble(n) => new java.lang.Double(n)
case JNull => null
- case JNothing => error("can't render 'nothing'")
+ case JNothing => sys.error("can't render 'nothing'")
case JString(null) => "null"
case JString(s) => stringProcessor.vend(s)
case _ => ""
6 persistence/mongodb/src/main/scala/net/liftweb/mongodb/Meta.scala
View
@@ -65,7 +65,7 @@ private[mongodb] object Meta {
case x: java.lang.Byte => JInt(BigInt(x.asInstanceOf[Byte]))
case x: java.lang.Boolean => JBool(x.asInstanceOf[Boolean])
case x: java.lang.Short => JInt(BigInt(x.asInstanceOf[Short]))
- case _ => error("not a primitive " + a.asInstanceOf[AnyRef].getClass)
+ case _ => sys.error("not a primitive " + a.asInstanceOf[AnyRef].getClass)
}
/*
@@ -100,8 +100,8 @@ private[mongodb] object Meta {
case x: ObjectId => objectIdAsJValue(x, formats)
case x: Pattern => patternAsJValue(x)
case x: UUID => uuidAsJValue(x)
- case x: DBRef => error("DBRefs are not supported.")
- case _ => error("not a mongotype " + a.asInstanceOf[AnyRef].getClass)
+ case x: DBRef => sys.error("DBRefs are not supported.")
+ case _ => sys.error("not a mongotype " + a.asInstanceOf[AnyRef].getClass)
}
}
2  persistence/mongodb/src/main/scala/net/liftweb/mongodb/Mongo.scala
View
@@ -68,7 +68,7 @@ object MongoHost {
/*
* Wrapper for creating a Replica Pair
*/
-@deprecated("Use `MongoSet` with `List[ServerAddress]` as argument instead")
+@deprecated("Use `MongoSet` with `List[ServerAddress]` as argument instead", "2.5")
case class MongoPair(left: ServerAddress, right: ServerAddress, options: MongoOptions = new MongoOptions) extends MongoHostBase {
lazy val mongo = new Mongo(left, right, options)
}
12 persistence/record/src/main/scala/net/liftweb/record/ProtoUser.scala
View
@@ -77,7 +77,7 @@ trait ProtoUser[T <: ProtoUser[T]] extends Record[T] {
/**
* The string name for the first name field
*/
- def firstNameDisplayName = ??("first.name")
+ def firstNameDisplayName = S.?("first.name")
/**
* The last field for the User. You can override the behavior
@@ -98,7 +98,7 @@ trait ProtoUser[T <: ProtoUser[T]] extends Record[T] {
/**
* The last name string
*/
- def lastNameDisplayName = ??("last.name")
+ def lastNameDisplayName = S.?("last.name")
/**
* The email field for the User. You can override the behavior
@@ -122,7 +122,7 @@ trait ProtoUser[T <: ProtoUser[T]] extends Record[T] {
/**
* The email first name
*/
- def emailDisplayName = ??("email.address")
+ def emailDisplayName = S.?("email.address")
/**
* The password field for the User. You can override the behavior
@@ -142,7 +142,7 @@ trait ProtoUser[T <: ProtoUser[T]] extends Record[T] {
/**
* The display name for the password field
*/
- def passwordDisplayName = ??("password")
+ def passwordDisplayName = S.?("password")
/**
* The superuser field for the User. You can override the behavior
@@ -419,12 +419,12 @@ trait MegaProtoUser[T <: MegaProtoUser[T]] extends ProtoUser[T] {
/**
* The string for the timezone field
*/
- def timezoneDisplayName = ??("time.zone")
+ def timezoneDisplayName = S.?("time.zone")
/**
* The string for the locale field
*/
- def localeDisplayName = ??("locale")
+ def localeDisplayName = S.?("locale")
}
2  persistence/record/src/main/scala/net/liftweb/record/RecordHelpers.scala
View
@@ -29,7 +29,7 @@ object RecordHelpers {
case JArray(vs) => JsArray(vs.map(jvalueToJsExp): _*)
case JBool(b) => if (b) JsTrue else JsFalse
case JDouble(d) => Num(d)
- case JField(n,v) => error("no parallel")
+ case JField(n,v) => sys.error("no parallel")
case JInt(i) => Num(i)
case JNothing => JsNull
case JNull => JsNull
2  persistence/squeryl-record/src/main/scala/net/liftweb/squerylrecord/SquerylRecord.scala
View
@@ -63,7 +63,7 @@ object SquerylRecord extends Loggable {
* */
private object currentSession extends DynoVar[Session]
- @deprecated(message = "Lift DB.use style transactions do not properly clean up Squeryl resources. Please use initWithSquerylSession instead.")
+ @deprecated(message = "Lift DB.use style transactions do not properly clean up Squeryl resources. Please use initWithSquerylSession instead.", "2.5")
def init(mkAdapter: () => DatabaseAdapter) = {
FieldMetaData.factory = new RecordMetaDataFactory
SessionFactory.externalTransactionManagementAdapter = Some(() =>
8 web/testkit/src/main/scala/net/liftweb/mocks/MockHttpServletRequest.scala
View
@@ -59,10 +59,10 @@ import json.JsonAST._
*
*/
class MockHttpServletRequest(val url : String = null, var contextPath : String = "") extends HttpServletRequest {
- @deprecated("Use the \"attributes\" var instead")
+ @deprecated("Use the \"attributes\" var instead", "2.4")
def attr = attributes
- @deprecated("Use the \"attributes\" var instead")
+ @deprecated("Use the \"attributes\" var instead", "2.4")
def attr_= (attrs : Map[String,Object]) = attributes = attrs
var attributes: Map[String, Object] = Map()
@@ -183,10 +183,10 @@ class MockHttpServletRequest(val url : String = null, var contextPath : String =
*/
var parameters : List[(String,String)] = Nil
- @deprecated("Use the \"parameters\" var instead")
+ @deprecated("Use the \"parameters\" var instead", "2.4")
def parameterMap = Map(parameters : _*)
- @deprecated("Use the \"parameters\" var instead")
+ @deprecated("Use the \"parameters\" var instead", "2.4")
def parameterMap_= (params : Map[String, List[String]]) {
parameters = params.toList.flatMap {
case (key,values) => values.map{(key,_)}
2  web/webkit/src/main/scala/net/liftweb/builtin/snippet/A.scala
View
@@ -23,7 +23,7 @@ import net.liftweb.http._
import net.liftweb.http.js._
import net.liftweb.util._
-@deprecated("Use any of the ajax methods in SHtml instead.")
+@deprecated("Use any of the ajax methods in SHtml instead.", "2.5")
object A extends DispatchSnippet {
def dispatch : DispatchIt = {
3  web/webkit/src/main/scala/net/liftweb/builtin/snippet/Msgs.scala
View
@@ -23,10 +23,9 @@ import scala.xml._
import net.liftweb.util.Helpers._
import net.liftweb.http.js._
import JsCmds._
-import net.liftweb.common.{Box, Full, Empty}
+import net.liftweb.common.{Box, Empty}
import common.Full
import xml.Text
-import snippet.AjaxMessageMeta
/**
12 web/webkit/src/main/scala/net/liftweb/http/CometActor.scala
View
@@ -285,7 +285,7 @@ trait ListenerManager {
* favor of doing the filtering in the registered Actor's
* message handling partial functions instead.
*/
- @deprecated("Accept/reject logic should be done in the partial function that handles the message.")
+ @deprecated("Accept/reject logic should be done in the partial function that handles the message.", "2.4")
protected def updateIfPassesTest(update: Any)(info: ActorTest) {
info match {
case (who, test) => if (test.isDefinedAt(update) && test(update)) who ! update
@@ -329,7 +329,7 @@ trait ListenerManager {
*
* @see CometListener
*/
-@deprecated("Use the CometListener trait instead.")
+@deprecated("Use the CometListener trait instead.", "2.4")
trait CometListenee extends CometListener {
self: CometActor =>
}
@@ -372,7 +372,7 @@ trait CometListener extends CometActor {
* the session's context. This causes problems. Accept/reject logic should be done
* in the partial function that handles the message.
*/
- @deprecated("Accept/reject logic should be done in the partial function that handles the message.")
+ @deprecated("Accept/reject logic should be done in the partial function that handles the message.", "2.4")
protected def shouldUpdate: PartialFunction[Any, Boolean] = {
case _ => true
}
@@ -572,7 +572,7 @@ trait CometActor extends LiftActor with LiftCometActor with BindHelpers {
@volatile private var _defaultHtml: NodeSeq = _
- @deprecated("Use defaultHtml")
+ @deprecated("Use defaultHtml", "2.3")
def defaultXml = _defaultHtml
/**
@@ -1525,7 +1525,6 @@ object Notice {
* @param destroyScript is executed when the comet widget is redrawn ( e.g., if you register drag or mouse-over or some events, you unregister them here so the page doesn't leak resources.)
* @param ignoreHtmlOnJs -- if the reason for sending the render is a Comet update, ignore the xhtml part and just run the JS commands. This is useful in IE when you need to redraw the stuff inside <table><tr><td>... just doing innerHtml on <tr> is broken in IE
*/
-@serializable
case class RenderOut(xhtml: Box[NodeSeq], fixedXhtml: Box[NodeSeq], script: Box[JsCmd], destroyScript: Box[JsCmd], ignoreHtmlOnJs: Boolean) {
def this(xhtml: NodeSeq) = this (Full(xhtml), Empty, Empty, Empty, false)
@@ -1538,6 +1537,5 @@ case class RenderOut(xhtml: Box[NodeSeq], fixedXhtml: Box[NodeSeq], script: Box[
destroyScript, ignoreHtmlOnJs)
}
-@serializable
-private[http] object Never
+private[http] object Never extends Serializable
2  web/webkit/src/main/scala/net/liftweb/http/LiftResponse.scala
View
@@ -481,7 +481,7 @@ object DocType {
* Avoid using this in favor of LiftRules.docType
*
*/
-@deprecated("Avoid using this in favor of LiftRules.docType")
+@deprecated("Avoid using this in favor of LiftRules.docType", "2.3")
object ResponseInfo {
def docType: PartialFunction[Req, Box[String]] = new PartialFunction[Req, Box[String]](){
22 web/webkit/src/main/scala/net/liftweb/http/LiftRules.scala
View
@@ -366,7 +366,7 @@ class LiftRules() extends Factory with FormVendor with LazyLoggable {
* has been deprecated in favor of statelessReqTest which also passes
* the HTTPRequest instance for testing of the user agent and other stuff.
*/
- @deprecated("Use statelessReqTest")
+ @deprecated("Use statelessReqTest", "2.4")
val statelessTest = RulesSeq[StatelessTestPF]
@@ -462,7 +462,7 @@ class LiftRules() extends Factory with FormVendor with LazyLoggable {
/**
* Set the doc type used. Use the HtmlProperties
*/
- @deprecated("Use the HtmlProperties")
+ @deprecated("Use the HtmlProperties", "2.4")
val docType: FactoryMaker[Req => Box[String]] = new FactoryMaker( (r: Req) => r match {
case _ if S.skipDocType => Empty
case _ if S.getDocType._1 => S.getDocType._2
@@ -602,7 +602,7 @@ class LiftRules() extends Factory with FormVendor with LazyLoggable {
* contingent on an unchanged LiftRules.noCometSessionCommand and on
* liftComet.lift_sessionLost not being overridden client-side.
*/
- @scala.deprecated("Use LiftRules.noCometSessionCmd.")
+ @deprecated("Use LiftRules.noCometSessionCmd.", "2.5")
@volatile var noCometSessionPage = "/"
/**
@@ -1024,7 +1024,7 @@ class LiftRules() extends Factory with FormVendor with LazyLoggable {
* no session will be created and no JSESSIONID cookie will be presented to the user (unless
* the user has presented a JSESSIONID cookie).
*/
- @scala.deprecated("Use statelessDispatch")
+ @deprecated("Use statelessDispatch", "2.4")
def statelessDispatchTable = statelessDispatch
/**
@@ -1221,7 +1221,7 @@ class LiftRules() extends Factory with FormVendor with LazyLoggable {
/**
* Use statelessRewrite or statefuleRewrite
*/
- @deprecated("Use statelessRewrite or statefuleRewrite")
+ @deprecated("Use statelessRewrite or statefuleRewrite", "2.3")
val rewrite = statelessRewrite
/**
@@ -1355,9 +1355,9 @@ class LiftRules() extends Factory with FormVendor with LazyLoggable {
* LiftRules.noCometSessionCmd).
*/
@volatile var redirectAsyncOnSessionLoss = true
- @deprecated("Use redirectAsyncOnSessionLoss instead.")
+ @deprecated("Use redirectAsyncOnSessionLoss instead.", "2.5")
def redirectAjaxOnSessionLoss = redirectAsyncOnSessionLoss
- @deprecated("Use redirectAsyncOnSessionLoss instead.")
+ @deprecated("Use redirectAsyncOnSessionLoss instead.", "2.5")
def redirectAjaxOnSessionLoss_=(updated:Boolean) = redirectAsyncOnSessionLoss = updated
/**
@@ -1490,7 +1490,7 @@ class LiftRules() extends Factory with FormVendor with LazyLoggable {
/**
* Tells Lift if the Ajax JavaScript shoukd be included. By default it is set to true.
*/
- @deprecated("Use autoIncludeAjaxCalc")
+ @deprecated("Use autoIncludeAjaxCalc", "2.4")
@volatile var autoIncludeAjax: LiftSession => Boolean = session => autoIncludeAjaxCalc.vend().apply(session)
val autoIncludeAjaxCalc: FactoryMaker[() => LiftSession => Boolean] =
@@ -1716,7 +1716,7 @@ class LiftRules() extends Factory with FormVendor with LazyLoggable {
* A function to format a Date... can be replaced by a function that is user-specific
Replaced by dateTimeConverter
*/
- @deprecated("Replaced by dateTimeConverter")
+ @deprecated("Replaced by dateTimeConverter", "2.3")
@volatile var formatDate: Date => String = date => date match {
case null => LiftRules.dateTimeConverter.vend.formatDate(new Date(0L))
case s => toInternetDate(s)
@@ -1726,7 +1726,7 @@ class LiftRules() extends Factory with FormVendor with LazyLoggable {
* A function that parses a String into a Date... can be replaced by something that's user-specific
Replaced by dateTimeConverter
*/
- @deprecated("Replaced by dateTimeConverter")
+ @deprecated("Replaced by dateTimeConverter", "2.3")
@volatile var parseDate: String => Box[Date] = str => str match {
case null => Empty
case s => Helpers.toDate(s)
@@ -1752,7 +1752,7 @@ class LiftRules() extends Factory with FormVendor with LazyLoggable {
/**
* Provides the async provider instance responsible for suspending/resuming requests
*/
- @deprecated("Register your povider via addSyncProvider")
+ @deprecated("Register your povider via addSyncProvider", "2.4")
var servletAsyncProvider: (HTTPRequest) => ServletAsyncProvider = null // (req) => new Jetty6AsyncProvider(req)
/**
2  web/webkit/src/main/scala/net/liftweb/http/LiftScreen.scala
View
@@ -67,7 +67,7 @@ trait AbstractScreen extends Factory {
*
* @deprecated
*/
- @deprecated("use addFields()")
+ @deprecated("use addFields()", "2.4")
protected def _register(field: () => FieldContainer) = addFields(field)
protected def hasUploadField: Boolean = screenFields.foldLeft(false)(_ | _.uploadField_?)
2  web/webkit/src/main/scala/net/liftweb/http/LiftSession.scala
View
@@ -143,7 +143,7 @@ object LiftSession {
* Check to see if the template is marked designer friendly
* and lop off the stuff before the first surround
*/
- @deprecated("Use Templates.checkForContentId")
+ @deprecated("Use Templates.checkForContentId", "2.3")
def checkForContentId(in: NodeSeq): NodeSeq =
Templates.checkForContentId(in)
4 web/webkit/src/main/scala/net/liftweb/http/Paginator.scala
View
@@ -164,9 +164,9 @@ trait PaginatorSnippet[T] extends Paginator[T] {
*/
def currentXml: NodeSeq =
if(count==0)
- Text(??("paginator.norecords"))
+ Text(S.?("paginator.norecords"))
else
- Text(??("paginator.displayingrecords",
+ Text(S.?("paginator.displayingrecords",
Array(recordsFrom, recordsTo, count).map(_.asInstanceOf[AnyRef]) : _*))
/**
9 web/webkit/src/main/scala/net/liftweb/http/Req.scala
View
@@ -212,11 +212,10 @@ trait UserAgentCalculator {
def userAgent: Box[String]
}
-@serializable
-sealed trait ParamHolder {
+sealed trait ParamHolder extends Serializable{
def name: String
}
-@serializable
+
final case class NormalParamHolder(name: String, value: String) extends ParamHolder
/**
@@ -227,9 +226,8 @@ final case class NormalParamHolder(name: String, value: String) extends ParamHol
* @param mimeType the mime type, as specified in the Content-Type field
* @param fileName The local filename on the client
*/
-@serializable
abstract class FileParamHolder(val name: String, val mimeType: String,
- val fileName: String) extends ParamHolder
+ val fileName: String) extends ParamHolder with Serializable
{
/**
* Returns the contents of the uploaded file as a Byte array.
@@ -1222,7 +1220,6 @@ final case class RewriteRequest(path: ParsePath, requestType: RequestType, httpR
/**
* The representation of an URI path
*/
-@serializable
case class ParsePath(partPath: List[String], suffix: String, absolute: Boolean, endSlash: Boolean) {
def drop(cnt: Int) = ParsePath(partPath.drop(cnt), suffix, absolute, endSlash)
9 web/webkit/src/main/scala/net/liftweb/http/RequestType.scala
View
@@ -19,8 +19,7 @@ package http
import provider._
-@serializable
-abstract class RequestType {
+abstract class RequestType extends Serializable{
def post_? : Boolean = false
def get_? : Boolean = false
@@ -34,32 +33,26 @@ abstract class RequestType {
def method: String
}
-@serializable
case object GetRequest extends RequestType {
override def get_? = true
def method = "GET"
}
-@serializable
case object PostRequest extends RequestType {
override def post_? = true
def method = "POST"
}
-@serializable
case object HeadRequest extends RequestType {
override def head_? = true
def method = "HEAD"
}
-@serializable
case object PutRequest extends RequestType {
override def put_? = true
def method = "PUT"
}
-@serializable
case object DeleteRequest extends RequestType {
override def delete_? = true
def method = "DELETE"
}
-@serializable
case class UnknownRequest(val method: String) extends RequestType
object RequestType {
38 web/webkit/src/main/scala/net/liftweb/http/S.scala
View
@@ -127,8 +127,7 @@ object S extends S {
/**
* Impersonates a function that will be called when uploading files
*/
- @serializable
- private final class BinFuncHolder(val func: FileParamHolder => Any, val owner: Box[String]) extends AFuncHolder {
+ private final class BinFuncHolder(val func: FileParamHolder => Any, val owner: Box[String]) extends AFuncHolder with Serializable{
def apply(in: List[String]) {logger.info("You attempted to call a 'File Upload' function with a normal parameter. Did you forget to 'enctype' to 'multipart/form-data'?")}
override def apply(in: FileParamHolder) = func(in)
@@ -152,8 +151,7 @@ object S extends S {
* Impersonates a function that is executed on HTTP requests from client. The function
* takes a String as the only parameter and returns an Any.
*/
- @serializable
- private final class SFuncHolder(val func: String => Any, val owner: Box[String]) extends AFuncHolder {
+ private final class SFuncHolder(val func: String => Any, val owner: Box[String]) extends AFuncHolder with Serializable{
def this(func: String => Any) = this (func, Empty)
def apply(in: List[String]): Any = in.headOption.toList.map(func(_))
@@ -169,8 +167,7 @@ object S extends S {
* Impersonates a function that is executed on HTTP requests from client. The function
* takes a List[String] as the only parameter and returns an Any.
*/
- @serializable
- private final class LFuncHolder(val func: List[String] => Any, val owner: Box[String]) extends AFuncHolder {
+ private final class LFuncHolder(val func: List[String] => Any, val owner: Box[String]) extends AFuncHolder with Serializable {
def apply(in: List[String]): Any = func(in)
}
@@ -184,16 +181,14 @@ object S extends S {
* Impersonates a function that is executed on HTTP requests from client. The function
* takes zero arguments and returns an Any.
*/
- @serializable
- private final class NFuncHolder(val func: () => Any, val owner: Box[String]) extends AFuncHolder {
+ private final class NFuncHolder(val func: () => Any, val owner: Box[String]) extends AFuncHolder with Serializable{
def apply(in: List[String]): Any = in.headOption.toList.map(s => func())
}
/**
* Abstrats a function that is executed on HTTP requests from client.
*/
- @serializable
- sealed trait AFuncHolder extends Function1[List[String], Any] {
+ sealed trait AFuncHolder extends Function1[List[String], Any] with Serializable{
def owner: Box[String]
def apply(in: List[String]): Any
@@ -1026,7 +1021,7 @@ trait S extends HasParams with Loggable {
*
* @return the localized version of the string
*/
- @deprecated("Use S.?() instead. S.?? will be removed in 2.6")
+ @deprecated("Use S.?() instead. S.?? will be removed in 2.6", "2.5")
def ??(str: String): String = ?(str)
/**
@@ -1037,7 +1032,7 @@ trait S extends HasParams with Loggable {
*
* @return the localized version of the string
*/
- @deprecated("Use S.?() instead. S.?? will be removed in 2.6")
+ @deprecated("Use S.?() instead. S.?? will be removed in 2.6", "2.5")
def ??(str: String, params: AnyRef*): String = String.format(locale, ?(str), params: _*)
private def ?!(str: String, resBundle: List[ResourceBundle]): String = resBundle.flatMap(r => tryo(r.getObject(str) match {
@@ -2018,7 +2013,7 @@ for {
*
* @param attr The attributes to set temporarily
*/
- @deprecated("Use the S.withAttrs method instead")
+ @deprecated("Use the S.withAttrs method instead", "2.4")
def setVars[T](attr: MetaData)(f: => T): T = withAttrs(attr)(f)
/**
@@ -2655,10 +2650,10 @@ for {
*/
private[http] def noticesToJsCmd: JsCmd = LiftRules.noticesToJsCmd()
- @deprecated("Use AFuncHolder.listStrToAF")
+ @deprecated("Use AFuncHolder.listStrToAF", "2.4")
def toLFunc(in: List[String] => Any): AFuncHolder = LFuncHolder(in, Empty)
- @deprecated("Use AFuncHolder.unitToAF")
+ @deprecated("Use AFuncHolder.unitToAF", "2.4")
def toNFunc(in: () => Any): AFuncHolder = NFuncHolder(in, Empty)
implicit def stuff2ToUnpref(in: (Symbol, Any)): UnprefixedAttribute = new UnprefixedAttribute(in._1.name, Text(in._2.toString), Null)
@@ -2754,7 +2749,7 @@ for {
*
* Use fmapFunc(AFuncHolder)(String => T)
*/
- @deprecated("Use fmapFunc(AFuncHolder)(String => T)")
+ @deprecated("Use fmapFunc(AFuncHolder)(String => T)", "2.4")
def mapFunc(in: AFuncHolder): String = {
mapFunc(formFuncName, in)
}
@@ -2764,7 +2759,7 @@ for {
*
* Use fmapFunc(AFuncHolder)(String => T)
*/
- @deprecated("Use fmapFunc(AFuncHolder)(String => T)")
+ @deprecated("Use fmapFunc(AFuncHolder)(String => T)", "2.4")
def mapFunc(name: String, inf: AFuncHolder): String = {
addFunctionMap(name, inf)
name
@@ -2948,11 +2943,11 @@ for {
*
*/
def respondAsync(f: => Box[LiftResponse]): () => Box[LiftResponse] = {
- (for (req <- S.request) yield {
- RestContinuation.respondAsync(req)(f)
- }) openOr (() => Full(EmptyResponse))
+ RestContinuation.async {reply => f}
}
+
+
/**
* If you bind functions (i.e. using SHtml helpers) inside the closure passed to callOnce,
* after your function is invoked, it will be automatically removed from functions cache so
@@ -2979,8 +2974,7 @@ for {
/**
* Defines the notices types
*/
-@serializable
-object NoticeType {
+object NoticeType extends Serializable{
sealed abstract class Value(val title : String) {
def lowerCaseTitle = title.toLowerCase
4 web/webkit/src/main/scala/net/liftweb/http/SHtml.scala
View
@@ -206,7 +206,7 @@ trait SHtml {
*
* @return the function ID and JavaScript that makes the call
*/
- @scala.deprecated("Use jsonCall with a function that takes JValue => JsCmd")
+ @deprecated("Use jsonCall with a function that takes JValue => JsCmd", "2.5")
def jsonCall(jsCalcValue: JsExp, func: Any => JsCmd)(implicit d: AvoidTypeErasureIssues1): GUIDJsExp =
jsonCall_*(jsCalcValue, SFuncHolder(s => JSONParser.parse(s).map(func) openOr Noop))
@@ -219,7 +219,7 @@ trait SHtml {
*
* @return the function ID and JavaScript that makes the call
*/
- @scala.deprecated("Use jsonCall with a function that takes JValue => JsCmd")
+ @deprecated("Use jsonCall with a function that takes JValue => JsCmd", "2.5")
def jsonCall(jsCalcValue: JsExp, jsContext: JsContext, func: Any => JsCmd)(implicit d: AvoidTypeErasureIssues1): GUIDJsExp =
jsonCall_*(jsCalcValue, jsContext, SFuncHolder(s => JSONParser.parse(s).map(func) openOr Noop))
4 web/webkit/src/main/scala/net/liftweb/http/Templates.scala
View
@@ -91,7 +91,7 @@ object Templates {
*
* @return the template if it can be found
*/
- @deprecated("use apply")
+ @deprecated("use apply", "2.4")
def findAnyTemplate(places: List[String]): Box[NodeSeq] =
findRawTemplate(places, S.locale)
@@ -103,7 +103,7 @@ object Templates {
*
* @return the template if it can be found
*/
- @deprecated("use apply")
+ @deprecated("use apply", "2.4")
def findAnyTemplate(places: List[String], locale: Locale): Box[NodeSeq] = findRawTemplate(places, locale)
2  web/webkit/src/main/scala/net/liftweb/http/jquery/JqSHtml.scala
View
@@ -26,7 +26,7 @@ import JqJsCmds._
/**
* This contains Html artifacts that are heavily relying on JQuery
*/
-@deprecated("This contains Html artifacts that are heavily relying on JQuery")
+@deprecated("This contains Html artifacts that are heavily relying on JQuery", "2.3")
object JqSHtml {
def fadeOutErrors(duration: TimeSpan, fadeTime: TimeSpan): JsCmd = {
FadeOut(LiftRules.noticesContainerId + "_error", duration, fadeTime)
4 web/webkit/src/main/scala/net/liftweb/http/js/JsCommands.scala
View
@@ -188,7 +188,7 @@ trait JsExp extends HtmlFixer with ToJsCmd {
* This exists for backward compatibility reasons for JQueryLeft and JQueryRight
* which are now deprecated. Use ~> whenever possible as this will be removed soon.
*/
- @deprecated("Use `~>` instead")
+ @deprecated("Use `~>` instead", "2.3")
def >>(right: JsMember): JsExp = ~>(right)
@@ -553,7 +553,7 @@ trait HtmlFixer {
* This method must be run in the context of the thing creating the XHTML
* to capture the bound functions
*/
- @deprecated("Use fixHtmlAndJs or fixHtmlFunc")
+ @deprecated("Use fixHtmlAndJs or fixHtmlFunc", "2.4")
protected def fixHtml(uid: String, content: NodeSeq): String = {
val w = new java.io.StringWriter
6 web/webkit/src/main/scala/net/liftweb/http/js/jquery/JqJsCmds.scala
View
@@ -36,7 +36,7 @@ import JsCmds._
*/
@deprecated(""" As JQueryRight
is deprecated clases mixing this trait with stop doing so soon and they
-will mixin JsMember instead.""")
+will mixin JsMember instead.""", "2.3")
trait JQueryRight {
this: JsExp =>
def toJsCmd: String
@@ -44,7 +44,7 @@ trait JQueryRight {
/**
* Classes mixing JQuryLeft will soon stop doing so. Extending/Mixing JsExp will be enough
*/
-@deprecated("Classes mixing JQuryLeft will soon stop doing so. Extending/Mixing JsExp will be enough")
+@deprecated("Classes mixing JQuryLeft will soon stop doing so. Extending/Mixing JsExp will be enough", "2.3")
trait JQueryLeft {
this: JsExp =>
}
@@ -668,7 +668,7 @@ object JqJsCmds {
/**
* Use SetValueAndFocus from JsCmds
*/
- @deprecated("Use SetValueAndFocus from JsCmds")
+ @deprecated("Use SetValueAndFocus from JsCmds", "2.3")
case class SetValueAndFocus(id: String, value: String) extends JsCmd {
def toJsCmd = "document.getElementById(" + id.encJs + ").value = " +
value.encJs +
2  web/webkit/src/main/scala/net/liftweb/http/package.scala
View
@@ -22,7 +22,7 @@ import xml.{Elem, MetaData, NodeSeq}
import java.util.{ResourceBundle, Locale, Date}
package object http {
- @deprecated("Use Templates")
+ @deprecated("Use Templates", "2.3")
lazy val TemplateFinder = Templates
}
2  web/webkit/src/main/scala/net/liftweb/http/provider/servlet/HTTPResponseServlet.scala
View
@@ -81,7 +81,7 @@ class HTTPResponseServlet(resp: HttpServletResponse) extends HTTPResponse {
def setStatusWithReason(status: Int, reason: String) = {
_status = status
- resp setStatus (status, reason)
+ resp sendError (status, reason)
}
def outputStream: OutputStream = resp getOutputStream
1  web/webkit/src/main/scala/net/liftweb/http/provider/servlet/HTTPServletSession.scala
View
@@ -50,7 +50,6 @@ class HTTPServletSession(session: HttpSession) extends HTTPSession {
/**
* Represents the "bridge" between HttpSession and LiftSession
*/
-@serializable
case class SessionToServletBridge(uniqueId: String) extends HttpSessionBindingListener with HttpSessionActivationListener {
def sessionDidActivate(se: HttpSessionEvent) = {
SessionMaster.getSession(uniqueId, Empty).foreach(ls =>
2  web/webkit/src/main/scala/net/liftweb/http/rest/RestContinuation.scala
View
@@ -81,7 +81,7 @@ object RestContinuation {
* is invoked asynchronously in the context of a different thread.
*
*/
- @deprecated("Use RestContinuation.async. It provides much better resource management")
+ @deprecated("Use RestContinuation.async. It provides much better resource management", "2.4")
def respondAsync(req: Req)(f: => Box[LiftResponse]): () => Box[LiftResponse] = {
val store = ContinuationsStore.is
val key = ContinuationKey(req.path, req.requestType)
Please sign in to comment.
Something went wrong with that request. Please try again.