[#1031] - fix transitiveDependencies global setting in dependency.yml

.gitignore

@@ -1,6 +1,16 @@
+# General temp files
+.DS_Store
+*.ser
+*.pyc
+
+# Files related to Play build or usage
+id
+dist
+out
 bin
 framework/classes
 framework/test-classes
+framework/tests-results
 framework/out
 framework/.idea
 framework/play.jar
@@ -13,121 +23,33 @@ nbproject/private
 framework/tests-results
 framework/src/version
 framework/src/play/version
-framework/src/play/version
-framework/src/play/version
 framework/tests/test-application/db
+framework/play-*.jar
+framework/docs
+samples-and-tests/*/test-result/
+
+# IDE and editors
+/bin
+*~
+.idea
+nbproject
+eclipse
+.amateras
 .settings
 .classpath
 .project
-framework/tests/tmp
-id
-framework/tests-tmp
-framework/docs
-dist
-modules/bespin/lib/bespin.jar
-modules/ecss/lib/ecss.jar
-modules/test-runner/lib/test-runner.jar
-resources/catalog.xml
-resources/nbproject/private
-modules/gae/lib/gae.jar
-catalog.xml
-modules/gae/lib/gae.jar
-play-*.jar
-modules/gae/bin
-modules/gwt/lib/play-gwt.jar
-tmp
-test-result
-logs
-logs
-tmp
-db
-*.pyc
-test-result
-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/attachments
-samples-and-tests/just-test-cases/tmp
-samples-and-tests/just-test-cases/test-result
-samples-and-tests/chat/tmp
-samples-and-tests/chat/logs
-.git
-modules/spring/lib/play-spring.jar
-modules/search/bin
-modules/search/lib/search.jar
-samples-and-tests/just-test-cases/data
-modules/siena/lib/play-siena.jar
-samples-and-tests/lists-with-gae/logs
-samples-and-tests/lists-with-gae/tmp
-samples-and-tests/lists-with-gae/war/WEB-INF/appengine-generated
-./.settings
-samples-and-tests/just-test-cases/.settings
-samples-and-tests/just-test-cases/eclipse
-framework/ecClasses
-documentation/api
-support/textmate
-samples-and-tests/yabe/logs
-samples-and-tests/yabe/test-result
-samples-and-tests/yabe/tmp
-*.ser
-modules/cobertura/lib
-modules/scala/lib/play-scala.jar
-samples-and-tests/with-scala/logs
-samples-and-tests/yabe-with-scala/logs
-samples-and-tests/yabe-with-scala/tmp
-samples-and-tests/yabe/.amateras
-samples-and-tests/yabe/.settings
-samples-and-tests/yabe/eclipse
-samples-and-tests/yabe/nbproject
-samples-and-tests/with-scala/.amateras
-samples-and-tests/with-scala/.externalToolBuilders
-samples-and-tests/with-scala/.manager
-samples-and-tests/with-scala/.settings
-samples-and-tests/with-scala/eclipse
-samples-and-tests/test-scala/tmp
-samples-and-tests/test-scala/logs
-samples-and-tests/i-am-a-developer/i-am-working-here
-samples-and-tests/i-am-a-developer/i-am-creating-jobs-here
-samples-and-tests/i-am-a-developer/i-am-testing-log-levels-here
-samples-and-tests/just-test-cases/attachments
-samples-and-tests/booking/logs
-samples-and-tests/booking/tmp
-samples-and-tests/twitter-oauth/.settings
-samples-and-tests/twitter-oauth/eclipse
-help
+samples-and-tests/java8Support/lib/
 *.iml
 *.ipr
 *.iws
-modules/router/lib/router.jar
-modules/grizzly/lib/play-grizzly.jar
-play.ipr
-play.iws
-*iml
-modules/router-head
-modules/gwt/samples-and-tests/logs
-modules/gwt/samples-and-tests/test-result
-modules/gwt/samples-and-tests/tmp
-modules/siena-1.0
-samples-and-tests/zencontact/logs
-samples-and-tests/zencontact/test-result
-samples-and-tests/zencontact/tmp
-modules/scala
+atlassian-ide-plugin.xml
+
+# modules/: exclude except for core modules
 modules/*
-build.classes
-modules/crud/nbproject
-nbproject
-samples-and-tests/jobboard/attachments
-samples-and-tests/jobboard/logs
-samples-and-tests/jobboard/test-result
-samples-and-tests/jobboard/tmp
-samples-and-tests/validation/logs
-samples-and-tests/zencontact/precompiled
 !modules/docviewer
 !modules/crud
 !modules/console
 !modules/grizzly
 !modules/secure
 !modules/testrunner
-!framework/src/play/db
-.idea
+

.travis.yml

@@ -0,0 +1,30 @@
+sudo: required
+language: java
+jdk:
+  - openjdk7 
+#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
+notifications:
+  webhooks:
+    urls:
+      - https://webhooks.gitter.im/e/6da3b55e59cded84b8bd
+    on_success: always
+    on_failure: always
+  email:
+    on_success: change
+    on_failure: always

COPYING

@@ -38,6 +38,7 @@ http://www.apache.org/licenses/LICENSE-2.0
     - Signpost
 
 http://www.gnu.org/licenses/lgpl.html
+    - Bytecodeparser
     - c3p0
     - Hibernate
 

README.textile

@@ -1,18 +1,20 @@
-h1. Welcome to Play framework
+h1. Welcome to Play framework  
+
+!https://travis-ci.org/playframework/play1.svg?branch=master!: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.
 
-Learn more on the "http://www.playframework.org":http://www.playframework.org website.
+Learn more on the "https://www.playframework.com":https://www.playframework.com website.
 
 h2. Getting started
 
 1. Install the latest version of Play framework and unzip it anywhere you want:
 
-bc. unzip play-1.1.zip -d /opt/play-1.1
+bc. unzip play-1.3.0-RC1.zip -d /opt/play-1.3.0-RC1
 
 2. Add the **play** script to your PATH:
 
-bc. export PATH=$PATH:/opt/play-1.1
+bc. export PATH=$PATH:/opt/play-1.3.0-RC1
 
 3. Create a new Play application:
 
@@ -26,10 +28,10 @@ bc. play run /opt/myFirstApp
 
 6. Start developing your new application:
 
-* "Your first application — the ‘Hello World’ tutorial":http://www.playframework.org/documentation/1.1/firstapp
-* "Tutorial — Play guide, a real world app step-by-step":http://www.playframework.org/documentation/1.1/guide1
-* "The essential documentation":http://www.playframework.org/documentation/1.0.3/main
-* "Java API":http://www.playframework.org/@api/index.html
+* "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
+* "Java API":https://www.playframework.com/@api/index.html
 
 h2. Get the source
 
@@ -45,6 +47,21 @@ h2. Reporting bugs
 
 Please report bugs on "our lighthouse tracker":http://play.lighthouseapp.com/projects/57987-play-framework.
 
+h2. Learn More
+
+* "www.playframework.com":https://www.playframework.com
+* "Download":https://www.playframework.com/download
+* "Install":https://www.playframework.com/documentation/1.3.x/install
+* "Create a new application":https://www.playframework.com/documentation/1.3.x/guide1
+* "Build from source":https://www.playframework.com/documentation/1.3.x/install#build
+* "Modules":https://www.playframework.com/modules
+* "Search or create issues":http://play.lighthouseapp.com/projects/57987-play-framework
+* "Get help":http://stackoverflow.com/questions/tagged/playframework
+* "Code of Conduct":https://www.playframework.com/conduct
+* "Contribute":https://github.com/playframework/play1/wiki/Contributor-guide
+* "Play contributor guidelines":https://www.playframework.com/contributing
+
+
 h2. Licence
 
-Play framework is distributed under "Apache 2 licence":http://www.apache.org/licenses/LICENSE-2.0.html.
+Play framework is distributed under "Apache 2 licence":http://www.apache.org/licenses/LICENSE-2.0.html.

documentation/cheatsheets/controllers/ch08-ControllerLibraries.textile

@@ -3,6 +3,9 @@ h2. Controller - Libraries
 *==WS.url("http://s.com/posts").get().toJSON();==*
 HTTP GET request to JSON
 
+*==WS.withEncoding("iso-8859-1").url("http://s.com/posts").get().toJSON();==*
+HTTP GET request to JSON using iso-8859-1 encoding
+
 *==WS.url("http://s.com/").post().toXML();==*
 HTTP POST request to XML
 

documentation/cheatsheets/multiEnvironment/ch26-MultiEnvironment.textile

@@ -1,4 +1,4 @@
-h2. Multi environment
+h2. Multi-environment
 
 *==# Test configuration==*
 *==%test.db=mem==*

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()==*

documentation/cheatsheets/tests/ch24-TestDataloader.textile

@@ -1,9 +1,9 @@
 h2. Test - Data loader
 
 *==@Before public void setUp() { Fixtures.deleteAll();==*
-*==Fixtures.load("data.yml");}==*
+*==Fixtures.loadModels("data.yml");}==*
 Fixtures is used to initialise the datastore before running a unit test
 
-*==#{fixture delete:'all', load:'data.yml' /}==*
+*==#{fixture delete:'all', load:'data.yml' /}==* or *==#{fixture delete:'all', loadModels:'data.yml' /}==*
 *==#{selenium} ... #{/selenium}==*
-Same idea using a Selenium test
+Same idea using a Selenium test(@loadModels@ and @load@ parameters are synonyms).

documentation/cheatsheets_ja/commandLine/ch25-CommandLinePlayCommand.textile

@@ -0,0 +1,82 @@
+h2. Command line - play command
+
+*classpath*
+算出されたクラスパスを表示します。
+
+*id*
+複数環境設定用のフレームワーク ID を定義します。
+
+*secret*
+暗号化に使われる秘密鍵を生成します。
+
+*install*
+モジュールをインストールします。
+
+*list-modules*
+セントラルモジュールリポジトリから入手可能なモジュールを列挙します。
+
+*modules*
+算出されたモジュールのリストを表示します。
+
+*new*
+新しいアプリケーションを作成します。
+
+*new-module*
+モジュールを作成します。
+
+*build-module*
+モジュールをビルドし、パッケージングします。
+
+*eclipsify*
+Eclipse の全ての設定ファイルを作成します。
+
+*netbeansify*
+NetBeans の全ての設定ファイルを作成します。
+
+*idealize*
+IntelliJ Idea の全ての設定ファイルを作成します。
+
+*javadoc*
+アプリケーションの Javadoc を生成します。
+
+*auto-test*
+全てのアプリケーションのテストを自動的に実行します。
+
+*clean*
+(バイトコードキャッシュを含む) 一時ファイルを削除します。
+
+*test*
+現在のシェルでアプリケーションをテストモードで実行します。
+
+*precompile*
+アプリケーションの起動を高速化するため全ての Java のソースとテンプレートをプリコンパイルします。
+
+*war*
+スタンドアロンの WAR アーカイブとしてアプリケーションをエクスポートします。
+
+*run*
+現在のシェルでアプリケーションを実行します。
+
+*start*
+バックグラウンドでアプリケーションを起動します。
+
+*stop*
+実行中のアプリケーションを停止します。
+
+*restart*
+実行中のアプリケーションを再起動します。
+
+*status*
+実行中のアプリケーションの状態を表示します。
+
+*out*
+logs/system.out ファイルの内容をリアルタイムで表示します。
+
+*pid*
+実行中のアプリケーションの PID を表示します。
+
+*check*
+現在のものより新しい Play framework のリリースがあるかどうかチェックします。
+
+*help*
+指定したコマンドのヘルプを表示します。