Update cakephp files with new directory

.travis.yml

@@ -34,7 +34,7 @@ env:
     - TESTDIR=aspnet
     - TESTDIR=beego
     - TESTDIR=bottle
-    - TESTDIR=cake
+    - TESTDIR=cakephp
     - TESTDIR=compojure
     - TESTDIR=cowboy
     - TESTDIR=cpoll_cppsp

cakephp/benchmark_config

@@ -1,5 +1,5 @@
 {
-  "framework": "cake",
+  "framework": "cakephp",
   "tests": [{
     "default": {
       "setup_file": "setup",
@@ -12,14 +12,14 @@
       "approach": "Realistic",
       "classification": "Fullstack",
       "database": "MySQL",
-      "framework": "cake",
+      "framework": "cakephp",
       "language": "PHP",
       "orm": "Full",
       "platform": "PHP-FPM",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "cake",
+      "display_name": "CakePHP",
       "notes": "",
       "versus": "php"
     }

cakephp/deploy/cake

@@ -1,6 +1,6 @@
 <VirtualHost *:8080>
-  Alias /cake/ "/home/hyoung/FrameworkBenchmarks/cake/app/webroot/"
-  <Directory /home/hyoung/FrameworkBenchmarks/cake/app/webroot/>
+  Alias /cake/ "/home/hyoung/FrameworkBenchmarks/cakephp/app/webroot/"
+  <Directory /home/hyoung/FrameworkBenchmarks/cakephp/app/webroot/>
           Options Indexes FollowSymLinks MultiViews
           #AllowOverride None
           Order allow,deny

cakephp/deploy/nginx.conf

@@ -61,7 +61,7 @@ http {
         #    proxy_pass   http://127.0.0.1;
         #}
         
-        root /home/hyoung/FrameworkBenchmarks/cake/app/webroot/;
+        root /home/hyoung/FrameworkBenchmarks/cakephp/app/webroot/;
         index  index.php;
 
         location / {

cakephp/setup.py

@@ -7,20 +7,20 @@ from os.path import expanduser
 
 def start(args, logfile, errfile):
   fwroot = args.fwroot
-  setup_util.replace_text("cake/app/Config/database.php", "'host' => '.*',", "'host' => '" + args.database_host + "',")
-  setup_util.replace_text("cake/deploy/cake", "\".*\/FrameworkBenchmarks", "\"%s" % fwroot)
-  setup_util.replace_text("cake/deploy/cake", "Directory .*\/FrameworkBenchmarks", "Directory %s" % fwroot)
-  setup_util.replace_text("cake/deploy/nginx.conf", "root .*\/FrameworkBenchmarks", "root %s" % fwroot)
+  setup_util.replace_text("cakephp/app/Config/database.php", "'host' => '.*',", "'host' => '" + args.database_host + "',")
+  setup_util.replace_text("cakephp/deploy/cake", "\".*\/FrameworkBenchmarks", "\"%s" % fwroot)
+  setup_util.replace_text("cakephp/deploy/cake", "Directory .*\/FrameworkBenchmarks", "Directory %s" % fwroot)
+  setup_util.replace_text("cakephp/deploy/nginx.conf", "root .*\/FrameworkBenchmarks", "root %s" % fwroot)
 
   try:
     if os.name == 'nt':
-      setup_util.replace_text("cake/app/Config/core.php", "'Apc'", "'Wincache'")
-      subprocess.check_call('icacls "C:\\FrameworkBenchmarks\\cake" /grant "IIS_IUSRS:(OI)(CI)F"', shell=True, stderr=errfile, stdout=logfile)
-      subprocess.check_call('appcmd add site /name:PHP /bindings:http/*:8080: /physicalPath:"C:\\FrameworkBenchmarks\\cake\\app\\webroot"', shell=True, stderr=errfile, stdout=logfile)
+      setup_util.replace_text("cakephp/app/Config/core.php", "'Apc'", "'Wincache'")
+      subprocess.check_call('icacls "C:\\FrameworkBenchmarks\\cakephp" /grant "IIS_IUSRS:(OI)(CI)F"', shell=True, stderr=errfile, stdout=logfile)
+      subprocess.check_call('appcmd add site /name:PHP /bindings:http/*:8080: /physicalPath:"C:\\FrameworkBenchmarks\\cakephp\\app\\webroot"', shell=True, stderr=errfile, stdout=logfile)
       return 0
     #subprocess.check_call("sudo cp cake/deploy/cake /etc/apache2/sites-available/", shell=True)
     #subprocess.check_call("sudo a2ensite cake", shell=True)
-    subprocess.check_call("sudo chown -R www-data:www-data cake", shell=True, stderr=errfile, stdout=logfile)
+    subprocess.check_call("sudo chown -R www-data:www-data cakephp", shell=True, stderr=errfile, stdout=logfile)
     #subprocess.check_call("sudo /etc/init.d/apache2 start", shell=True)
     subprocess.check_call("sudo php-fpm --fpm-config config/php-fpm.conf -g $TROOT/deploy/php-fpm.pid", shell=True, stderr=errfile, stdout=logfile)
     subprocess.check_call("sudo /usr/local/nginx/sbin/nginx -c $TROOT/deploy/nginx.conf", shell=True, stderr=errfile, stdout=logfile)
@@ -36,7 +36,7 @@ def stop(logfile, errfile):
     subprocess.call("sudo kill -QUIT $( cat $TROOT/deploy/php-fpm.pid )", shell=True, stderr=errfile, stdout=logfile)
     #subprocess.check_call("sudo a2dissite cake", shell=True)
     #subprocess.check_call("sudo /etc/init.d/apache2 stop", shell=True)
-    subprocess.check_call("sudo chown -R $USER:$USER cake", shell=True, stderr=errfile, stdout=logfile)
+    subprocess.check_call("sudo chown -R $USER:$USER cakephp", shell=True, stderr=errfile, stdout=logfile)
     return 0
   except subprocess.CalledProcessError:
     return 1