playframework · flybyray · Mar 2, 2016 · Mar 2, 2016 · Mar 2, 2016 · Mar 7, 2016
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
+out
 bin
 framework/classes
 framework/test-classes
@@ -55,11 +56,16 @@ samples-and-tests/with-gwt/nbproject
 samples-and-tests/jobboard/db
 samples-and-tests/jobboard/tmp
 samples-and-tests/jobboard/test-result
+samples-and-tests/jobboard/modules
+samples-and-tests/jobboard/lib
 samples-and-tests/jobboard/attachments
 samples-and-tests/just-test-cases/tmp
 samples-and-tests/just-test-cases/test-result
+samples-and-tests/just-test-cases/lib
+samples-and-tests/just-test-cases/modules
 samples-and-tests/chat/tmp
 samples-and-tests/chat/logs
+samples-and-tests/java8Support/lib/
 .git
 modules/spring/lib/play-spring.jar
 modules/search/bin
@@ -78,6 +84,7 @@ support/textmate
 samples-and-tests/yabe/logs
 samples-and-tests/yabe/test-result
 samples-and-tests/yabe/tmp
+samples-and-tests/yabe/modules
 *.ser
 modules/cobertura/lib
 modules/scala/lib/play-scala.jar

diff --git a/.travis.yml b/.travis.yml
@@ -1,14 +1,30 @@
+sudo: required
+dist: trusty
 language: java
 jdk:
-  - openjdk6 
+  - oraclejdk8 
+#before_install:
+#  - cat /etc/hosts # optionally check the content *before*
+#  - sudo hostname "$(hostname | cut -c1-63)"
+#  - sed -e "s/^\\(127\\.0\\.0\\.1.*\\)/\\1 $(hostname | cut -c1-63)/" /etc/hosts | sudo tee /etc/hosts
+#  - sudo mv /tmp/hosts /etc/hosts
+#  - cat /etc/hosts # optionally check the content *after*
+addons:
+  hosts:
+    - myshorthost
+  hostname: myshorthost
+
 script: ant -buildfile ./framework/build.xml test
