fixed some stuff in the chp 13 bootup

timperrett · Aug 29, 2011 · 42bd9a9 · 42bd9a9
1 parent 8997080
commit 42bd9a9
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 14 deletions.
diff --git a/chapter-13/src/main/resources/akka.conf b/chapter-13/src/main/resources/akka.conf
@@ -6,7 +6,7 @@
 # Modify as needed.
 
 akka {
-  version = "1.0-RC6" # Akka version, checked against the runtime version of Akka.
+  version = "1.0" # Akka version, checked against the runtime version of Akka.
 
   enabled-modules = []     # Comma separated list of the enabled modules. Options: ["remote", "camel", "http"]
 

diff --git a/chapter-13/src/main/scala/bootstrap/liftweb/Boot.scala b/chapter-13/src/main/scala/bootstrap/liftweb/Boot.scala
@@ -23,7 +23,7 @@ class Boot extends LazyLoggable {
      * Build the sitemap
      */
     LiftRules.setSiteMap(SiteMap(
-      Menu("Home") / "index" >> EarlyResponse(() => Full(RedirectResponse("/localization/"))) >> Hidden,
+      Menu("Home") / "index" >> EarlyResponse(() => Full(RedirectResponse("/jee/"))) >> Hidden,
       Menu("Java Enterprise Integration") / "jee" / "index" submenus(
         Menu("JPA: Authors: List") / "jee" / "authors" / "index",
         Menu("JPA: Authors: Add") / "jee" / "authors" / "add",

diff --git a/chapter-13/src/main/scala/sample/actor/RemoteAkkaSample.scala b/chapter-13/src/main/scala/sample/actor/RemoteAkkaSample.scala
@@ -12,4 +12,4 @@ object HelloWorldRemoteCaller {
   import akka.actor.Actor.remote
   private val actor = remote.actorFor("hello-service", "localhost", 2552)
   def welcome = actor ! "Hello"
-}
+}
diff --git a/chapter-13/src/main/scala/sample/comet/Calculator.scala b/chapter-13/src/main/scala/sample/comet/Calculator.scala
@@ -57,8 +57,9 @@ class CalculatorDisplay extends AkkaCometActor {
   def render = 
     "#value_one" #> doubleInput(one = _) &
     "#value_two" #> doubleInput(two = _) &
-    "#operation" #> SHtml.select(Seq("+","/","*").map(x => (x -> x)), 
-      operation, v => operation = Full(v)) &
+    "#operation" #> SHtml.select(Seq("+","/","*")
+      .map(x => (x -> x)), operation, 
+      v => operation = Full(v)) &
     "type=submit" #> SHtml.ajaxSubmit("Submit", () => {
       registry.actorFor[Calculator].map {
         _ ! Compute(one,two,operation.openOr("+"))

diff --git a/chapter-13/src/main/scala/sample/snippet/Authors.scala b/chapter-13/src/main/scala/sample/snippet/Authors.scala
@@ -25,8 +25,8 @@ class Authors {
     }
 
   def add = {
-    val currentId = author.id
-    "type=hidden" #> SHtml.hidden(() => author.id = currentId) &
+    val current = author
+    "type=hidden" #> SHtml.hidden(() => authorVar(current)) &
     "type=text" #> SHtml.text(author.name, author.name = _) &
     "type=submit" #> SHtml.onSubmitUnit(() =>
       tryo(Model.mergeAndFlush(author)) match {

diff --git a/chapter-13/src/main/webapp/jee/jta.html b/chapter-13/src/main/webapp/jee/jta.html
diff --git a/database/chapter_13.h2.db b/database/chapter_13.h2.db