Upstream pull 2024 02

framework/build.xml

@@ -253,10 +253,10 @@
         <condition property="playExtension" value="">
             <and><os family="unix"/></and>
         </condition>
-        <condition property="pythonExecutable" value="python">
+        <condition property="pythonExecutable" value="python3">
             <and><os family="windows"/></and>
         </condition>
-        <condition property="pythonExecutable" value="python">
+        <condition property="pythonExecutable" value="python3">
             <and><os family="unix"/></and>
         </condition>
 
@@ -280,30 +280,37 @@
             <param name="testAppPath" value="${basedir}/../samples-and-tests/just-test-cases"/>
             <param name="play.user.language" value="-Duser.language=en"/>
             <param name="play.user.country" value="-Duser.country=US"/>
+            <param name="play.enhancement" value="-DenableAllEnhancers=true" />
         </antcall>
 
         <antcall target="play-test">
             <param name="testAppPath" value="${basedir}/../samples-and-tests/forum"/>
+            <param name="play.enhancement" value="-DenableAllEnhancers=true" />
         </antcall>
 
         <antcall target="play-test">
             <param name="testAppPath" value="${basedir}/../samples-and-tests/zencontact"/>
+            <param name="play.enhancement" value="-DenableAllEnhancers=true" />
         </antcall>
 
         <antcall target="play-test">
             <param name="testAppPath" value="${basedir}/../samples-and-tests/jobboard"/>
+            <param name="play.enhancement" value="-DenableAllEnhancers=true" />
         </antcall>
 
         <antcall target="play-test">
             <param name="testAppPath" value="${basedir}/../samples-and-tests/yabe"/>
+            <param name="play.enhancement" value="-DenableAllEnhancers=true" />
         </antcall>
 
         <antcall target="play-test">
             <param name="testAppPath" value="${basedir}/../samples-and-tests/nonstatic-app"/>
+            <param name="play.enhancement" value="-DenableAllEnhancers=true" />
         </antcall>
 
         <antcall target="play-test">
             <param name="testAppPath" value="${basedir}/../samples-and-tests/fast-tag"/>
+            <param name="play.enhancement" value="-DenableAllEnhancers=true" />
         </antcall>
 
         <antcall target="test-success" />
@@ -337,6 +344,7 @@
             <arg value="${testAppPath}"/>
             <arg value="${play.user.language}" if:set="play.user.language"/>
             <arg value="${play.user.country}" if:set="play.user.country"/>
+            <arg value="${play.enhancement}" if:set="play.enhancement"/>
         </exec>
         <available file="${testAppPath}/test-result/result.passed" property="${testAppPath}testPassed" />
         <fail message="Last test has failed ! (Check results in file://${testAppPath}/test-result)">

framework/dependencies.yml

@@ -44,13 +44,13 @@ require:    &allDependencies
     - net.sf.ehcache -> ehcache 2.10.9.2
     - net.sf.ezmorph -> ezmorph 1.0.6
     - net.sf.jsr107cache -> jsr107cache 1.1
-    - net.sf.oval -> oval 1.90
-    - com.mysql -> mysql-connector-j 8.1.0
+    - net.sf.oval -> oval 3.1.0
     - oauth.signpost -> signpost-core 1.2.1.2
     - org.apache.geronimo.specs -> geronimo-servlet_2.5_spec 1.2
     - org.apache.ivy -> ivy 2.5.2
     - org.bouncycastle -> bcprov-jdk18on 1.76
     - org.bouncycastle -> bcpkix-jdk18on 1.76
+    - org.bouncycastle -> bcutil-jdk18on 1.76
     - org.codehaus.groovy -> groovy 3.0.19
     - org.codehaus.groovy -> groovy-xml 3.0.19
     - org.eclipse.jdt -> org.eclipse.jdt.core 3.33.0
@@ -63,6 +63,7 @@ require:    &allDependencies
     - io.smallrye -> jandex 3.1.5
     - org.jboss.logging -> jboss-logging 3.5.3.Final
     - org.jboss.spec.javax.transaction -> jboss-transaction-api_1.2_spec 1.1.1.Final
+    - javax.persistence -> javax.persistence-api 2.2
     - javax.xml.bind -> jaxb-api 2.3.1
     - org.glassfish.jaxb -> jaxb-runtime 2.3.8
     - com.fasterxml -> classmate 1.6.0
@@ -78,6 +79,7 @@ require:    &allDependencies
     - net.spy -> spymemcached 2.12.3
     - com.thoughtworks.xstream -> xstream 1.4.20
     - xmlpull 1.1.3.4d_b4_min
+    - org.apache.logging.log4j -> log4j-web 2.18.0
 
 # Default repositories, used for all projects
 repositories:

framework/pym/play/commands/autotest.py

@@ -60,7 +60,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')
@@ -91,6 +91,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/base.py

@@ -44,6 +44,8 @@ def execute(**kargs):
         test(app, args)
     if command == 'auto-test' or command == 'autotest':
         autotest(app, args)
+    if command == 'junit':
+        junit(app, args)
     if command == 'modules':
         show_modules(app, args)
 

framework/pym/play/commands/junit.py

