put nosto changes on top play master

documentation/manual/configuration.textile

@@ -632,6 +632,15 @@ bc. http.cacheControl=0
 Default: @3600@ - set cache expiry to one hour.
 
 
+h3(#http.allowed.method.override). http.allowed.method.override
+
+Define allowed methods that will be handled when defined in X-HTTP-Method-Override
+
+bc. http.allowed.method.override=POST
+
+Default: none
+
+
 h3(#http.exposePlayServer). http.exposePlayServer
 
 Disable the HTTP response header that identifies the HTTP server as Play. For example:

documentation/manual/releases/release1.4.x/releasenotes-1.4.6.textile

@@ -0,0 +1,9 @@
+h1. Play 1.4.6 -- Release notes
+
+Play 1.4.6 has been released of the 1.4.x maintenance branch.
+The changes in this release are listed in the "Play 1.4.6 milestone":https://play.lighthouseapp.com/projects/57987-play-framework/milestones/237004-146 on Lighthouse and "1.4.6 on github":https://github.com/playframework/play1/milestone/9 including 1 resolved tickets.
+
+
+h2. What's fixed in Play 1.4.6
+
+* "#1300:https://github.com/playframework/play1/issues/1300 : Define allowed methods used in 'X-HTTP-Method-Override

documentation/manual/releases/release1.5.x/releasenotes-1.5.3.textile

@@ -0,0 +1,30 @@
+# Play 1.5.3 -- Release notes
+
+Play 1.5.3 has been released of the master branch.
+
+The changes in this release are listed in the "Play 1.5.3 milestone":https://play.lighthouseapp.com/projects/57987-play-framework/milestones/237003-153 on Lighthouse and "1.5.3 on github":https://github.com/playframework/play1/milestone/8?closed=1 including 16 resolved tickets.
+
+
+## What's new in Play 1.5.3
+
+* "#1279":https://github.com/playframework/play1/issues/1279 : [#1262] Allow to override default fast tags with empty namespace
+* "#1290":https://github.com/playframework/play1/issues/1290 : hibernate 5.4 update
+* "#1292":https://github.com/playframework/play1/issues/1292 : Java 11 (JDT update)
+* "#1293":https://github.com/playframework/play1/issues/1293 : HikariCP: config property for init connection sql added
+
+## What's fixed in Play 1.5.3
+
+* "#1156":https://github.com/playframework/play1/issues/1156 : [#2128] feature: help for module commands
+* "#1221":https://github.com/playframework/play1/issues/1221 : [#2155] Silent or suppressed errors in unittest PluginCollectionTest#skipsDuplicatePlugins
+* "#1222":https://github.com/playframework/play1/issues/1222 : [#2155] Silent or suppressed errors in unittest PluginCollectionTest#skipsDuplicatePlugins
+* "#1262":https://github.com/playframework/play1/issues/1262 : Play1.4.3 and newer not allow to override default FastTag.class (empty namespace) using @FastTags.Namespace("")
+* "#1281":https://github.com/playframework/play1/issues/1281 : Lighthouse#2273: Stop Fixtures attempting to set static (Map) fields
+* "#1287":https://github.com/playframework/play1/issues/1287 : Fix JPA version to match what Hibernate 5.3+ supports.
+* "#1294":https://github.com/playframework/play1/issues/1294 : Does not make sense to default MySQL character set and collation properties on connection URL
+* "#1295":https://github.com/playframework/play1/issues/1295 : Remove MySQL connection charset property defaults
+* "#1298":https://github.com/playframework/play1/issues/1298 : SslHttpServerContextFactory does not support private key only PEM content
+* "#1299":https://github.com/playframework/play1/issues/1299 : #1298: Handle only private key info from PEM
+* "#1300":https://github.com/playframework/play1/issues/1300 : Define allowed methods used in 'X-HTTP-Method-Override'
+* "#1301":https://github.com/playframework/play1/issues/1301 : [#1300] feat: Define allowed methods used in 'X-HTTP-Method-Override'
+* "#2128":https://play.lighthouseapp.com/projects/57987/tickets/2128 : help for module comannds like for core commands no tags
+* "#2155":https://play.lighthouseapp.com/projects/57987/tickets/2155 : Silent or suppressed errors in unittest PluginCollectionTest#skipsDuplicatePlugins unittes

documentation/manual/releases/releases.textile

@@ -4,12 +4,15 @@ You can download Play releases "here":https://www.playframework.com/download. Ea
 
 h2. Play 1.5.x
 
+# "Play 1.5.3":release1.5.x/releasenotes-1.5.3
 # "Play 1.5.2":release1.5.x/releasenotes-1.5.2
 # "Play 1.5.1":release1.5.x/releasenotes-1.5.1
 # "Play 1.5.0":release1.5.x/releasenotes-1.5.0
 
 h2. Play 1.4.x
 
+# "Play 1.4.6":release1.4.x/releasenotes-1.4.6
+# "Play 1.4.5":release1.4.x/releasenotes-1.4.5
 # "Play 1.4.4":release1.4.x/releasenotes-1.4.4
 # "Play 1.4.3":release1.4.x/releasenotes-1.4.3
 # "Play 1.4.2":release1.4.x/releasenotes-1.4.2

framework/dependencies.yml

@@ -38,7 +38,6 @@ require:    &allDependencies
     - org.hamcrest -> hamcrest-all 1.3
     - junit 4.12
     - jregex 1.2_01
-    - log4j 1.2.17
     - net.sf.ehcache -> ehcache 2.10.6
     - net.sf.ezmorph -> ezmorph 1.0.6
     - net.sf.jsr107cache -> jsr107cache 1.1
@@ -47,8 +46,8 @@ require:    &allDependencies
     - oauth.signpost -> signpost-core 1.2.1.2
     - org.apache.geronimo.specs -> geronimo-servlet_2.5_spec 1.2
     - org.apache.ivy -> ivy 2.4.0
-    - org.bouncycastle -> bcprov-jdk15on 1.60
-    - org.bouncycastle -> bcpkix-jdk15on 1.60
+    - org.bouncycastle -> bcprov-jdk15on 1.61
+    - org.bouncycastle -> bcpkix-jdk15on 1.61
     - org.codehaus.groovy -> groovy 2.5.3
     - org.codehaus.groovy -> groovy-xml 2.5.3
     - org.eclipse.jdt -> org.eclipse.jdt.core 3.16.0
@@ -57,7 +56,7 @@ require:    &allDependencies
     - javax.persistence -> javax.persistence-api 2.2
     - org.hibernate.common -> hibernate-commons-annotations 5.0.1.Final
     - org.hibernate -> hibernate-validator 5.4.1.Final
-    - org.jboss.logging -> jboss-logging 3.3.0.Final 
+    - org.jboss.logging -> jboss-logging 3.3.0.Final
     - org.jboss.spec.javax.transaction -> jboss-transaction-api_1.2_spec 1.0.1.Final
     - javax.persistence -> javax.persistence-api 2.2 
     - javax.xml.bind -> jaxb-api 2.3.1
@@ -69,12 +68,13 @@ require:    &allDependencies
     - org.javassist -> javassist 3.24.0-GA
     - io.netty -> netty 3.10.6.Final
     - org.postgresql -> postgresql 42.2.4
-    - org.slf4j -> slf4j-api 1.7.22
-    - org.slf4j -> slf4j-log4j12 1.7.22
     - org.yaml -> snakeyaml 1.17
     - net.spy -> spymemcached 2.12.1
     - com.thoughtworks.xstream -> xstream 1.4.9
     - xmlpull 1.1.3.4d_b4_min
+    - org.apache.logging.log4j -> log4j-core 2.8.2
+    - org.apache.logging.log4j -> log4j-api 2.8.2
+    - org.apache.logging.log4j -> log4j-slf4j-impl 2.8.2
 
 # Default repositories, used for all projects
 repositories:

framework/pym/play/commands/autotest.py

@@ -59,7 +59,7 @@ def autotest(app, args):
       sys.exit(-1)
 
     # read parameters
-    add_options = []        
+    add_options = []
     if args.count('--unit'):
         args.remove('--unit')
         add_options.append('-DrunUnitTests')
@@ -90,6 +90,7 @@ def autotest(app, args):
     if os.path.exists(test_result):
         shutil.rmtree(test_result)
     sout = open(os.path.join(app.log_path(), 'system.out'), 'w')
+    args.append('-Dplay.autotest')
     java_cmd = app.java_cmd(args)
     try:
         play_process = subprocess.Popen(java_cmd, env=os.environ, stdout=sout)

framework/pym/play/commands/help.py

@@ -1,6 +1,6 @@
 # Display help
 
-import sys, os
+import sys, os, re
 
 COMMANDS = ['help']
 
@@ -15,15 +15,27 @@ def execute(**kargs):
     play_env = kargs.get("env")
     cmdloader = kargs.get("cmdloader")
 
-    if len(sys.argv) == 3:
-        cmd = sys.argv[2]
+    if len(args) == 1:
+        cmd = args[0]
         help_file = os.path.join(play_env["basedir"], 'documentation', 'commands', 'cmd-%s.txt' % cmd)
         if os.path.exists(help_file):
             print open(help_file, 'r').read()
         else:
-            print '~ Oops, command \'%s\' not found. Try just \'play help\' to list all commands.' % cmd
-            print '~'
-            sys.exit(-1)
+            exists = False
+            slugCmd = re.sub('[-\s]+', '-', re.sub('[^\w\s-]', '', cmd.encode('ascii', 'ignore')).strip().lower())
+            for module in app.modules():
+                help_file = os.path\
+                    .join(module, 'documentation', 'commands',
+                        'cmd-%s.txt'
+                          % slugCmd)
+                exists = os.path.exists(help_file)
+                if exists:
+                    print open(help_file, 'r').read()
+                    break
+            if not exists:
+                print '~ Oops, command \'%s\' not found. Try just \'play help\' to list all commands.' % cmd
+                print '~'
+                sys.exit(-1)
     else:
         main_help(cmdloader.commands, play_env)
 
@@ -52,4 +64,21 @@ def main_help(commands, play_env):
     print "~"
 
 def isCore(mod, play_env):
-    return mod.__file__.find(play_env["basedir"]) == 0
+    path = os.path.realpath(mod.__file__)
+    directory = os.path.realpath(play_env["basedir"])
+
+    isCore = True
+    try:
+        relpath = os.path.relpath(path, directory)
+        if relpath.startswith(os.pardir):
+            isCore = False
+        else:
+            if relpath.startswith('modules'):
+                isCore = False
+            else:
+                isCore = mod.__file__.find(play_env["basedir"]) == 0
+    except ValueError:
+        isCore = False
+
+    return isCore
+