Merge pull request #800 from raphaelbauer/master

Ninja: Bump to Ninja 3.3.1, drop Resin support

.travis.yml

@@ -68,7 +68,6 @@ env:
     - "TESTDIR=Java/grizzly-jersey"
     - "TESTDIR=Java/jetty-servlet"
     - "TESTDIR=Java/netty"
-    - "TESTDIR=Java/ninja-resin"
     - "TESTDIR=Java/ninja-standalone"
     - "TESTDIR=Java/play-java-jpa"
     - "TESTDIR=Java/play1"

frameworks/Java/ninja-resin/.gitignore

@@ -1,20 +0,0 @@
-.DS_Store
-*.pyc
-installs/
-*.log
-*.lock
-node_modules/
-*.war
-target/
-*.out
-*.class
-mods/
-/.settings
-/.buildpath
-/.project
-*.iml
-.idea/
-.hsenv/
-azure.err
-*~
-/.classpath

frameworks/Java/ninja-resin/README.md

@@ -1,37 +0,0 @@
-# Ninja Framework Benchmarking Test
-
-This is the [Ninja](http://www.ninjaframework.org/) portion of a [benchmarking test suite](../) comparing a variety of web development platforms.
-
-## IMPORTANT!!!!
-
-ninja-resin is in essence just a copy of ninja-standalone with different datasources.
-That means all stuff you change in ninja-resin should also be applied to 
-ninja-standalone and vice-versa.
-
-
-## Test URLs
-### JSON Encoding Test
-
-http://localhost:8080/ninja/json
-
-### Single Query Test
-
-http://localhost:8080/ninja/db
-
-### Multiple Queries Test
-
-http://localhost:8080/ninja/queries?5
-
-### Fortunes Test
-
-http://localhost:8080/ninja/fotunes
-
-### Update Test
-
-http://localhost:8080/ninja/update?5
-
-### Plaintext Test
-
-http://localhost:8080/ninja/plaintext
-
-

frameworks/Java/ninja-resin/bash_profile.sh

@@ -1,2 +0,0 @@
-export JAVA_HOME=/usr/lib/jvm/java-1.7.0-openjdk-amd64
-export RESIN_HOME=${IROOT}/resin-4.0.36

frameworks/Java/ninja-resin/benchmark_config

@@ -1,28 +0,0 @@
-{
-  "framework": "ninja-resin",
-  "tests": [{
-    "default": {
-      "setup_file": "setup",
-      "json_url": "/ninja/json",
-      "db_url": "/ninja/db",
-      "query_url": "/ninja/queries?queries=",
-      "fortune_url": "/ninja/fortunes",
-      "update_url": "/ninja/update?queries=",
-      "plaintext_url": "/ninja/plaintext",
-      "port": 8080,
-      "approach": "Realistic",
-      "classification": "Fullstack",
-      "database": "MySQL",
-      "framework": "ninja",
-      "language": "Java",
-      "orm": "Full",
-      "platform": "Servlet",
-      "webserver": "Resin",
-      "os": "Linux",
-      "database_os": "Linux",
-      "display_name": "ninja-resin",
-      "notes": "",
-      "versus": "servlet"
-    }
-  }]
-}

frameworks/Java/ninja-resin/changelog.md

@@ -1,16 +0,0 @@
-Changelog 
-=========
-
-Because ninja-standalone and ninja-resin are almost identical this changelog
-applies to both.
-
- * 2013-01-08 Performance improvement for Json Afterburner now active by default (from 2.5.1 onwards)
- * 2013-01-08 Performance improvement for Db: Replaced @Transactional with @UnitOfWork for read only db operations (from 2.5.1 onwards)
- * 2013-01-08 Reformatted and restructured some code
- * 2013-01-08 Make sure Ninja is running in production mode (faster templates)
- * 2013-01-08 Bump to Ninja 2.5.1
- * 2013-12-13 Removed route that is never used in tests.
- * 2013-12-14 Bump to Ninja 2.4.0.
- * 2013-12-14 Added testcases and support for h2 in memory to develop locally with
-              in memory db.
- * 2013-12-14 Added support for "updates" benchmark.

frameworks/Java/ninja-resin/install.sh

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

frameworks/Java/ninja-resin/pom.xml

@@ -1,196 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.ninjaframework.techempower</groupId>
-    <artifactId>ninja-resin</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
-    <name>ninja-resin</name>
-    <description>Ninja test for the TechEmpower/FrameworkBenchmarks project</description>
-
-    <properties>
-        <java.version>1.7</java.version>
-        <ninja.version>2.5.1</ninja.version>
-        <mysql.version>5.1.26</mysql.version>
-        <jetty.version>9.0.5.v20130815</jetty.version>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-
-    <dependencies>
-        
-        <!-- Ninja uses Guava 15.0 and Guava 15.0 by default has problems
-             with Resin (and other EE6 containers). Therefore we
-             force the usage of the following dependency which overwrites
-             the original one.
-             More here: https://code.google.com/p/guava-libraries/issues/detail?id=1527
-             -->
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-            <version>15.0</version>
-            <classifier>cdi1.0</classifier>
-        </dependency>
-
-        <dependency>
-            <groupId>org.ninjaframework</groupId>
-            <artifactId>ninja-standalone</artifactId>
-            <version>${ninja.version}</version>
-            <exclusions>
-                <!-- See the comment above why we exclude guava -->
-                <exclusion>
-                    <groupId>com.google.guava </groupId>
-                    <artifactId>guava</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-            <version>3.0.1</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.ninjaframework</groupId>
-            <artifactId>ninja-test-utilities</artifactId>
-            <version>${ninja.version}</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-            <version>${mysql.version}</version>
-        </dependency>
-                
-        <dependency>
-            <groupId>com.h2database</groupId>
-            <artifactId>h2</artifactId>
-            <version>1.3.174</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.1</version>
-                <configuration>
-                    <source>${java.version}</source>
-                    <target>${java.version}</target>
-                </configuration>
-            </plugin>
-			
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-war-plugin</artifactId>
-                <version>2.4</version>
-                <configuration>
-                    <warName>ninja</warName>
-                    <!-- Because seomhow in Techempower's platform the nasty
-                         guava default version still gets included we exlude
-                         it by force in the war file -->
-                    <packagingExcludes>WEB-INF/lib/guava-15.0.jar</packagingExcludes>
-                </configuration>
-            </plugin>
-            
-            <plugin>
-                <groupId>org.ninjaframework</groupId>
-                <artifactId>ninja-maven-plugin</artifactId>
-                <version>${ninja.version}</version>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-enforcer-plugin</artifactId>
-                <version>1.0</version>
-                <executions>
-                    <execution>
-                        <id>enforce-banned-dependencies</id>
-                        <goals>
-                            <goal>enforce</goal>
-                        </goals>
-                        <configuration>
-                            <rules>
-                                <bannedDependencies>
-                                    <excludes>
-                                        <exclude>commons-logging</exclude>
-                                    </excludes>
-                                </bannedDependencies>
-                            </rules>
-                            <fail>true</fail>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.eclipse.jetty</groupId>
-                <artifactId>jetty-maven-plugin</artifactId>
-                <version>${jetty.version}</version>
-                <configuration>
-                    <contextPath>/</contextPath>
-                    <stopKey>stop</stopKey>
-                    <stopPort>8889</stopPort>
-                    <scanIntervalSeconds>1</scanIntervalSeconds>
-                    <reload>automatic</reload>
-                    <scanTargetPatterns>
-                        <scanTargetPattern>
-                            <directory>target/classes</directory>
-                            <includes>
-                                <include>**/*</include>
-                            </includes>
-                            <excludes>
-                                <exclude>**/*.ftl.html</exclude>
-                                <exclude>assets/**</exclude>
-                            </excludes>
-                        </scanTargetPattern>
-                    </scanTargetPatterns>
-                </configuration>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-deploy-plugin</artifactId>
-                <version>2.7</version>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
-
-            <plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <version>2.4</version>
-                <configuration>
-                    <descriptorRefs>
-                        <descriptorRef>jar-with-dependencies</descriptorRef>
-                    </descriptorRefs>
-                    <archive>
-                        <manifest>
-                            <mainClass>ninja.standalone.NinjaJetty</mainClass>
-                        </manifest>
-                    </archive>
-                </configuration>
-            </plugin>
-        </plugins>
-
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-                <includes>
-                    <include>**/*</include>
-                </includes>
-                <excludes>
-                    <exclude>**/*.java</exclude>
-                </excludes>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-                <includes>
-                    <include>**/*</include>
-                </includes>
-            </resource>
-        </resources>
-    </build>
-</project>

frameworks/Java/ninja-resin/setup.py

@@ -1,32 +0,0 @@
-import subprocess
-import sys
-import setup_util
-import os
-
-def start(args, logfile, errfile):
-  setup_util.replace_text("ninja-resin/src/main/webapp/WEB-INF/resin-web.xml", "mysql:\/\/.*:3306", "mysql://" + args.database_host + ":3306")
-  
-  try:
-    subprocess.check_call("mvn clean compile war:war", shell=True, cwd="ninja-resin", stderr=errfile, stdout=logfile)
-
-    if os.name == 'nt':
-      subprocess.check_call('rmdir /S /Q "%RESIN_HOME%\\webapps\\"', shell=True, stderr=errfile, stdout=logfile)
-      subprocess.check_call('mkdir "%RESIN_HOME%\\webapps\\"', shell=True, stderr=errfile, stdout=logfile)
-      subprocess.check_call('copy ninja-resin\\target\\ninja.war "%RESIN_HOME%\\webapps\\ninja.war"', shell=True, stderr=errfile, stdout=logfile)
-      subprocess.check_call('"%RESIN_HOME%\\bin\\start.bat"', shell=True, stderr=errfile, stdout=logfile)
-    else:
-      subprocess.check_call("rm -rf $RESIN_HOME/webapps/*", shell=True, stderr=errfile, stdout=logfile)
-      subprocess.check_call("cp ninja-resin/target/ninja.war $RESIN_HOME/webapps/ninja.war", shell=True, stderr=errfile, stdout=logfile)
-      subprocess.check_call("$RESIN_HOME/bin/resinctl start", shell=True, stderr=errfile, stdout=logfile)
-    return 0
-  except subprocess.CalledProcessError:
-    return 1
-def stop(logfile, errfile):
-  try:
-    if os.name == 'nt':
-      subprocess.check_call('"%RESIN_HOME%\\bin\\stop.bat"', shell=True, stderr=errfile, stdout=logfile)
-    else:
-      subprocess.check_call("$RESIN_HOME/bin/resinctl shutdown", shell=True, stderr=errfile, stdout=logfile)
-    return 0
-  except subprocess.CalledProcessError:
-    return 1

frameworks/Java/ninja-resin/source_code

@@ -1,35 +0,0 @@
-./ninja/src/
-./ninja/src/main/
-./ninja/src/main/java/
-./ninja/src/main/java/conf
-./ninja/src/main/java/conf/Routes.java
-./ninja/src/main/java/conf/application.conf
-./ninja/src/main/java/conf/messages.properties
-./ninja/src/main/java/hello/
-./ninja/src/main/java/hello/controllers/
-./ninja/src/main/java/hello/controllers/HelloDbController.java
-./ninja/src/main/java/hello/controllers/HelloFortuneController.java
-./ninja/src/main/java/hello/controllers/HelloJsonController.java
-./ninja/src/main/java/hello/controllers/HelloPlaintextController.java
-./ninja/src/main/java/hello/dao/
-./ninja/src/main/java/hello/dao/FortuneDao.java
-./ninja/src/main/java/hello/dao/WorldDao.java
-./ninja/src/main/java/hello/model/
-./ninja/src/main/java/hello/model/Fortune.java
-./ninja/src/main/java/hello/model/World.java
-./ninja/src/main/java/hello/views/
-./ninja/src/main/java/hello/views/HelloFortuneController/
-./ninja/src/main/java/hello/views/HelloFortuneController/index.ftl.html
-./ninja/src/main/resources/
-./ninja/src/main/resources/META-INF/
-./ninja/src/main/resources/META-INF/persistence.xml
-./ninja/src/main/resources/conf/
-./ninja/src/main/resources/conf/application.conf
-./ninja/src/main/resources/conf/messages.properties
-./ninja/src/main/resources/ehcache.xml
-./ninja/src/main/resources/logback.xml
-./ninja/src/main/webapp/
-./ninja/src/main/webapp/WEB-INF/
-./ninja/src/main/webapp/WEB-INF/resin-web.xml
-./ninja/src/main/webapp/WEB-INF/web.xml
-

frameworks/Java/ninja-resin/src/main/java/conf/Routes.java

@@ -1,35 +0,0 @@
-package conf;
-
-import com.google.inject.Inject;
-import controllers.HelloDbController;
-import controllers.HelloFortuneController;
-import controllers.HelloJsonController;
-import controllers.HelloPlaintextController;
-import controllers.SetupController;
-import ninja.Router;
-import ninja.application.ApplicationRoutes;
-import ninja.utils.NinjaProperties;
-
-public class Routes implements ApplicationRoutes {
-
-    @Inject
-    NinjaProperties ninjaProperties;
-
-    @Override
-    public void init(Router router) {
-
-        router.GET().route("/plaintext").with(HelloPlaintextController.class, "index");
-        router.GET().route("/json").with(HelloJsonController.class, "index");
-        router.GET().route("/queries").with(HelloDbController.class, "multiGet");
-        router.GET().route("/db").with(HelloDbController.class, "singleGet");
-        router.GET().route("/fortunes").with(HelloFortuneController.class, "index");
-        router.GET().route("/update").with(HelloDbController.class, "update");
-
-        // This route is only active when developing the app in dev mode
-        // e.g. when calling "mvn ninja:run".
-        if (ninjaProperties.isDev()) {
-            router.GET().route("/setupData").with(SetupController.class, "setupData");
-        }
-
-    }
-}

frameworks/Java/ninja-resin/src/main/java/conf/application.conf

@@ -1,49 +0,0 @@
-##############################################################################
-# The main properties file to configure your application
-#
-# Properties can be prefixed by "%".
-# "%"" matches a mode you can set as system property. For instance when you
-# are using maven you can do: mvn -Dmode=test jetty:run
-#
-# Using that the following property:
-# %test.myproperty=test property
-# would overwrite the property
-# myproperty=my property
-#
-# You can define as many environments as you want. Simply set them in the mode.
-##############################################################################
-application.name=ninja test application
-
-application.cookie.prefix=NINJA
-
-#ISO Language Code, optionally followed by a valid ISO Country Code. 
-application.languages=en
-
-application.session.expire_time_in_seconds=3600
-application.session.send_only_if_changed=true
-application.session.transferred_over_https_only=false
-
-##############################################################################
-# Configure JPA
-# simply tell Ninja which persistence unit to use.
-# The persistence units are defined at META-INF/persistence.xml
-##############################################################################
-ninja.migration.run=false
-
-%prod.ninja.jpa.persistence_unit_name = resin
-
-## for eveloping locally:
-%dev.ninja.jpa.persistence_unit_name = h2
-## we are using a database stored in a file (in tests it is an in memory db)
-%dev.db.connection.url=jdbc:h2:target/h2database
-%dev.db.connection.username=ra
-%dev.db.connection.password=
-
-## for testing
-%test.ninja.jpa.persistence_unit_name = h2
-# in memory database for testing...
-%test.db.connection.url=jdbc:h2:mem:
-%test.db.connection.username=ra
-%test.db.connection.password=
-
-application.secret = b9z4AQO0huDRrJXFVjNiNXmSVqPSbcqjEiNjdPVBApb8n9GnxVjWBr9jp8tRfe73

frameworks/Java/ninja-resin/src/main/java/conf/messages.properties

@@ -1,17 +0,0 @@
-#
-# Copyright (C) 2012 the original author or authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# This file is utf-8

frameworks/Java/ninja-resin/src/main/java/controllers/HelloDbController.java

@@ -1,78 +0,0 @@
-package controllers;
-
-import dao.WorldDao;
-import model.World;
-
-import java.util.Random;
-import java.util.concurrent.ThreadLocalRandom;
-
-import ninja.Result;
-import ninja.Results;
-
-import com.google.inject.Inject;
-import com.google.inject.Singleton;
-import com.google.inject.persist.Transactional;
-import ninja.jpa.UnitOfWork;
-import ninja.params.Param;
-
-@Singleton
-public class HelloDbController {
-
-    private static final int DB_ROWS = 10000;
-    private final Random random = ThreadLocalRandom.current();
-
-    @Inject
-    WorldDao worldDao;
-
-    @UnitOfWork
-    public Result singleGet() {
-        return Results.json().render(getRandomWorld());
-    }
-
-    @UnitOfWork
-    public Result multiGet(@Param("queries") Integer queries) {
-        if (queries == null || queries < 1) {
-            queries = 1;
-        }
-        if (queries > 500) {
-            queries = 500;
-        }
-
-        final World[] worlds = new World[queries];
-
-        for (int i = 0; i < queries; i++) {
-            worlds[i] = getRandomWorld();
-        }
-
-        return Results.json().render(worlds);
-    }
-
-    @Transactional
-    public Result update(@Param("queries") Integer queries) {
-        if (queries == null || queries < 1) {
-            queries = 1;
-        }
-        if (queries > 500) {
-            queries = 500;
-        }
-
-        final World[] worlds = new World[queries];
-
-        for (int i = 0; i < queries; i++) {
-            worlds[i] = getRandomWorld();
-        }
-
-        // now update stuff:
-        for (World world : worlds) {
-            world.randomNumber = random.nextInt();
-            worldDao.put(world);
-        }
-
-        return Results.json().render(worlds);
-    }
-
-    private World getRandomWorld() {
-        return worldDao.get(random.nextInt(DB_ROWS) + 1);
-    }
-
-}

frameworks/Java/ninja-resin/src/main/java/controllers/HelloFortuneController.java

@@ -1,30 +0,0 @@
-package controllers;
-
-import dao.FortuneDao;
-import model.Fortune;
-
-import java.util.Collections;
-import java.util.List;
-
-import ninja.Result;
-import ninja.Results;
-
-import com.google.inject.Inject;
-import com.google.inject.Singleton;
-import ninja.jpa.UnitOfWork;
-
-@Singleton
-public class HelloFortuneController {
-
-    @Inject
-    FortuneDao fortuneDao;
-
-    @UnitOfWork
-    public Result index() {
-        List<Fortune> fortunes = fortuneDao.getAll();
-        fortunes.add(new Fortune(0, "Additional fortune added at request time."));
-        Collections.sort(fortunes);
-
-        return Results.html().render("fortunes", fortunes);
-    }
-}

frameworks/Java/ninja-resin/src/main/java/controllers/HelloJsonController.java

@@ -1,23 +0,0 @@
-package controllers;
-
-import ninja.Result;
-import ninja.Results;
-
-import com.google.inject.Singleton;
-
-@Singleton
-public class HelloJsonController {
-
-    public Result index() {
-	return Results.json().render(new Message("Hello, World!"));
-    }
-
-    public final static class Message {
-
-	public final String message;
-
-	public Message(String message) {
-	    this.message = message;
-	}
-    }
-}

frameworks/Java/ninja-resin/src/main/java/controllers/HelloPlaintextController.java

@@ -1,13 +0,0 @@
-package controllers;
-
-import ninja.Result;
-import ninja.Results;
-
-import com.google.inject.Singleton;
-
-@Singleton
-public class HelloPlaintextController {
-    public Result index() {
-	return Results.text().renderRaw("Hello, world!");
-    }
-}

frameworks/Java/ninja-resin/src/main/java/controllers/SetupController.java

@@ -1,35 +0,0 @@
-package controllers;
-
-import dao.WorldDao;
-import model.World;
-
-import java.util.Random;
-import java.util.concurrent.ThreadLocalRandom;
-
-import ninja.Result;
-import ninja.Results;
-
-import com.google.inject.Inject;
-import com.google.inject.Singleton;
-import dao.SetupDao;
-
-@Singleton
-public class SetupController {
-
-    @Inject
-    SetupDao setupDao;
-
-    public Result setupData() {
-        
-        setupDao.deleteAllData();
-        
-        setupDao.generateWorldsForTest();
-        setupDao.generateFortunesForTest();
-        
-        return Results.text().render("setup done");
-        
-    }
-    
-   
-
-}

frameworks/Java/ninja-resin/src/main/java/dao/FortuneDao.java

@@ -1,29 +0,0 @@
-package dao;
-
-import model.Fortune;
-
-import java.util.List;
-
-import javax.persistence.EntityManager;
-import javax.persistence.Query;
-
-import com.google.inject.Inject;
-import com.google.inject.Provider;
-import com.google.inject.Singleton;
-
-@Singleton
-public class FortuneDao {
-
-    @Inject
-    Provider<EntityManager> entitiyManagerProvider;
-
-    public List<Fortune> getAll() {
-        EntityManager entityManager = entitiyManagerProvider.get();
-
-        Query q = entityManager.createQuery("SELECT x FROM Fortune x");
-        List<Fortune> fortunes = q.getResultList();
-
-        return fortunes;
-    }
-
-}

frameworks/Java/ninja-resin/src/main/java/dao/SetupDao.java

@@ -1,71 +0,0 @@
-package dao;
-
-import model.Fortune;
-
-import javax.persistence.EntityManager;
-
-import com.google.inject.Inject;
-import com.google.inject.Provider;
-import com.google.inject.Singleton;
-import com.google.inject.persist.Transactional;
-import java.util.List;
-import javax.persistence.Query;
-import model.World;
-
-/**
- * This class is just for testing. Has nothing to do with the TechEmpower test
- * itself...
- *
- * @author ra
- */
-@Singleton
-public class SetupDao {
-
-    @Inject
-    Provider<EntityManager> entitiyManagerProvider;
-
-    @Transactional
-    public void deleteAllData() {
-
-        entitiyManagerProvider.get().createQuery("DELETE FROM World");
-        entitiyManagerProvider.get().createQuery("DELETE FROM Fortune");
-
-    }
-
-    @Transactional
-    public void generateWorldsForTest() {
-
-        for (int i = 0; i < 10000; i++) {
-
-            World world = new World();
-            world.randomNumber = i; // not really a random number. But we can test with that...
-            entitiyManagerProvider.get().persist(world);
-
-        }
-
-    }
-
-    @Transactional
-    public void generateFortunesForTest() {
-
-        {
-
-            Fortune fortune = new Fortune();
-            // dummy message => just to make sure utf-8 works.
-            fortune.message = "レームワークのベンチマーク";
-            entitiyManagerProvider.get().persist(fortune);
-
-        }
-
-        {
-
-            Fortune fortune = new Fortune();
-            // dummy message => just to make sure utf-8 works.
-            fortune.message = "<script>I want to be escaped</script>";
-            entitiyManagerProvider.get().persist(fortune);
-
-        }
-
-    }
-
-}

frameworks/Java/ninja-resin/src/main/java/dao/WorldDao.java

@@ -1,26 +0,0 @@
-package dao;
-
-import model.World;
-
-import javax.persistence.EntityManager;
-
-import com.google.inject.Inject;
-import com.google.inject.Provider;
-import com.google.inject.Singleton;
-
-@Singleton
-public class WorldDao {
-
-    @Inject
-    Provider<EntityManager> entitiyManagerProvider;
-
-    public World get(int id) {
-        EntityManager entityManager = entitiyManagerProvider.get();
-        return entityManager.find(World.class, id);
-    }
-
-    public void put(World world) {
-        EntityManager entityManager = entitiyManagerProvider.get();
-        entityManager.persist(world);
-    }
-}

frameworks/Java/ninja-resin/src/main/java/ehcache.xml

@@ -1,15 +0,0 @@
-<ehcache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../config/ehcache.xsd" updateCheck="false">
-
-    <defaultCache
-            maxElementsInMemory="10000"
-            eternal="false"
-            timeToIdleSeconds="120"
-            timeToLiveSeconds="120"
-            overflowToDisk="false"
-            maxElementsOnDisk="10000000"
-            diskPersistent="false"
-            diskExpiryThreadIntervalSeconds="120"
-            memoryStoreEvictionPolicy="LRU"
-    /> 
-    
-</ehcache>

frameworks/Java/ninja-resin/src/main/java/logback.xml

@@ -1,14 +0,0 @@
-<configuration>
-
-  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-    <!-- encoders are assigned the type
-         ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
-    <encoder>
-      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
-    </encoder>
-  </appender>
-
-  <root level="error">
-    <appender-ref ref="STDOUT" />
-  </root>
-</configuration>

frameworks/Java/ninja-resin/src/main/java/model/Fortune.java

@@ -1,37 +0,0 @@
-package model;
-
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-
-@Entity
-public class Fortune implements Comparable<Fortune> {
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    public int id;
-    public String message;
-
-    public Fortune() {
-
-    }
-
-    public Fortune(int id, String message) {
-        this.id = id;
-        this.message = message;
-    }
-
-    public int getId() {
-        return this.id;
-    }
-
-    public String getMessage() {
-        return this.message;
-    }
-
-    @Override
-    public int compareTo(Fortune other) {
-        return message.compareTo(other.message);
-    }
-}

frameworks/Java/ninja-resin/src/main/java/model/World.java

@@ -1,15 +0,0 @@
-package model;
-
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-
-@Entity
-public class World {
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    public int id;
-    public int randomNumber;
-}

frameworks/Java/ninja-resin/src/main/java/views/HelloFortuneController/index.ftl.html

@@ -1,20 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <head>
-        <title>Fortunes</title>
-    </head>
-    <body>
-        <table>
-            <tr>
-                <th>id</th>
-                <th>message</th>
-            </tr>
-            <#list fortunes as fortune>
-            <tr>
-                <td>${fortune.id}</td>
-                <td>${fortune.message}</td>
-            </tr>
-            </#list>
-        </table>
-    </body>
-</html>

frameworks/Java/ninja-resin/src/main/resources/META-INF/persistence.xml

@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<persistence xmlns="http://java.sun.com/xml/ns/persistence"
-             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-             xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd"
-             version="2.0">
-    
-    <!-- Resin datasource -->
-    <persistence-unit name="resin" transaction-type="RESOURCE_LOCAL">
-        <provider>org.hibernate.ejb.HibernatePersistence</provider>
-        <jta-data-source>java:comp/env/jdbc/hello_world</jta-data-source>
-
-        <properties>
-            <property name="hibernate.connection.datasource" value="java:comp/env/jdbc/hello_world" />
-            <property name="hibernate.transaction.factory_class"
-                                  value="org.hibernate.transaction.JTATransactionFactory" />
-            <property name="hibernate.transaction.manager_lookup_class"
-                                  value="org.hibernate.transaction.ResinTransactionManagerLookup" />
-        </properties>
-    </persistence-unit>
-        
-    <!-- Database for tests and local dev mode... -->
-    <persistence-unit name="h2" transaction-type="RESOURCE_LOCAL">
-        <provider>org.hibernate.ejb.HibernatePersistence</provider>
-        <properties>
-            <property name="javax.persistence.provider" value="org.hibernate.ejb.HibernatePersistence" />
-            <property name="hibernate.connection.driver_class" value="org.h2.Driver" />
-            <property name="hibernate.dialect" value="org.hibernate.dialect.H2Dialect" />
-            <!-- you may want to enable the ddl if you do not use migrations. -->
-            <property name="hibernate.hbm2ddl.auto" value="create" />
-            <property name="hibernate.show_sql" value="false" />
-            <property name="hibernate.format_sql" value="false" />
-
-            <!-- Connection Pooling settings -->
-            <property name="hibernate.connection.provider_class"
-                          value="org.hibernate.service.jdbc.connections.internal.C3P0ConnectionProvider" />
-
-            <property name="hibernate.c3p0.max_size" value="100" />
-            <property name="hibernate.c3p0.min_size" value="0" />
-            <property name="hibernate.c3p0.acquire_increment" value="1" />
-            <property name="hibernate.c3p0.idle_test_period" value="300" />
-            <property name="hibernate.c3p0.max_statements" value="0" />
-            <property name="hibernate.c3p0.timeout" value="100" />     
-        </properties>
-    </persistence-unit>
-
-</persistence>

frameworks/Java/ninja-resin/src/main/webapp/WEB-INF/resin-web.xml

@@ -1,13 +0,0 @@
-<web-app xmlns="http://caucho.com/ns/resin">
-
-<database jndi-name='jdbc/hello_world'>
-  <driver>
-    <type>com.mysql.jdbc.jdbc2.optional.MysqlConnectionPoolDataSource</type>
-    <url>jdbc:mysql://localhost:3306/hello_world?jdbcCompliantTruncation=false&amp;elideSetAutoCommits=true&amp;useLocalSessionState=true&amp;cachePrepStmts=true&amp;cacheCallableStmts=true&amp;alwaysSendSetIsolation=false&amp;prepStmtCacheSize=4096&amp;cacheServerConfiguration=true&amp;prepStmtCacheSqlLimit=2048&amp;zeroDateTimeBehavior=convertToNull&amp;traceProtocol=false&amp;useUnbufferedInput=false&amp;useReadAheadInput=false&amp;maintainTimeStats=false&amp;useServerPrepStmts&amp;cacheRSMetadata=true</url>
-    <user>benchmarkdbuser</user>
-    <password>benchmarkdbpass</password>
-    <useUnicode/>
-  </driver>
-</database>
-
-</web-app>

frameworks/Java/ninja-resin/src/main/webapp/WEB-INF/web.xml

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Copyright (C) 2013 the original author or authors.
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
--->
-<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" metadata-complete="true" version="3.0">
-  <display-name>ninja</display-name>
-  <listener>
-    <listener-class>ninja.servlet.NinjaServletListener</listener-class>
-  </listener>
-  <filter>
-    <filter-name>guiceFilter</filter-name>
-    <filter-class>com.google.inject.servlet.GuiceFilter</filter-class>
-  </filter>
-  <filter-mapping>
-    <filter-name>guiceFilter</filter-name>
-    <url-pattern>/*</url-pattern>
-  </filter-mapping>
-</web-app>

frameworks/Java/ninja-resin/src/test/java/controllers/HelloDbControllerTest.java

@@ -1,92 +0,0 @@
-package controllers;
-
-import dao.SetupDao;
-import model.World;
-import ninja.NinjaDocTester;
-import org.doctester.testbrowser.Request;
-import org.doctester.testbrowser.Response;
-import org.hamcrest.CoreMatchers;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.notNullValue;
-import org.junit.Test;
-import static org.junit.Assert.*;
-import org.junit.Before;
-
-public class HelloDbControllerTest extends NinjaDocTester {
-            
-    String URL_DB = "/db";
-    String URL_QUERIES = "/queries";
-    String URL_UPDATE = "/update";
-    
-    @Before
-    public void setupClass() {
-        getInjector().getInstance(SetupDao.class).generateWorldsForTest();
-    }
-    
-    @Test
-    public void testSingleGet() {
-        
-        Response response = makeRequest(
-                Request
-                        .GET()
-                        .url(testServerUrl().path(URL_DB))
-                        .contentTypeApplicationJson());
-        
-        // Just make sure that we get back a World Json.
-        assertThat(response.payloadAs(World.class), notNullValue());      
-                
-    }
-    
-    @Test
-    public void multipleQueries() {
-        
-        assertThatMutipleGetWorksFor(1);
-        assertThatMutipleGetWorksFor(5);
-        assertThatMutipleGetWorksFor(10);
-        assertThatMutipleGetWorksFor(15);
-        assertThatMutipleGetWorksFor(20);
-                
-    }
-    
-    private void assertThatMutipleGetWorksFor(int numberOfQueries) {
-        Response response = makeRequest(
-            Request
-                .GET()
-                .url(
-                    testServerUrl()
-                    .path(URL_QUERIES)
-                    .addQueryParameter("queries", numberOfQueries + ""))
-                .contentTypeApplicationJson());
-        
-        // Just make sure that we get back an array
-        assertThat(response.payloadAs(World[].class).length, is(numberOfQueries)); 
-    }
-    
-    @Test
-    public void testUpdates() {
-        
-        assertThatUpdateWorks(1);
-        assertThatUpdateWorks(5);
-        assertThatUpdateWorks(10);
-        assertThatUpdateWorks(15);
-        assertThatUpdateWorks(20);
-                
-    }
-    
-    private void assertThatUpdateWorks(int numberOfQueries) {
-        
-        Response response = makeRequest(
-            Request.GET()
-                .url(
-                    testServerUrl()
-                    .path(URL_UPDATE)
-                    .addQueryParameter("queries", numberOfQueries + ""))
-                .contentTypeApplicationJson());
-        
-        assertThat(response.payloadAs(World[].class).length, is(numberOfQueries)); 
-        
-    }
-
-    
-    
-}

frameworks/Java/ninja-resin/src/test/java/controllers/HelloFortuneControllerTest.java

@@ -1,37 +0,0 @@
-package controllers;
-
-import dao.SetupDao;
-import model.Fortune;
-import ninja.NinjaDocTester;
-import org.doctester.testbrowser.Request;
-import org.doctester.testbrowser.Response;
-import org.junit.Test;
-import static org.junit.Assert.*;
-
-public class HelloFortuneControllerTest extends NinjaDocTester {
-
-    String URL_FORTUNES = "/fortunes";
-    
-    @Test
-    public void testSomeMethod() {
-        
-        getInjector().getInstance(SetupDao.class).generateFortunesForTest();
-
-        Response response 
-                = makeRequest(Request.GET().url(testServerUrl().path(URL_FORTUNES)));
-        
-        System.out.println(" " + response.payload);
-        
-        // make sure escaping works
-        assertTrue(response.payload.contains("<script>I want to be escaped</script>"));
-
-        // make sure utf-8 works
-        assertTrue(response.payload.contains("レームワークのベンチマーク<"));
-        
-        // make sure new Fortune has been added to response
-        assertTrue(response.payload.contains("Additional fortune added at request time."));
-
-        
-    }
-    
-}

frameworks/Java/ninja-resin/src/test/java/controllers/HelloJsonControllerTest.java

@@ -1,48 +0,0 @@
-package controllers;
-
-import ninja.NinjaDocTester;
-import org.doctester.testbrowser.Request;
-import org.doctester.testbrowser.Response;
-import org.hamcrest.CoreMatchers;
-import static org.hamcrest.CoreMatchers.is;
-import org.junit.Test;
-import static org.junit.Assert.*;
-
-
-public class HelloJsonControllerTest extends NinjaDocTester {
-    
-    String URL_JSON = "/json";
-
-    @Test
-    public void testHelloJsonController() {
-        
-        Response response = makeRequest(
-            Request
-                .GET()
-                .url(testServerUrl().path(URL_JSON))
-                .contentTypeApplicationJson());
-        
-        assertThat(
-            response.payloadAs(Message.class).message, 
-            is("Hello, world"));
-        
-    }
-    
-    /**
-     * Duplicated from HelloJsonController.
-     * 
-     * Stuff in HelloJsonController is final, but to deserialize the message we
-     * need an empty constructor...
-     */
-    public final static class Message {
-
-	public String message;
-        
-	public Message() {}
-
-	public Message(String message) {
-	    this.message = message;
-	}
-    }
-    
-}

