Merge branch 'current' into issue-4212

extension/tempdir/src/main/java/cloud/piranha/extension/tempdir/TempDirExtension.java

@@ -30,10 +30,10 @@
 import cloud.piranha.core.api.WebApplication;
 import cloud.piranha.core.api.WebApplicationExtension;
 import java.lang.System.Logger;
-import static java.lang.System.Logger.Level.DEBUG;
+import static java.lang.System.Logger.Level.TRACE;
 
 /**
- * The WebApplicationExtension that adds the TempDirServletContainerInitializer.
+ * The WebApplicationExtension that configures the TEMPDIR functionality.
  *
  * @author Manfred Riem ([email protected])
  */
@@ -44,9 +44,18 @@ public class TempDirExtension implements WebApplicationExtension {
      */
     private static final Logger LOGGER = System.getLogger(TempDirExtension.class.getName());
 
+    /**
+     * Constructor.
+     */
+    public TempDirExtension() {
+    }
+
     @Override
     public void configure(WebApplication webApplication) {
-        LOGGER.log(DEBUG, "Adding the TempDirServletContainerInitializer");
-        webApplication.addInitializer(new TempDirServletContainerInitializer());
+        LOGGER.log(TRACE, "Configuring the TEMPDIR extension");
+
+        if (Boolean.parseBoolean(System.getProperty("cloud.piranha.extension.tempdir.TempDirExtension.enabled", "true"))) {
+            webApplication.addInitializer(new TempDirServletContainerInitializer());
+        }
     }
 }

extension/tempdir/src/main/java/cloud/piranha/extension/tempdir/TempDirServletContainerInitializer.java

@@ -49,6 +49,12 @@ public class TempDirServletContainerInitializer implements ServletContainerIniti
      */
     private static final Logger LOGGER = System.getLogger(TempDirServletContainerInitializer.class.getName());
 
+    /**
+     * Constructor.
+     */
+    public TempDirServletContainerInitializer() {
+    }
+
     @Override
     public void onStartup(Set<Class<?>> classes, ServletContext servletContext) throws ServletException {
         File baseDir = new File("tmp");

extension/tempdir/src/main/java/module-info.java

@@ -29,6 +29,21 @@
 /**
  * This module delivers the TEMPDIR extension.
  * 
+ * <p>
+ * The following property can be used to influence the workings of this module.
+ * </p>
+ * <table>
+ *  <tr>
+ *   <th>Property</th>
+ *   <th>Notes</th>
+ *  </tr>
+ *  <tr>
+ *   <td>cloud.piranha.extension.tempdir.TempDirExtension.enabled</td>
+ *   <td>true to enable (default), false to disable</td>
+ *  </tr>
+ *  <caption>Configurable properties</caption>
+ * </table>
+ * 
  * @author Manfred Riem ([email protected])
  */
 module cloud.piranha.extension.tempdir {