Merge pull request #561 from fwbrasil/master

update play-activate-mysql to play 2.2 / update setup.py files to play 2.2

play-activate-mysql/project/Build.scala

@@ -1,21 +1,20 @@
 import sbt._
 import Keys._
-import PlayProject._
+import play.Project._
 
 object ApplicationBuild extends Build {
 
   val appName         = "play-activate-mysql"
   val appVersion      = "1.0-SNAPSHOT"
 
-  val activateVersion = "1.4.3"
+  val activateVersion = "1.4.4"
   val activateCore = "net.fwbrasil" %% "activate-core" % activateVersion
   val activateJdbc = "net.fwbrasil" %% "activate-jdbc" % activateVersion
-  val activatePlay = "net.fwbrasil" %% "activate-play" % "1.4.3-PLAY-2.1.2-RC1"
+  val activatePlay = "net.fwbrasil" %% "activate-play" % activateVersion
 
   val mysql = "mysql" % "mysql-connector-java" % "5.1.16"
 
   val appDependencies = Seq(
-    jdbc,
     mysql,
     activateCore,
     activateJdbc,
@@ -23,7 +22,7 @@ object ApplicationBuild extends Build {
   )
 
   val main = play.Project(appName, appVersion, appDependencies).settings(
-	resolvers ++= Seq("fwbrasil.net" at "http://fwbrasil.net/maven/")
+	  resolvers ++= Seq("fwbrasil.net" at "http://fwbrasil.net/maven/")
   )
 
 }

play-activate-mysql/project/build.properties

@@ -1 +1 @@
-sbt.version=0.12.3
+sbt.version=0.13.0

play-activate-mysql/project/plugins.sbt

@@ -5,4 +5,4 @@ logLevel := Level.Warn
 resolvers += "Typesafe repository" at "http://repo.typesafe.com/typesafe/releases/"
 
 // Use the Play sbt plugin for Play projects
-addSbtPlugin("play" % "sbt-plugin" % "2.1.2-RC1")
+addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.2.0")

play-activate-mysql/setup.py

@@ -8,34 +8,34 @@ from zipfile import ZipFile
 def start(args):
   setup_util.replace_text("play-activate-mysql/conf/application.conf", "jdbc:mysql:\/\/.*:3306", "jdbc:mysql://" + args.database_host + ":3306")
 
-  subprocess.check_call("play dist", shell=True, cwd="play-activate-mysql")
+  subprocess.check_call("play clean dist", shell=True, cwd="play-activate-mysql")
 
   if os.name == 'nt':
-    ZipFile("./play-activate-mysql/dist/play-activate-mysql-1.0-SNAPSHOT.zip").extractall("./play-activate-mysql/dist")
-    with open("./play-activate-mysql/dist/play-activate-mysql-1.0-SNAPSHOT/start.bat", "w+") as f:
+    ZipFile("./play-activate-mysql/target/universal/play-activate-mysql-1.0-SNAPSHOT.zip").extractall("./play-activate-mysql/target/universal")
+    with open("./play-activate-mysql/target/universal/play-activate-mysql-1.0-SNAPSHOT/bin/play-activate-mysql.bat", "w+") as f:
       f.write("java %1 -cp \"./lib/*;\" play.core.server.NettyServer .")
-    subprocess.Popen("start.bat", shell=True, cwd="play-activate-mysql/dist/play-activate-mysql-1.0-SNAPSHOT")
+    subprocess.Popen("play-activate-mysql.bat", shell=True, cwd="play-activate-mysql/target/universal/play-activate-mysql-1.0-SNAPSHOT/bin")
   else:
-    subprocess.check_call("unzip play-activate-mysql-1.0-SNAPSHOT.zip", shell=True, cwd="play-activate-mysql/dist")
-    subprocess.check_call("chmod +x start", shell=True, cwd="play-activate-mysql/dist/play-activate-mysql-1.0-SNAPSHOT")
-    subprocess.Popen("./start", shell=True, cwd="play-activate-mysql/dist/play-activate-mysql-1.0-SNAPSHOT")
+    subprocess.check_call("unzip play-activate-mysql-1.0-SNAPSHOT.zip", shell=True, cwd="play-activate-mysql/target/universal")
+    subprocess.check_call("chmod +x play-activate-mysql", shell=True, cwd="play-activate-mysql/target/universal/play-activate-mysql-1.0-SNAPSHOT/bin")
+    subprocess.Popen("./play-activate-mysql", shell=True, cwd="play-activate-mysql/target/universal/play-activate-mysql-1.0-SNAPSHOT/bin")
 
   return 0
 def stop():
   if os.name == 'nt':
-    with open("./play-activate-mysql/dist/play-activate-mysql-1.0-SNAPSHOT/RUNNING_PID") as f:
+    with open("./play-activate-mysql/target/universal/play-activate-mysql-1.0-SNAPSHOT/RUNNING_PID") as f:
       pid = int(f.read())
       os.kill(pid, 9)
   else:
     p = subprocess.Popen(['ps', 'aux'], stdout=subprocess.PIPE)
     out, err = p.communicate()
     for line in out.splitlines():
-      if './start' in line or ('play' in line and 'java' in line):
+      if 'NettyServer' in line:
         pid = int(line.split(None, 2)[1])
         os.kill(pid, 9)
 
   try:
-    os.remove("play-activate-mysql/RUNNING_PID")
+    os.remove("play-activate-mysql/target/universal/play-activate-mysql-1.0-SNAPSHOT/RUNNING_PID")
   except OSError:
     pass
 

play-scala-mongodb/setup.py

@@ -6,36 +6,36 @@ import os
 from zipfile import ZipFile
 
 def start(args):
-  setup_util.replace_text("play-scala-mongodb/conf/application.conf", "localhost:27017", "" + args.database_host + ":27017")
+  setup_util.replace_text("play-scala-mongodb/conf/application.conf", "jdbc:mysql:\/\/.*:3306", "jdbc:mysql://" + args.database_host + ":3306")
+
+  subprocess.check_call("play clean dist", shell=True, cwd="play-scala-mongodb")
 
-  subprocess.check_call("play dist", shell=True, cwd="play-scala-mongodb")
-  
   if os.name == 'nt':
-    ZipFile("./play-scala-mongodb/dist/play-scala-mongodb-1.0-SNAPSHOT.zip").extractall("./play-scala-mongodb/dist")
-    with open("./play-scala-mongodb/dist/play-scala-mongodb-1.0-SNAPSHOT/start.bat", "w+") as f:
+    ZipFile("./play-scala-mongodb/target/universal/play-scala-mongodb-1.0-SNAPSHOT.zip").extractall("./play-scala-mongodb/target/universal")
+    with open("./play-scala-mongodb/target/universal/play-scala-mongodb-1.0-SNAPSHOT/bin/play-scala-mongodb.bat", "w+") as f:
       f.write("java %1 -cp \"./lib/*;\" play.core.server.NettyServer .")
-    subprocess.Popen("start.bat", shell=True, cwd="play-scala-mongodb/dist/play-scala-mongodb-1.0-SNAPSHOT")
+    subprocess.Popen("play-scala-mongodb.bat", shell=True, cwd="play-scala-mongodb/target/universal/play-scala-mongodb-1.0-SNAPSHOT/bin")
   else:
-    subprocess.check_call("unzip play-scala-mongodb-1.0-SNAPSHOT.zip", shell=True, cwd="play-scala-mongodb/dist")
-    subprocess.check_call("chmod +x start", shell=True, cwd="play-scala-mongodb/dist/play-scala-mongodb-1.0-SNAPSHOT")
-    subprocess.Popen("./start", shell=True, cwd="play-scala-mongodb/dist/play-scala-mongodb-1.0-SNAPSHOT")
+    subprocess.check_call("unzip play-scala-mongodb-1.0-SNAPSHOT.zip", shell=True, cwd="play-scala-mongodb/target/universal")
+    subprocess.check_call("chmod +x play-scala-mongodb", shell=True, cwd="play-scala-mongodb/target/universal/play-scala-mongodb-1.0-SNAPSHOT/bin")
+    subprocess.Popen("./play-scala-mongodb", shell=True, cwd="play-scala-mongodb/target/universal/play-scala-mongodb-1.0-SNAPSHOT/bin")
 
   return 0
 def stop():
   if os.name == 'nt':
-    with open("./play-scala-mongodb/dist/play-scala-mongodb-1.0-SNAPSHOT/RUNNING_PID") as f:
+    with open("./play-scala-mongodb/target/universal/play-scala-mongodb-1.0-SNAPSHOT/RUNNING_PID") as f:
       pid = int(f.read())
       os.kill(pid, 9)
   else:
     p = subprocess.Popen(['ps', 'aux'], stdout=subprocess.PIPE)
     out, err = p.communicate()
     for line in out.splitlines():
-      if './start' in line or ('play' in line and 'java' in line):
+      if 'NettyServer' in line:
         pid = int(line.split(None, 2)[1])
         os.kill(pid, 9)
-        
+
   try:
-    os.remove("play-scala-mongodb/RUNNING_PID")
+    os.remove("play-scala-mongodb/target/universal/play-scala-mongodb-1.0-SNAPSHOT/RUNNING_PID")
   except OSError:
     pass
 

play-slick/setup.py

@@ -8,34 +8,34 @@ from zipfile import ZipFile
 def start(args):
   setup_util.replace_text("play-slick/conf/application.conf", "jdbc:mysql:\/\/.*:3306", "jdbc:mysql://" + args.database_host + ":3306")
 
-  subprocess.check_call("play dist", shell=True, cwd="play-slick")
+  subprocess.check_call("play clean dist", shell=True, cwd="play-slick")
 
   if os.name == 'nt':
-    ZipFile("./play-slick/dist/play-slick-1.0-SNAPSHOT.zip").extractall("./play-slick/dist")
-    with open("./play-slick/dist/play-slick-1.0-SNAPSHOT/start.bat", "w+") as f:
+    ZipFile("./play-slick/target/universal/play-slick-1.0-SNAPSHOT.zip").extractall("./play-slick/target/universal")
+    with open("./play-slick/target/universal/play-slick-1.0-SNAPSHOT/bin/play-slick.bat", "w+") as f:
       f.write("java %1 -cp \"./lib/*;\" play.core.server.NettyServer .")
-    subprocess.Popen("start.bat", shell=True, cwd="play-slick/dist/play-slick-1.0-SNAPSHOT")
+    subprocess.Popen("play-slick.bat", shell=True, cwd="play-slick/target/universal/play-slick-1.0-SNAPSHOT/bin")
   else:
-    subprocess.check_call("unzip play-slick-1.0-SNAPSHOT.zip", shell=True, cwd="play-slick/dist")
-    subprocess.check_call("chmod +x start", shell=True, cwd="play-slick/dist/play-slick-1.0-SNAPSHOT")
-    subprocess.Popen("./start", shell=True, cwd="play-slick/dist/play-slick-1.0-SNAPSHOT")
+    subprocess.check_call("unzip play-slick-1.0-SNAPSHOT.zip", shell=True, cwd="play-slick/target/universal")
+    subprocess.check_call("chmod +x play-slick", shell=True, cwd="play-slick/target/universal/play-slick-1.0-SNAPSHOT/bin")
+    subprocess.Popen("./play-slick", shell=True, cwd="play-slick/target/universal/play-slick-1.0-SNAPSHOT/bin")
 
   return 0
 def stop():
   if os.name == 'nt':
-    with open("./play-slick/dist/play-slick-1.0-SNAPSHOT/RUNNING_PID") as f:
+    with open("./play-slick/target/universal/play-slick-1.0-SNAPSHOT/RUNNING_PID") as f:
       pid = int(f.read())
       os.kill(pid, 9)
   else:
-    p = subprocess.Popen(['ps', 'aux'], stdout=subprocess.PIPE)
+    p = subprocess.Popen(['ps', 'ef'], stdout=subprocess.PIPE)
     out, err = p.communicate()
     for line in out.splitlines():
-      if './start' in line or ('play' in line and 'java' in line):
+      if 'NettyServer' in line:
         pid = int(line.split(None, 2)[1])
         os.kill(pid, 9)
 
   try:
-    os.remove("play-slick/RUNNING_PID")
+    os.remove("play-slick/target/universal/play-slick-1.0-SNAPSHOT/RUNNING_PID")
   except OSError:
     pass