-after_failure: 
-    cat ./samples-and-tests/just-test-cases/test-result/*.failed.html
-    cat ./samples-and-tests/forum/test-result/*.failed.html
-    cat ./samples-and-tests/zencontact/test-result/*.failed.html
-    cat ./samples-and-tests/jobboard/test-result/*.failed.html
-    cat ./samples-and-tests/yabe/test-result/*.failed.html
+
+after_failure:
+    find samples-and-tests -name '*.failed.html' -exec echo {} \; -exec cat {} \;
+
 notifications:
+  webhooks:
+    urls:
+      - https://webhooks.gitter.im/e/6da3b55e59cded84b8bd
+    on_success: always
+    on_failure: always
   email:
     on_success: change
-    on_failure: always
+    on_failure: always
diff --git a/README.textile b/README.textile
@@ -1,4 +1,6 @@
-h1. Welcome to Play framework  !https://travis-ci.org/playframework/play1.svg?branch=1.3.x!:https://travis-ci.org/playframework/play1
+h1. Welcome to Play framework  
+
+!https://travis-ci.org/playframework/play1.svg?branch=1.4.x!:https://travis-ci.org/playframework/play1 !https://badges.gitter.im/playframework/play1.svg(Join the chat at https://gitter.im/playframework/play1)!:https://gitter.im/playframework/play1?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge
 
 Play framework makes it easier to build Web applications with Java. It is a clean alternative to bloated Enterprise Java stacks. It focuses on developer productivity and targets RESTful architectures. Play is a perfect companion to agile software development.
 
@@ -8,11 +10,11 @@ h2. Getting started
 
 1. Install the latest version of Play framework and unzip it anywhere you want:
 
-bc. unzip play-1.3.0-RC1.zip -d /opt/play-1.3.0-RC1
+bc. unzip play-*.zip -d /opt/play
 
 2. Add the **play** script to your PATH:
 
-bc. export PATH=$PATH:/opt/play-1.3.0-RC1
+bc. export PATH=$PATH:/opt/play
 
 3. Create a new Play application:
 
@@ -28,7 +30,7 @@ bc. play run /opt/myFirstApp
 
 * "Your first application — the ‘Hello World’ tutorial":https://www.playframework.com/documentation/1.3.0-RC1/firstapp
 * "Tutorial — Play guide, a real world app step-by-step":https://www.playframework.com/documentation/1.3.0-RC1/guide1
-* "The essential documentation":https://www.playframework.com/documentation/1.3.0-RC1/home
+* "The essential documentation":https://www.playframework.com/documentation/1.5.x/home
 * "Java API":https://www.playframework.com/@api/index.html
 
 h2. Get the source

diff --git a/documentation/cheatsheets/tests/ch21-TestUnitTests.textile b/documentation/cheatsheets/tests/ch21-TestUnitTests.textile
@@ -14,7 +14,7 @@ Run before each unit test
 *==@After public void cleanupJunk()==*
 Run after each unit test
 
-*==@BeforeClass void whenTestClassInstanciated();==*
+*==@BeforeClass void whenTestClassInstantiated();==*
 Run once, when the test class gets instantiated
 
 *==@AfterClass void whenTestClassCompleted()==*

diff --git a/documentation/cheatsheets_ja/tests/ch21-TestUnitTests.textile b/documentation/cheatsheets_ja/tests/ch21-TestUnitTests.textile
@@ -14,7 +14,7 @@ h2. Test - Unit Tests
 *==@After public void cleanupJunk()==*
 各ユニットテストの後に実行されます。
 
-*==@BeforeClass void whenTestClassInstanciated();==*
+*==@BeforeClass void whenTestClassInstantiated();==*
 当該テストクラスがインスタンス化されたときに一度だけ実行されます。
 
 *==@AfterClass void whenTestClassCompleted()==*

diff --git a/documentation/commands/cmd-auto-test.txt b/documentation/commands/cmd-auto-test.txt
@@ -8,7 +8,7 @@
 ~
 ~ Synopsis:
 ~ ~~~~~~~~~
-~ play auto-test [app_path] [--deps] [--unit] [--functional] [--selenium]
+~ play auto-test [app_path] [--deps] [--unit] [--functional] [--selenium] [--timeout=xxx]
 ~
 ~ Description:
 ~ ~~~~~~~~~~~~
@@ -44,4 +44,6 @@
 ~ --functional: 
 ~ Run the functional tests.
 ~ --selenium: 
-~ Run the selenium tests.
+~ Run the selenium tests.
+~ --timeout=xxx: 
+~ Specify the timeout for the webclient (the value of the timeout in milliseconds, 0 for an infinite wait)
diff --git a/documentation/commands/cmd-dependencies.txt b/documentation/commands/cmd-dependencies.txt
@@ -8,7 +8,7 @@
 ~ 
 ~ Synopsis:
 ~ ~~~~~~~~~
-~ play dependencies [app_path] [--verbose] [--debug] [--sync] [--%fwk_id] [--forProd] [--clearcache] [--jpda]
+~ play dependencies [app_path] [--verbose] [--debug] [--sync] [--nosync] [--%fwk_id] [--forProd] [--clearcache] [--jpda] [--shortModuleNames]
 ~
 ~ Description:
 ~ ~~~~~~~~~~~~
@@ -34,7 +34,7 @@
 ~ Verbose mode
 ~
 ~ --debug:
-~ Debug mode (even more informations logged than in verbose mode)
+~ Debug mode (even more information logged than in verbose mode)
 ~
 ~ --jpda:
 ~ Listen for JPDA connection. The process will be suspended until
@@ -43,6 +43,11 @@
 ~ --sync:
 ~ Keep lib/ and modules/ directory synced.
 ~ Delete unknown dependencies.
+~ Since 1.4.4: This option is activated by default
+~
+~ --nosync:
+~ Keep lib/ and modules/ directory unchanged.
+~ Keep unknown dependencies.
 ~
 ~ --forceCopy:
 ~ Never create files pointing to the original folder, always copy the folder
@@ -58,3 +63,9 @@
 ~~ --clearcache:
 ~ Clear the ivy cache (equivalent to rm -r ~/.ivy2/cache)
 ~
+~~ --shortModuleNames:
+~ use short module name without version number.
+~ For example, if project depends on module "play-pdf 1.2.3", then 
+~  * command `play deps` creates folder `modules/pdf-1.2.3`
+~  * command `play deps --shortModuleNames` creates folder `modules/pdf`
+~ The latter option is probably convenient for configuring IDE
diff --git a/documentation/commands/cmd-status.txt b/documentation/commands/cmd-status.txt
@@ -13,7 +13,7 @@
 ~ Description:
 ~ ~~~~~~~~~~~~
 ~ This script tries to connect to the running application's /@status URL to request the application status.
-~ The application status contains useful informations about the running application.
+~ The application status contains useful information about the running application.
 ~
 ~ The status command is aimed at monitoring applications running on production servers.
 ~

diff --git a/documentation/files/main.css b/documentation/files/main.css
@@ -60,7 +60,7 @@ body {
     -moz-border-radius: 16px;
 }
 
-/** A little hacky to create arrows without images **/
+/** A little hack to create arrows without images **/
 .about {
     text-indent: -999em;
     display: block;

diff --git a/documentation/manual/asynchronous.textile b/documentation/manual/asynchronous.textile
@@ -1,6 +1,6 @@
 h1. Asynchronous programming with HTTP
 
-This section explains how to deal with asynchonism in a Play application to achieve typical long-polling, streaming and other "Comet-style":http://en.wikipedia.org/wiki/Comet_(programming%29 applications that can scale to thousands of concurrent connections.
+This section explains how to deal with asynchronism in a Play application to achieve typical long-polling, streaming and other "Comet-style":http://en.wikipedia.org/wiki/Comet_(programming%29 applications that can scale to thousands of concurrent connections.
 
 h2. Suspending HTTP requests
 
@@ -114,7 +114,7 @@ h2. Using WebSockets
 
 WebSockets are a way to open a two-way communication channel between a browser and your application. On the browser side, you open a socket using a "ws://" url:
 
-bc. new Socket("ws://localhost:9000/helloSocket?name=Guillaume")
+bc. new WebSocket("ws://localhost:9000/helloSocket?name=Guillaume")
 
 On the Play side you declare a WS route:
 
@@ -124,7 +124,7 @@ bc. WS   /helloSocket            MyWebSocket.hello
 
 * It has a request object, but no response object.
 * It has access to the session, but read-only.
-* It doesn’t have @renderArgs@, @routeArgs@ or flash scope.
+* It doesn't have @renderArgs@, @routeArgs@ or flash scope.
 * It can read params only from the route pattern or from the QueryString.
 * It has two communication channels: inbound and outbound.
 

diff --git a/documentation/manual/cache.textile b/documentation/manual/cache.textile
@@ -4,9 +4,9 @@ To create high-performance systems, sometimes you need to cache data. Play has a
 
 If you don’t configure Memcached, Play will use a standalone cache that stores data in the JVM heap. Caching data in the JVM application breaks the ‘share nothing’ assumption made by Play: you can’t run your application on several servers, and expect the application to behave consistently. Each application instance will have a different copy of the data.
 
-It is important to understand that the cache contract is clear: when you put data in a cache, you can’t expect that data to remain there forever. In fact you shouldn’t. A cache is fast, but values expire, and the cache generally exists only in memory (without persistent backup). 
+It is important to understand that the cache contract is clear: when you put data in a cache, you can’t expect that data to remain there forever. In fact you shouldn't. A cache is fast, but values expire, and the cache generally exists only in memory (without persistent backup). 
 
-So the best way to use the cache is to repopulate it when it doesn’t have what you expect:
+So the best way to use the cache is to repopulate it when it doesn't have what you expect:
 
 bc. public static void allProducts() {
     List<Product> products = Cache.get("products", List.class);
@@ -23,7 +23,7 @@ For example, the "GAE module":https://www.playframework.com/modules/gae configur
 
 h2. <a name="cacheFor">The cacheFor annotation</a>
 
-The @cacheFor@ annotation provides an easy way to cache the ouput (HTML, JSON, etc) of an action.
+The @cacheFor@ annotation provides an easy way to cache the output (HTML, JSON, etc) of an action.
 
 bc.  import play.cache.*;
 public class Application extends Controller {