Permalink
Browse files

- Adjust package declaration to work with both scala 2.7.x and scala …

…2.8.x

- Streamline copyright header (and add one to the files that didn't have)
  • Loading branch information...
1 parent f41c992 commit df06b4d925fac5a33df745d6c62f37b1cf13866c @indrajitr indrajitr committed Jan 20, 2010
Showing with 2,231 additions and 793 deletions.
  1. +2 −2 framework/lift-base/lift-actor/pom.xml
  2. +10 −6 framework/lift-base/lift-actor/src/main/scala/net/liftweb/actor/LAFuture.scala
  3. +10 −3 framework/lift-base/lift-actor/src/main/scala/net/liftweb/actor/LAPinger.scala
  4. +19 −14 framework/lift-base/lift-actor/src/main/scala/net/liftweb/actor/LiftActor.scala
  5. +2 −2 framework/lift-base/lift-actor/src/site/site.xml
  6. +10 −4 framework/lift-base/lift-common/src/main/scala/net/liftweb/common/Box.scala
  7. +10 −6 framework/lift-base/lift-common/src/main/scala/net/liftweb/common/SimpleActor.scala
  8. +2 −2 framework/lift-base/lift-common/src/site/site.xml
  9. +11 −6 framework/lift-base/lift-common/src/test/scala/net/liftweb/common/BoxSpec.scala
  10. +11 −6 framework/lift-base/lift-common/src/test/scala/net/liftweb/common/BoxUnit.scala
  11. +2 −2 framework/lift-base/lift-json/pom.xml
  12. +11 −7 framework/lift-base/lift-json/src/main/scala/net/liftweb/json/Diff.scala
  13. +10 −7 framework/lift-base/lift-json/src/main/scala/net/liftweb/json/Extraction.scala
  14. +11 −7 framework/lift-base/lift-json/src/main/scala/net/liftweb/json/Formats.scala
  15. +11 −7 framework/lift-base/lift-json/src/main/scala/net/liftweb/json/JsonAST.scala
  16. +11 −7 framework/lift-base/lift-json/src/main/scala/net/liftweb/json/JsonParser.scala
  17. +11 −7 framework/lift-base/lift-json/src/main/scala/net/liftweb/json/Merge.scala
  18. +11 −7 framework/lift-base/lift-json/src/main/scala/net/liftweb/json/Meta.scala
  19. +15 −11 framework/lift-base/lift-json/src/main/scala/net/liftweb/json/Serialization.scala
  20. +11 −7 framework/lift-base/lift-json/src/main/scala/net/liftweb/json/Xml.scala
  21. +2 −2 framework/lift-base/lift-json/src/site/site.xml
  22. +21 −1 framework/lift-base/lift-json/src/test/scala/net/liftweb/json/DiffExamples.scala
  23. +21 −1 framework/lift-base/lift-json/src/test/scala/net/liftweb/json/Examples.scala
  24. +21 −1 framework/lift-base/lift-json/src/test/scala/net/liftweb/json/ExtractionExamples.scala
  25. +21 −1 framework/lift-base/lift-json/src/test/scala/net/liftweb/json/JValueGen.scala
  26. +21 −1 framework/lift-base/lift-json/src/test/scala/net/liftweb/json/JsonASTTest.scala
  27. +21 −1 framework/lift-base/lift-json/src/test/scala/net/liftweb/json/LottoExample.scala
  28. +21 −1 framework/lift-base/lift-json/src/test/scala/net/liftweb/json/MergeExamples.scala
  29. +21 −1 framework/lift-base/lift-json/src/test/scala/net/liftweb/json/ParserTest.scala
  30. +21 −1 framework/lift-base/lift-json/src/test/scala/net/liftweb/json/PrintingTest.scala
  31. +21 −1 framework/lift-base/lift-json/src/test/scala/net/liftweb/json/QueryExamples.scala
  32. +21 −1 framework/lift-base/lift-json/src/test/scala/net/liftweb/json/SerializationExamples.scala
  33. +21 −1 framework/lift-base/lift-json/src/test/scala/net/liftweb/json/XmlBugs.scala
  34. +21 −1 framework/lift-base/lift-json/src/test/scala/net/liftweb/json/XmlExamples.scala
  35. +21 −1 framework/lift-base/lift-json/src/test/scala/net/liftweb/json/XmlTest.scala
  36. +2 −2 framework/lift-base/lift-util/pom.xml
  37. +10 −3 framework/lift-base/lift-util/src/main/scala/net/liftweb/util/ActorPing.scala
  38. +11 −6 framework/lift-base/lift-util/src/main/scala/net/liftweb/util/AnyVar.scala
  39. +11 −4 framework/lift-base/lift-util/src/main/scala/net/liftweb/util/BasicTypesHelpers.scala
  40. +9 −3 framework/lift-base/lift-util/src/main/scala/net/liftweb/util/BindHelpers.scala
  41. +20 −1 framework/lift-base/lift-util/src/main/scala/net/liftweb/util/BindPlus.scala
  42. +10 −6 framework/lift-base/lift-util/src/main/scala/net/liftweb/util/CSSHelpers.scala
  43. +10 −4 framework/lift-base/lift-util/src/main/scala/net/liftweb/util/ClassHelpers.scala
  44. +11 −3 framework/lift-base/lift-util/src/main/scala/net/liftweb/util/CombParserHelpers.scala
  45. +9 −2 framework/lift-base/lift-util/src/main/scala/net/liftweb/util/ConcurrentLock.scala
  46. +9 −4 framework/lift-base/lift-util/src/main/scala/net/liftweb/util/ControlHelpers.scala
  47. +20 −13 framework/lift-base/lift-util/src/main/scala/net/liftweb/util/Currency.scala
  48. +12 −8 framework/lift-base/lift-util/src/main/scala/net/liftweb/util/CurrencyZone.scala
  49. +11 −7 framework/lift-base/lift-util/src/main/scala/net/liftweb/util/EnumWithDescription.scala
  50. +10 −7 framework/lift-base/lift-util/src/main/scala/net/liftweb/util/FatLazy.scala
  51. +10 −4 framework/lift-base/lift-util/src/main/scala/net/liftweb/util/HeadHelper.scala
  52. +12 −5 framework/lift-base/lift-util/src/main/scala/net/liftweb/util/Helpers.scala
  53. +10 −3 framework/lift-base/lift-util/src/main/scala/net/liftweb/util/HttpHelpers.scala
  54. +10 −3 framework/lift-base/lift-util/src/main/scala/net/liftweb/util/IoHelpers.scala
  55. +9 −3 framework/lift-base/lift-util/src/main/scala/net/liftweb/util/JSONParser.scala
  56. +9 −7 framework/lift-base/lift-util/src/main/scala/net/liftweb/util/JsonCmd.scala
  57. +9 −3 framework/lift-base/lift-util/src/main/scala/net/liftweb/util/KeyedCache.scala
  58. +11 −4 framework/lift-base/lift-util/src/main/scala/net/liftweb/util/LD.scala
  59. +11 −4 framework/lift-base/lift-util/src/main/scala/net/liftweb/util/LRU.scala
  60. +10 −7 framework/lift-base/lift-util/src/main/scala/net/liftweb/util/ListHelpers.scala
  61. +11 −4 framework/lift-base/lift-util/src/main/scala/net/liftweb/util/LoanWrapper.scala
  62. +10 −3 framework/lift-base/lift-util/src/main/scala/net/liftweb/util/Log.scala
  63. +11 −4 framework/lift-base/lift-util/src/main/scala/net/liftweb/util/Mailer.scala
  64. +10 −6 framework/lift-base/lift-util/src/main/scala/net/liftweb/util/Maker.scala
  65. +10 −3 framework/lift-base/lift-util/src/main/scala/net/liftweb/util/MonadicConversions.scala
  66. +11 −5 framework/lift-base/lift-util/src/main/scala/net/liftweb/util/NamedPartialFunction.scala
  67. +9 −3 framework/lift-base/lift-util/src/main/scala/net/liftweb/util/PCDataMarkupParser.scala
  68. +11 −7 framework/lift-base/lift-util/src/main/scala/net/liftweb/util/Props.scala
  69. +10 −4 framework/lift-base/lift-util/src/main/scala/net/liftweb/util/RE.scala
  70. +9 −3 framework/lift-base/lift-util/src/main/scala/net/liftweb/util/SecurityHelpers.scala
  71. +11 −6 framework/lift-base/lift-util/src/main/scala/net/liftweb/util/Slf4jLogger.scala
  72. +20 −1 framework/lift-base/lift-util/src/main/scala/net/liftweb/util/SoftReferenceCache.scala
  73. +14 −7 framework/lift-base/lift-util/src/main/scala/net/liftweb/util/StringHelpers.scala
  74. +10 −3 framework/lift-base/lift-util/src/main/scala/net/liftweb/util/TemplateCache.scala
  75. +11 −4 framework/lift-base/lift-util/src/main/scala/net/liftweb/util/ThreadGlobal.scala
  76. +14 −6 framework/lift-base/lift-util/src/main/scala/net/liftweb/util/TimeHelpers.scala
  77. +11 −3 framework/lift-base/lift-util/src/main/scala/net/liftweb/util/VCardParser.scala
  78. +8 −2 framework/lift-base/lift-util/src/main/scala/net/liftweb/util/ValueHolder.scala
  79. +2 −2 framework/lift-base/lift-util/src/site/site.xml
  80. +11 −6 framework/lift-base/lift-util/src/test/scala/net/liftweb/util/ActorPingSpec.scala
  81. +11 −6 framework/lift-base/lift-util/src/test/scala/net/liftweb/util/ActorPingUnit.scala
  82. +21 −1 framework/lift-base/lift-util/src/test/scala/net/liftweb/util/BasicTypesHelpersSpec.scala
  83. +22 −1 framework/lift-base/lift-util/src/test/scala/net/liftweb/util/BindHelpersSpec.scala
  84. +22 −1 framework/lift-base/lift-util/src/test/scala/net/liftweb/util/ClassHelpersSpec.scala
  85. +11 −6 framework/lift-base/lift-util/src/test/scala/net/liftweb/util/CombParserHelpersSpec.scala
  86. +22 −1 framework/lift-base/lift-util/src/test/scala/net/liftweb/util/ControlHelpersSpec.scala
  87. +12 −8 framework/lift-base/lift-util/src/test/scala/net/liftweb/util/CurrencyZoneSpec.scala
  88. +11 −7 framework/lift-base/lift-util/src/test/scala/net/liftweb/util/EnumWithDescriptionSpec.scala
  89. +22 −1 framework/lift-base/lift-util/src/test/scala/net/liftweb/util/HelpersSpec.scala
  90. +22 −1 framework/lift-base/lift-util/src/test/scala/net/liftweb/util/HttpHelpersSpec.scala
  91. +22 −1 framework/lift-base/lift-util/src/test/scala/net/liftweb/util/JSONSpec.scala
  92. +22 −1 framework/lift-base/lift-util/src/test/scala/net/liftweb/util/ListHelpersSpec.scala
  93. +11 −4 framework/lift-base/lift-util/src/test/scala/net/liftweb/util/MailerSpec.scala
  94. +22 −1 framework/lift-base/lift-util/src/test/scala/net/liftweb/util/SecurityHelpersSpec.scala
  95. +22 −1 framework/lift-base/lift-util/src/test/scala/net/liftweb/util/StringHelpersSpec.scala
  96. +22 −1 framework/lift-base/lift-util/src/test/scala/net/liftweb/util/TimeHelpersSpec.scala
  97. +10 −6 framework/lift-base/lift-util/src/test/scala/net/liftweb/util/ToHeadSpecs.scala
  98. +10 −6 framework/lift-base/lift-util/src/test/scala/net/liftweb/util/VCardParseSpecs.scala
  99. +10 −6 framework/lift-base/lift-util/src/test/scala/net/liftweb/util/XmlParseSpecs.scala
  100. +2 −2 framework/lift-base/lift-webkit/pom.xml
  101. +13 −6 framework/lift-base/lift-webkit/src/main/scala/net/liftweb/builtin/snippet/A.scala
  102. +13 −6 framework/lift-base/lift-webkit/src/main/scala/net/liftweb/builtin/snippet/CSS.scala
  103. +13 −6 framework/lift-base/lift-webkit/src/main/scala/net/liftweb/builtin/snippet/Children.scala
  104. +13 −6 framework/lift-base/lift-webkit/src/main/scala/net/liftweb/builtin/snippet/Comet.scala
  105. +13 −6 framework/lift-base/lift-webkit/src/main/scala/net/liftweb/builtin/snippet/Embed.scala
  106. +12 −6 framework/lift-base/lift-webkit/src/main/scala/net/liftweb/builtin/snippet/Form.scala
  107. +12 −6 framework/lift-base/lift-webkit/src/main/scala/net/liftweb/builtin/snippet/HTML5.scala
  108. +12 −6 framework/lift-base/lift-webkit/src/main/scala/net/liftweb/builtin/snippet/Ignore.scala
  109. +12 −6 framework/lift-base/lift-webkit/src/main/scala/net/liftweb/builtin/snippet/LazyLoad.scala
  110. +11 −6 framework/lift-base/lift-webkit/src/main/scala/net/liftweb/builtin/snippet/Loc.scala
  111. +13 −6 framework/lift-base/lift-webkit/src/main/scala/net/liftweb/builtin/snippet/Menu.scala
  112. +13 −6 framework/lift-base/lift-webkit/src/main/scala/net/liftweb/builtin/snippet/Msg.scala
  113. +13 −6 framework/lift-base/lift-webkit/src/main/scala/net/liftweb/builtin/snippet/Msgs.scala
  114. +12 −6 framework/lift-base/lift-webkit/src/main/scala/net/liftweb/builtin/snippet/SkipDocType.scala
  115. +12 −6 framework/lift-base/lift-webkit/src/main/scala/net/liftweb/builtin/snippet/Surround.scala
  116. +23 −1 framework/lift-base/lift-webkit/src/main/scala/net/liftweb/builtin/snippet/Tail.scala
  117. +11 −6 framework/lift-base/lift-webkit/src/main/scala/net/liftweb/builtin/snippet/TestCond.scala
  118. +13 −6 framework/lift-base/lift-webkit/src/main/scala/net/liftweb/builtin/snippet/VersionInfo.scala
  119. +23 −1 framework/lift-base/lift-webkit/src/main/scala/net/liftweb/builtin/snippet/WithParam.scala
  120. +12 −6 framework/lift-base/lift-webkit/src/main/scala/net/liftweb/builtin/snippet/XmlGroup.scala
  121. +10 −6 framework/lift-base/lift-webkit/src/main/scala/net/liftweb/http/CometActor.scala
  122. +10 −6 framework/lift-base/lift-webkit/src/main/scala/net/liftweb/http/Factory.scala
  123. +10 −6 framework/lift-base/lift-webkit/src/main/scala/net/liftweb/http/LiftMerge.scala
  124. +10 −6 framework/lift-base/lift-webkit/src/main/scala/net/liftweb/http/LiftResponse.scala
  125. +10 −6 framework/lift-base/lift-webkit/src/main/scala/net/liftweb/http/LiftRules.scala
  126. +11 −6 framework/lift-base/lift-webkit/src/main/scala/net/liftweb/http/LiftScreen.scala
  127. +10 −6 framework/lift-base/lift-webkit/src/main/scala/net/liftweb/http/LiftServlet.scala
  128. +10 −6 framework/lift-base/lift-webkit/src/main/scala/net/liftweb/http/LiftSession.scala
  129. +11 −6 framework/lift-base/lift-webkit/src/main/scala/net/liftweb/http/Req.scala
  130. +11 −6 framework/lift-base/lift-webkit/src/main/scala/net/liftweb/http/RequestType.scala
  131. +11 −6 framework/lift-base/lift-webkit/src/main/scala/net/liftweb/http/ResourceServer.scala
  132. +11 −6 framework/lift-base/lift-webkit/src/main/scala/net/liftweb/http/ResponseShortcutException.scala
  133. +10 −6 framework/lift-base/lift-webkit/src/main/scala/net/liftweb/http/S.scala
  134. +10 −6 framework/lift-base/lift-webkit/src/main/scala/net/liftweb/http/SHtml.scala
  135. +10 −6 framework/lift-base/lift-webkit/src/main/scala/net/liftweb/http/SimpleController.scala
  136. +11 −6 framework/lift-base/lift-webkit/src/main/scala/net/liftweb/http/StatefulSnippet.scala
  137. +11 −6 framework/lift-base/lift-webkit/src/main/scala/net/liftweb/http/Vars.scala
  138. +13 −6 framework/lift-base/lift-webkit/src/main/scala/net/liftweb/http/auth/HttpAuthentication.scala
  139. +13 −6 framework/lift-base/lift-webkit/src/main/scala/net/liftweb/http/auth/Role.scala
  140. +12 −6 framework/lift-base/lift-webkit/src/main/scala/net/liftweb/http/jquery/JqSHtml.scala
  141. +11 −6 framework/lift-base/lift-webkit/src/main/scala/net/liftweb/http/js/JSArtifacts.scala
  142. +12 −8 framework/lift-base/lift-webkit/src/main/scala/net/liftweb/http/js/JsCommands.scala
  143. +12 −6 framework/lift-base/lift-webkit/src/main/scala/net/liftweb/http/js/Jx.scala
  144. +13 −6 framework/lift-base/lift-webkit/src/main/scala/net/liftweb/http/js/ScriptRenderer.scala
  145. +14 −6 framework/lift-base/lift-webkit/src/main/scala/net/liftweb/http/js/jquery/JQueryArtifacts.scala
  146. +14 −6 framework/lift-base/lift-webkit/src/main/scala/net/liftweb/http/js/jquery/JqJsCmds.scala
  147. +14 −6 framework/lift-base/lift-webkit/src/main/scala/net/liftweb/http/js/yui/YUIArtifacts.scala
  148. +13 −6 framework/lift-base/lift-webkit/src/main/scala/net/liftweb/http/provider/HTTPContext.scala
  149. +11 −8 framework/lift-base/lift-webkit/src/main/scala/net/liftweb/http/provider/HTTPCookie.scala
  150. +13 −6 framework/lift-base/lift-webkit/src/main/scala/net/liftweb/http/provider/HTTPParam.scala
  151. +13 −6 framework/lift-base/lift-webkit/src/main/scala/net/liftweb/http/provider/HTTPProvider.scala
  152. +13 −6 framework/lift-base/lift-webkit/src/main/scala/net/liftweb/http/provider/HTTPRequest.scala
  153. +13 −6 framework/lift-base/lift-webkit/src/main/scala/net/liftweb/http/provider/HTTPResponse.scala
  154. +13 −6 framework/lift-base/lift-webkit/src/main/scala/net/liftweb/http/provider/HTTPSession.scala
  155. +25 −1 ...k/lift-base/lift-webkit/src/main/scala/net/liftweb/http/provider/servlet/HTTPRequestServlet.scala
  156. +24 −1 .../lift-base/lift-webkit/src/main/scala/net/liftweb/http/provider/servlet/HTTPResponseServlet.scala
  157. +25 −1 ...k/lift-base/lift-webkit/src/main/scala/net/liftweb/http/provider/servlet/HTTPServletContext.scala
  158. +25 −1 ...k/lift-base/lift-webkit/src/main/scala/net/liftweb/http/provider/servlet/HTTPServletSession.scala
  159. +25 −1 ...ift-base/lift-webkit/src/main/scala/net/liftweb/http/provider/servlet/ServletFilterProvider.scala
  160. +12 −6 framework/lift-base/lift-webkit/src/main/scala/net/liftweb/http/rest/XMLApiHelper.scala
  161. +11 −6 framework/lift-base/lift-webkit/src/main/scala/net/liftweb/sitemap/Loc.scala
  162. +10 −6 framework/lift-base/lift-webkit/src/main/scala/net/liftweb/sitemap/Menu.scala
  163. +11 −6 framework/lift-base/lift-webkit/src/main/scala/net/liftweb/sitemap/SiteMap.scala
  164. +20 −1 framework/lift-base/lift-webkit/src/main/scala/net/liftweb/sitemap/XmlMenu.scala
  165. +2 −2 framework/lift-base/lift-webkit/src/site/site.xml
  166. +10 −6 framework/lift-base/lift-webkit/src/test/scala/bootstrap/liftweb/Boot.scala
  167. +10 −6 framework/lift-base/lift-webkit/src/test/scala/net/liftweb/webapptest/JettyTestServer.scala
  168. +11 −7 framework/lift-base/lift-webkit/src/test/scala/net/liftweb/webapptest/MemoizeTest.scala
  169. +11 −6 framework/lift-base/lift-webkit/src/test/scala/net/liftweb/webapptest/ToHeadUsages.scala
  170. +12 −6 framework/lift-base/lift-webkit/src/test/scala/net/liftweb/webapptest/snippet/DeferredSnippet.scala
  171. +12 −6 framework/lift-base/lift-webkit/src/test/scala/net/liftweb/webapptest/snippet/HeadTestSnippet.scala
  172. +12 −6 framework/lift-base/lift-webkit/src/test/scala/net/liftweb/webapptest/snippet/HelloWorld.scala
  173. +2 −2 framework/lift-base/pom.xml
  174. +2 −2 framework/lift-base/src/site/site.xml
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright 2006-2010 WorldWide Conferencing, LLC
+ ~ Copyright 2009-2010 WorldWide Conferencing, LLC
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
- ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
@@ -5,16 +5,17 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an "AS IS" BASIS,
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions
- * and limitations under the License.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
-package net.liftweb.actor
+package net.liftweb {
+package actor {
import common._
@@ -52,3 +53,6 @@ class LAFuture[T] /*extends Future[T]*/ {
}
}
}
+
+}
+}
@@ -1,18 +1,22 @@
-package net.liftweb.actor
-
/*
* Copyright 2007-2010 WorldWide Conferencing, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+ * 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
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+package net.liftweb {
+package actor {
+
import _root_.java.util.concurrent._
/**
@@ -68,3 +72,6 @@ private object TF extends ThreadFactory {
d
}
}
+
+}
+}
@@ -5,16 +5,18 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an "AS IS" BASIS,
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions
- * and limitations under the License.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
-package net.liftweb.actor
+package net.liftweb {
+package actor {
+
import common._
trait ILAExecute {
@@ -148,7 +150,7 @@ trait SpecializedLiftActor[T] extends SimpleActor[T] {
} catch {
case e: Exception => if (eh.isDefinedAt(e)) eh(e)
}
- case _ =>
+ case _ =>
baseMailbox.synchronized {
if (msgList.isEmpty) {
processing = false
@@ -187,8 +189,8 @@ trait SpecializedLiftActor[T] extends SimpleActor[T] {
private final case class MsgWithResp(msg: Any, future: LAFuture[Any])
-trait LiftActor extends SpecializedLiftActor[Any]
-with GenericActor[Any]
+trait LiftActor extends SpecializedLiftActor[Any]
+with GenericActor[Any]
with ForwardableActor[Any, Any] {
@volatile
private[this] var responseFuture: LAFuture[Any] = null
@@ -198,9 +200,9 @@ with ForwardableActor[Any, Any] {
protected final def forwardMessageTo(msg: Any, forwardTo: TypedActor[Any, Any]) {
if (null ne responseFuture) {
forwardTo match {
- case la: LiftActor => la ! MsgWithResp(msg, responseFuture)
- case other =>
- reply(other !? msg)
+ case la: LiftActor => la ! MsgWithResp(msg, responseFuture)
+ case other =>
+ reply(other !? msg)
}
} else forwardTo ! msg
}
@@ -220,8 +222,8 @@ with ForwardableActor[Any, Any] {
/**
* Compatible with Scala Actors' !? method
*/
- def !?(timeout: Long, message: Any): Box[Any] =
- this !! (message, timeout)
+ def !?(timeout: Long, message: Any): Box[Any] =
+ this !! (message, timeout)
def !!(msg: Any, timeout: Long): Box[Any] = {
@@ -259,3 +261,6 @@ with ForwardableActor[Any, Any] {
}
}
}
+
+}
+}
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright 2006-2010 WorldWide Conferencing, LLC
+ ~ Copyright 2009-2010 WorldWide Conferencing, LLC
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
- ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
@@ -1,18 +1,22 @@
-package net.liftweb.common
-
/*
* Copyright 2007-2010 WorldWide Conferencing, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+ * 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
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+package net.liftweb {
+package common {
+
import _root_.scala.reflect.Manifest
/**
@@ -433,6 +437,8 @@ sealed case class Failure(msg: String, exception: Box[Throwable], chain: Box[Fai
final case class ParamFailure[T](override val msg: String,
override val exception: Box[Throwable],
override val chain: Box[Failure], param: T) extends
-Failure(msg, exception, chain)
+ Failure(msg, exception, chain)
+}
+}
// vim: set ts=2 sw=2 et:
@@ -5,16 +5,17 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an "AS IS" BASIS,
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions
- * and limitations under the License.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
-package net.liftweb.common
+package net.liftweb {
+package common {
/**
* The simple definition of an actor. Something that
@@ -84,3 +85,6 @@ trait ForwardableActor[From, To] {
protected def reply(msg: To): Unit
}
+
+}
+}
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright 2006-2010 WorldWide Conferencing, LLC
+ ~ Copyright 2009-2010 WorldWide Conferencing, LLC
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
- ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
@@ -5,15 +5,17 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an "AS IS" BASIS,
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions
- * and limitations under the License.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
-package net.liftweb.common
+
+package net.liftweb {
+package common {
import _root_.org.specs._
import _root_.net.liftweb.common.Box._
@@ -235,3 +237,6 @@ object BoxSpec extends Specification {
}
}
}
+
+}
+}
@@ -5,15 +5,17 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an "AS IS" BASIS,
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions
- * and limitations under the License.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
-package net.liftweb.common
+
+package net.liftweb {
+package common {
import _root_.org.specs._
import _root_.net.liftweb.common.Box._
@@ -73,3 +75,6 @@ trait BoxGen {
} yield Failure(msg.mkString, exception, Box(chain.firstOption))
}
+
+}
+}
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright 2006-2010 WorldWide Conferencing, LLC
+ ~ Copyright 2009-2010 WorldWide Conferencing, LLC
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
- ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
@@ -1,21 +1,22 @@
-package net.liftweb.json
-
/*
* Copyright 2009-2010 WorldWide Conferencing, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an "AS IS" BASIS,
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions
- * and limitations under the License.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
+package net.liftweb {
+package json {
+
import JsonAST._
/** A difference between two JSONs (j1 diff j2).
@@ -98,3 +99,6 @@ object Diff {
def diff(other: JValue) = Diff.diff(this, other)
}
}
+
+}
+}
Oops, something went wrong.

0 comments on commit df06b4d

Please sign in to comment.