frameworks/Java/ninja-resin/src/test/java/controllers/HelloPlaintextControllerTest.java

@@ -1,29 +0,0 @@
-package controllers;
-
-import ninja.NinjaDocTester;
-import org.doctester.testbrowser.Request;
-import org.doctester.testbrowser.Response;
-import org.hamcrest.CoreMatchers;
-import static org.hamcrest.CoreMatchers.is;
-import org.junit.Test;
-import static org.junit.Assert.*;
-
-public class HelloPlaintextControllerTest extends NinjaDocTester {
-    
-    String URL_PLAINTEXT = "/plaintext";
-    
-    @Test
-    public void helloPlaintextControllerTest() {
-        
-        Response response = makeRequest(
-            Request.GET().url(testServerUrl().path(URL_PLAINTEXT)));
-        
-        assertThat(response.payload, CoreMatchers.is("Hello, world!"));
-        assertThat(
-            response.headers.get("Content-Type"), 
-            is("text/plain; charset=UTF-8"));
-        
-   
-    }
-    
-}

frameworks/Java/ninja-standalone/README.md

@@ -1,32 +1,5 @@
 # Ninja Framework Benchmarking Test
 
-This is the [Ninja-standalone](http://www.ninjaframework.org/) portion of a [benchmarking test suite](../) comparing a variety of web development platforms.
-
-## IMPORTANT!!!!
-
-ninja-resin is in essence just a copy of ninja-standalone with different datasources.
-That means all stuff you change in ninja-resin should also be applied to 
-ninja-standalone and vice-versa.
-
-## Test URLs
-### JSON Encoding Test
-
-http://localhost:8080/json
-
-### Single Query Test
-
-http://localhost:8080/db
-
-### Multiple Queries Test
-
-http://localhost:8080/queries?5
-
-### Fortunes Test
-
-http://localhost:8080/fotunes
-
-### Plaintext Test
-
-http://localhost:8080/plaintext
-
-
+This is the [Ninja-standalone](http://www.ninjaframework.org/) 
+portion of a [benchmarking test suite](../) comparing a variety 
+of web development platforms.

frameworks/Java/ninja-standalone/pom.xml

@@ -9,9 +9,9 @@
 
     <properties>
         <java-version>1.7</java-version>
-        <ninja.version>2.5.1</ninja.version>
+        <ninja.version>3.3.1</ninja.version>
         <mysql.version>5.1.26</mysql.version>
-        <jetty.version>9.0.5.v20130815</jetty.version>
+        <jetty.version>9.2.1.v20140609</jetty.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
@@ -28,13 +28,6 @@
             <version>${ninja.version}</version>
         </dependency>   
 
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-            <version>3.0.1</version>
-            <scope>provided</scope>
-        </dependency>
-
         <dependency>
             <groupId>org.ninjaframework</groupId>
             <artifactId>ninja-test-utilities</artifactId>

frameworks/Java/ninja-standalone/src/main/java/conf/application.conf

@@ -44,7 +44,7 @@ ninja.migration.run=false
 ## for testing
 %test.ninja.jpa.persistence_unit_name = h2
 # in memory database for testing...
-%test.db.connection.url=jdbc:h2:mem:
+%test.db.connection.url=jdbc:h2:mem:test_db
 %test.db.connection.username=ra
 %test.db.connection.password=
 

frameworks/Java/ninja-standalone/src/main/java/controllers/HelloPlaintextController.java

@@ -8,6 +8,6 @@ import com.google.inject.Singleton;
 @Singleton
 public class HelloPlaintextController {
     public Result index() {
-	return Results.text().renderRaw("Hello, world!");
+	return Results.text().renderRaw("Hello, World!");
     }
 }

frameworks/Java/ninja-standalone/src/main/resources/META-INF/persistence.xml

@@ -17,6 +17,7 @@
                 <property name="hibernate.hbm2ddl.auto" value="create" />
                 <property name="hibernate.show_sql" value="false" />
                 <property name="hibernate.format_sql" value="false" />
+                <property name="hibernate.jdbc.batch_size" value="100" />
 
                 <!-- Connection Pooling settings -->
                 <property name="hibernate.connection.provider_class"
@@ -41,7 +42,7 @@
 
 			<property name="hibernate.show_sql" value="false" />
 			<property name="hibernate.format_sql" value="false" />
-
+                        <property name="hibernate.jdbc.batch_size" value="100" />
 			<!-- Connection Pooling settings -->
 			<property name="hibernate.connection.provider_class"
 				value="org.hibernate.service.jdbc.connections.internal.C3P0ConnectionProvider" />

frameworks/Java/ninja-standalone/src/test/java/controllers/HelloJsonControllerTest.java

@@ -24,7 +24,7 @@ public class HelloJsonControllerTest extends NinjaDocTester {
         
         assertThat(
             response.payloadAs(Message.class).message, 
-            is("Hello, world"));
+            is("Hello, World!"));
         
     }
     

frameworks/Java/ninja-standalone/src/test/java/controllers/HelloPlaintextControllerTest.java

@@ -18,7 +18,7 @@ public class HelloPlaintextControllerTest extends NinjaDocTester {
         Response response = makeRequest(
             Request.GET().url(testServerUrl().path(URL_PLAINTEXT)));
         
-        assertThat(response.payload, CoreMatchers.is("Hello, world!"));
+        assertThat(response.payload, CoreMatchers.is("Hello, World!"));
         assertThat(
             response.headers.get("Content-Type"), 
             is("text/plain; charset=UTF-8"));