Skip to content

Commit

Permalink
removed some old comments
Browse files Browse the repository at this point in the history
  • Loading branch information
timperrett committed Aug 29, 2011
1 parent 60f0b8b commit d208df9
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 204 deletions.
6 changes: 3 additions & 3 deletions chapter-11/src/main/resources/props/default.props
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
#db.url=jdbc:mysql://localhost:8889/lia_chapter_12
#db.user=root
#db.pass=root
db.class=org.postgresql.Driver
db.url=jdbc:postgresql://localhost/lia_chapter_12
db.user=root
# db.class=org.postgresql.Driver
# db.url=jdbc:postgresql://localhost/lia_chapter_12
# db.user=root
2 changes: 1 addition & 1 deletion chapter-11/src/main/scala/bootstrap/liftweb/Boot.scala
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ class Boot extends Loggable {
/**
* Add the request wrapper for database connectivity
*/
S.addAround(DB.buildLoanWrapper)
// S.addAround(DB.buildLoanWrapper)

/**
* CouchDB Setup
Expand Down
8 changes: 3 additions & 5 deletions chapter-13/src/main/scala/bootstrap/liftweb/Boot.scala
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,14 @@ class Boot extends LazyLoggable {
Menu("Java Enterprise Integration") / "jee" / "index" submenus(
Menu("JPA: Authors: List") / "jee" / "authors" / "index",
Menu("JPA: Authors: Add") / "jee" / "authors" / "add",
Menu("JPA: Books: Add") / "jee" / "books" / "add",
Menu("JTA") / "jee" / "jta"
Menu("JPA: Books: Add") / "jee" / "books" / "add"
),
Menu("Messaging and Distribution") / "distributed" >> EarlyResponse(() => Full(RedirectResponse("/distributed/akka-calculator"))) submenus(
Menu("Comet Calculator") / "distributed" / "akka-calculator"
)
))

import akka.actor.Actor
import akka.actor.Actor.{remote,actorOf}
import akka.actor.Supervisor
import akka.config.Supervision.{SupervisorConfig,OneForOneStrategy,Supervise,Permanent}
Expand All @@ -49,9 +49,7 @@ class Boot extends LazyLoggable {
// remote.register("hello-service", actorOf[HelloWorldActor])

LiftRules.unloadHooks.append(() => {
actorOf[HelloWorldActor].shutdownLinkedActors()
actorOf[IntTransformer].shutdownLinkedActors()
actorOf[sample.comet.Calculator].shutdownLinkedActors()
Actor.registry.shutdownAll
})

/**
Expand Down
Binary file modified database/chapter_11.h2.db
Binary file not shown.
194 changes: 2 additions & 192 deletions lift-in-action.tmproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>currentDocument</key>
<string>chapter-10/src/main/scala/net/liftweb/mapper/MappedSplitName.scala</string>
<key>documents</key>
<array>
<dict>
Expand All @@ -20,198 +18,10 @@
<key>fileHierarchyDrawerWidth</key>
<integer>449</integer>
<key>metaData</key>
<dict>
<key>chapter-10/src/main/scala/net/liftweb/mapper/MappedSplitName.scala</key>
<dict>
<key>caret</key>
<dict>
<key>column</key>
<integer>17</integer>
<key>line</key>
<integer>18</integer>
</dict>
<key>firstVisibleColumn</key>
<integer>0</integer>
<key>firstVisibleLine</key>
<integer>11</integer>
</dict>
<key>chapter-10/src/main/scala/sample/model/Account.scala</key>
<dict>
<key>caret</key>
<dict>
<key>column</key>
<integer>0</integer>
<key>line</key>
<integer>0</integer>
</dict>
<key>firstVisibleColumn</key>
<integer>0</integer>
<key>firstVisibleLine</key>
<integer>0</integer>
</dict>
<key>chapter-10/src/main/scala/sample/model/AggregationSample.scala</key>
<dict>
<key>caret</key>
<dict>
<key>column</key>
<integer>0</integer>
<key>line</key>
<integer>7</integer>
</dict>
<key>firstVisibleColumn</key>
<integer>0</integer>
<key>firstVisibleLine</key>
<integer>0</integer>
</dict>
<key>chapter-10/src/main/scala/sample/snippet/LiftScreenSample.scala</key>
<dict>
<key>caret</key>
<dict>
<key>column</key>
<integer>9</integer>
<key>line</key>
<integer>8</integer>
</dict>
<key>columnSelection</key>
<false/>
<key>firstVisibleColumn</key>
<integer>0</integer>
<key>firstVisibleLine</key>
<integer>0</integer>
<key>selectFrom</key>
<dict>
<key>column</key>
<integer>2</integer>
<key>line</key>
<integer>8</integer>
</dict>
<key>selectTo</key>
<dict>
<key>column</key>
<integer>11</integer>
<key>line</key>
<integer>8</integer>
</dict>
</dict>
<key>chapter-6/src/main/scala/sample/snippet/LiftScreenExample.scala</key>
<dict>
<key>caret</key>
<dict>
<key>column</key>
<integer>0</integer>
<key>line</key>
<integer>38</integer>
</dict>
<key>columnSelection</key>
<false/>
<key>firstVisibleColumn</key>
<integer>0</integer>
<key>firstVisibleLine</key>
<integer>18</integer>
<key>selectFrom</key>
<dict>
<key>column</key>
<integer>0</integer>
<key>line</key>
<integer>31</integer>
</dict>
<key>selectTo</key>
<dict>
<key>column</key>
<integer>0</integer>
<key>line</key>
<integer>38</integer>
</dict>
</dict>
<key>chapter-6/src/main/scala/sample/snippet/WizardExample.scala</key>
<dict>
<key>caret</key>
<dict>
<key>column</key>
<integer>6</integer>
<key>line</key>
<integer>10</integer>
</dict>
<key>columnSelection</key>
<false/>
<key>firstVisibleColumn</key>
<integer>0</integer>
<key>firstVisibleLine</key>
<integer>0</integer>
<key>selectFrom</key>
<dict>
<key>column</key>
<integer>36</integer>
<key>line</key>
<integer>11</integer>
</dict>
<key>selectTo</key>
<dict>
<key>column</key>
<integer>6</integer>
<key>line</key>
<integer>10</integer>
</dict>
</dict>
<key>chapter-9/src/main/scala/sample/snippet/MoreAJAX.scala</key>
<dict>
<key>caret</key>
<dict>
<key>column</key>
<integer>5</integer>
<key>line</key>
<integer>25</integer>
</dict>
<key>firstVisibleColumn</key>
<integer>0</integer>
<key>firstVisibleLine</key>
<integer>12</integer>
</dict>
<key>chapter-9/src/main/webapp/lift_screen_ajax.html</key>
<dict>
<key>caret</key>
<dict>
<key>column</key>
<integer>43</integer>
<key>line</key>
<integer>2</integer>
</dict>
<key>columnSelection</key>
<false/>
<key>firstVisibleColumn</key>
<integer>0</integer>
<key>firstVisibleLine</key>
<integer>0</integer>
<key>selectFrom</key>
<dict>
<key>column</key>
<integer>32</integer>
<key>line</key>
<integer>2</integer>
</dict>
<key>selectTo</key>
<dict>
<key>column</key>
<integer>43</integer>
<key>line</key>
<integer>2</integer>
</dict>
</dict>
</dict>
<key>openDocuments</key>
<array>
<string>chapter-6/src/main/scala/sample/snippet/WizardExample.scala</string>
<string>chapter-6/src/main/scala/sample/snippet/LiftScreenExample.scala</string>
<string>chapter-9/src/main/webapp/lift_screen_ajax.html</string>
<string>chapter-9/src/main/scala/sample/snippet/MoreAJAX.scala</string>
<string>chapter-10/src/main/scala/sample/model/AggregationSample.scala</string>
<string>chapter-10/src/main/scala/sample/model/Account.scala</string>
<string>chapter-10/src/main/scala/sample/snippet/LiftScreenSample.scala</string>
<string>chapter-10/src/main/scala/net/liftweb/mapper/MappedSplitName.scala</string>
</array>
<dict/>
<key>showFileHierarchyDrawer</key>
<false/>
<key>windowFrame</key>
<string>{{195, 65}, {1240, 622}}</string>
<string>{{203, 244}, {1380, 814}}</string>
</dict>
</plist>
3 changes: 0 additions & 3 deletions project/build/LiftInActionProject.scala
Original file line number Diff line number Diff line change
Expand Up @@ -115,9 +115,6 @@ class LiftInActionProject(info: ProjectInfo) extends ParentProject(info) with Id
val remote = "se.scalablesolutions.akka" % "akka-remote" % "1.0" % "compile"
val hibem = "org.hibernate" % "hibernate-entitymanager" % "3.6.0.Final" % "compile"
val hibval = "org.hibernate" % "hibernate-validator-annotation-processor" % "4.1.0.Final" % "compile"
// val atomikos_api = "com.atomikos" % "transactions-api" % "3.2.3" % "compile"
// val atomikos_jta = "com.atomikos" % "transactions-jta" % "3.2.3" % "compile"
// val atomikos_txn = "com.atomikos" % "transactions" % "3.2.3" % "compile"
}

class ChapterFourteen(info: ProjectInfo)
Expand Down

0 comments on commit d208df9

Please sign in to comment.