@@ -0,0 +1,86 @@
+# Command related to execution: junit
+
+import sys
+import os, os.path
+import shutil
+import subprocess
+import signal
+
+from play.utils import *
+
+COMMANDS = ['junit']
+
+HELP = {
+    'junit': "Automatically run all application tests (via Junit directly)"
+}
+
+process = None
+
+def handle_sigterm(signum, frame):
+    global process
+    if 'process' in globals():
+        print("~ Terminating Java proces (SIGTERM)")
+        process.terminate()
+        sys.exit(0)
+
+first_sigint = True
+
+def handle_sigint(signum, frame):
+    global process
+    global first_sigint
+    if 'process' in globals():
+        if first_sigint:
+            # Prefix with new line because ^C usually appears on the terminal
+            print("\nTerminating Java process")
+            process.terminate()
+            first_sigint = False
+        else:
+            print("\nKilling Java process")
+            process.kill()
+
+def execute(**kargs):
+    app = kargs.get("app")
+    args = kargs.get("args")
+    junit(app, args)
+
+def junit(app, args):
+    app.check()
+    print("~ Running junit")
+    print("~ Running in test mode")
+    print("~ Ctrl+C to stop")
+    print("~ ")
+
+    print("~ Deleting %s" % os.path.normpath(os.path.join(app.path, 'tmp')))
+    if os.path.exists(os.path.join(app.path, 'tmp')):
+        shutil.rmtree(os.path.join(app.path, 'tmp'))
+    print("~")
+
+    # read parameters
+    add_options = []
+    if args.count('--unit'):
+        args.remove('--unit')
+        add_options.append('-DrunUnitTests')
+
+    if args.count('--functional'):
+        args.remove('--functional')
+        add_options.append('-DrunFunctionalTests')
+
+    # Run app
+    test_result = os.path.join(app.path, 'test-result')
+    if os.path.exists(test_result):
+        print("~ cleaning test results")
+        shutil.rmtree(test_result)
+    args.append('-Dplay.autotest')
+    java_cmd = app.java_cmd(args, className='play.test.Runner')
+    try:
+        process = subprocess.Popen(java_cmd, env=os.environ)
+        signal.signal(signal.SIGTERM, handle_sigterm)
+        signal.signal(signal.SIGINT, handle_sigint)
+        return_code = process.wait()
+        if 0 != return_code:
+            print("~ java process exited with exit code %d" % return_code)
+            sys.exit(return_code)
+    except OSError:
+        print("Could not execute the java executable, please make sure the JAVA_HOME environment variable is set properly (the java executable should reside at JAVA_HOME/bin/java). ")
+        sys.exit(-1)
+

framework/src/play/Play.java

@@ -23,6 +23,8 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import org.apache.logging.log4j.LogManager;
+
 import play.cache.Cache;
 import play.classloading.ApplicationClasses;
 import play.classloading.ApplicationClassloader;
@@ -204,6 +206,9 @@ public boolean isProd() {
      *            The framework id to use
      */
     public static void init(File root, String id) {
+        long start = System.currentTimeMillis();
+        Logger.info("Play initializing");
+
         // Simple things
         Play.id = id;
         Play.started = false;
@@ -335,6 +340,8 @@ public static void init(File root, String id) {
         pluginCollection.onApplicationReady();
 
         Play.initialized = true;
+        long duration = (System.currentTimeMillis() - start) / 1000;
+        Logger.info("Play initialized (%s s)", duration);
     }
 
     public static void guessFrameworkPath() {
@@ -470,8 +477,9 @@ private static Properties readOneConfigurationFile(String filename) {
      * Start the application. Recall to restart !
      */
     public static synchronized void start() {
+        long start = System.currentTimeMillis();
         try {
-
+            Logger.info(started ? "Play restarting" : "Play starting");
             if (started) {
                 stop();
             }
@@ -588,19 +596,25 @@ public static synchronized void start() {
             }
             throw new UnexpectedException(e);
         }
+        long duration = (System.currentTimeMillis() - start) / 1000;
+        Logger.info("Play started (%s s)", duration);
     }
 
     /**
      * Stop the application
      */
     public static synchronized void stop() {
         if (started) {
+            long start = System.currentTimeMillis();
             Logger.trace("Stopping the play application");
             pluginCollection.onApplicationStop();
             started = false;
             Cache.stop();
             Router.lastLoading = 0L;
             Invoker.resetClassloaders();
+            long duration = (System.currentTimeMillis() - start) / 1000;
+            Logger.info("Play stopped (%s s)", duration);
+            LogManager.shutdown();
         }
     }
 
@@ -653,6 +667,9 @@ public static synchronized void detectChanges() {
         if (mode == Mode.PROD) {
             return;
         }
+        if (runningInTestMode() && System.getProperty("play.autotest") != null) {
+            return;
+        }
         try {
             pluginCollection.beforeDetectingChanges();
             if (!pluginCollection.detectClassesChange()) {
@@ -723,7 +740,7 @@ public static void loadModules() {
     /**
      * Load all modules. You can even specify the list using the MODULES environment
      * variable.
-     * 
+     *
      * @param appRoot
      *            the application path virtual file
      */
@@ -871,11 +888,11 @@ public static File getFile(String path) {
      *
      * Your app is running in test-mode if the framework id (Play.id) is 'test' or
      * 'test-?.*'
-     * 
+     *
      * @return true if test mode
      */
     public static boolean runningInTestMode() {
-        return id.matches("test|test-?.*");
+        return id.startsWith("test");
     }
 
     /**