Merge lp:~peter-kovac11/play/play-scala-console-improvements into lp:play/1.1

[Guillaume Bort]

[pk11 (peter-kovac11)]

review: Approve

=== modified file 'modules/scala/commands.py'
--- modules/scala/commands.py	2009-11-13 16:12:44 +0000
+++ modules/scala/commands.py	2009-11-23 10:10:31 +0000
@@ -9,6 +9,7 @@
      	do_java()
 	# replace last element with the console app
 	java_cmd[len(java_cmd)-1]="play.console.Console"
+	java_cmd.insert(2, '-Xmx256M -Xms32M')
   	subprocess.call(java_cmd, env=os.environ)
      	print
 	sys.exit(0)

=== modified file 'modules/scala/src/play/console/Console.scala'
--- modules/scala/src/play/console/Console.scala	2009-11-13 16:12:44 +0000
+++ modules/scala/src/play/console/Console.scala	2009-11-23 10:10:31 +0000
@@ -2,16 +2,17 @@
 import scala.tools.nsc.MainGenericRunner
 import java.io.File
 import play.Play
-
+import play.db.jpa.JPAPlugin
 object Console {
    def main(args : Array[String]) {
      val root = new File(System.getProperty("application.path"));
      Play.init(root, System.getProperty("play.id", ""));
      println("~")
      println("~ Starting up, please be patient")
-     println("~ Ctrl+C to stop")
+     println("~ Ctrl+D to stop")
      println("~")
      Play.start()
+     JPAPlugin.startTx(false)  
      //TODO:fix readline support
      //now that the app is ready, launch scala REPL  
      try {	
@@ -20,6 +21,7 @@
 	case e:Exception=>
      }
      // After the repl exits, kill the scala script
+     JPAPlugin.closeTx(false)
      exit(0)
    }
 }