Moved play-java-jpa to play2-java/play2-java-jpa

frameworks/Java/play-java-jpa/benchmark_config

@@ -1,24 +0,0 @@
-{
-  "framework": "play",
-  "tests": [{
-    "jpa": {
-      "setup_file": "setup",
-      "db_url": "/db",
-      "query_url": "/db?queries=",
-      "port": 9000,
-      "approach": "Realistic",
-      "classification": "Fullstack",
-      "database": "MySQL",
-      "framework": "play2",
-      "language": "Java",
-      "orm": "Full",
-      "platform": "Netty",
-      "webserver": "None",
-      "os": "Linux",
-      "database_os": "Linux",
-      "display_name": "play-java-jpa",
-      "notes": "JPA alternate",
-      "versus": "netty"
-    }
-  }]
-}

frameworks/Java/play-java-jpa/install.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-fw_depends play2 java

frameworks/Java/play-java-jpa/setup.py

@@ -1,34 +0,0 @@
-import os
-import signal
-import subprocess
-
-dirname = projname = 'play-java'
-is_windows = args.os.lower() == "windows"
-cmd_suffix = '.bat' if is_windows else ''
-
-def start(args, logfile, errfile):
-  kill_running_process() # Kill the running process and delete the 
-                         # RUNNING_PID file (if any). With any luck no 
-                         # new process has picked up the same PID.
-
-  subprocess.call(['sbt'+cmd_suffix,"stage"], stdin=subprocess.PIPE, cwd=dirname, stderr=errfile, stdout=logfile)
-  subprocess.Popen([os.path.join("target","universal","stage","bin",projname+cmd_suffix)], shell=True, stdin=subprocess.PIPE, cwd=dirname, stderr=errfile, stdout=logfile)
-  return 0
-
-def stop(logfile, errfile):
-  kill_running_process()  
-  return 0
-
-def kill_running_process():
-  pidfile = os.path.join(dirname,"target","universal","stage","RUNNING_PID")
-  try:
-    with open(pidfile) as f:
-      pid = int(f.read())
-      os.kill(pid, signal.SIGTERM)
-  except:
-    pass
-
-  try:
-    os.remove(pidfile)
-  except OSError:
-    pass

frameworks/Java/play2-java/benchmark_config

@@ -38,6 +38,25 @@
         "port": "9000", 
         "db_url": "/db", 
         "query_url": "/queries?queries="
+      }, 
+      "java-jpa": {
+        "display_name": "play2-java-jpa", 
+        "setup_file": "setup_java_jpa", 
+        "framework": "play2", 
+        "language": "Java", 
+        "orm": "JPA", 
+        "os": "Linux", 
+        "database": "MySQL", 
+        "approach": "Realistic", 
+        "classification": "Fullstack", 
+        "platform": "Netty", 
+        "webserver": "None", 
+        "database_os": "Linux", 
+        "notes": "", 
+        "versus": "netty", 
+        "port": "9000", 
+        "db_url": "/db", 
+        "query_url": "/queries?queries="
       }
     }
   ]

frameworks/Java/play2-java/generate_config.py

@@ -11,6 +11,7 @@ import collections, json, os, textwrap
 configurations = [
   ('Java',  None,    ['Linux'],            ['json']),
   ('Java',  'Ebean', ['Linux'],            ['db', 'query']),
+  ('Java',  'JPA',   ['Linux'],            ['db', 'query']),
   ('Scala', None,    ['Linux'],            ['json']),
   ('Scala', 'Anorm', ['Linux', 'Windows'], ['db', 'query', 'fortune', 'update']),
 ]
@@ -87,4 +88,4 @@ for lang, _ in langs.iteritems():
       'framework': 'play2',
       'tests': [lang_test_configs[lang]]
     }, indent=2)
-    f.write(json_str)
+    f.write(json_str)

frameworks/Java/play-java-jpa/build.sbt → frameworks/Java/play2-java/play2-java-jpa/build.sbt

@@ -2,10 +2,10 @@ name := "play-java-jpa"
 
 version := "1.0-SNAPSHOT"
 
-lazy val root = (project in file(".")).enablePlugins(PlayJava)
-
 scalaVersion := "2.11.2"
 
+lazy val root = (project in file(".")).enablePlugins(PlayJava)
+
 libraryDependencies ++= Seq(
   javaJdbc,
   javaJpa,

frameworks/Java/play-java-jpa/conf/META-INF/persistence.xml → frameworks/Java/play2-java/play2-java-jpa/conf/META-INF/persistence.xml

@@ -4,7 +4,7 @@
              version="2.0">
              
     <persistence-unit name="defaultPersistenceUnit" transaction-type="RESOURCE_LOCAL">
-        <provider>org.hibernate.ejb.HibernatePersistence</provider>
+        <provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
         <non-jta-data-source>DefaultDS</non-jta-data-source>
         <properties>
             <property name="hibernate.dialect" value="org.hibernate.dialect.MySQLDialect"/>

frameworks/Java/play2-java/setup_java_jpa.py

@@ -0,0 +1,6 @@
+
+# This file was generated by frameworks/Java/play2-java/generate_config.py.
+# Do not edit this file directly, use the script to regenerate.
+from .setup_common import make_setup_for_dir
+
+make_setup_for_dir(globals(), 'play2-java-jpa')