This is an automated email from the ASF dual-hosted git repository.

snoopdave pushed a commit to branch roller7-hit-list-fixes
in repository https://gitbox.apache.org/repos/asf/roller.git

commit a7175fae541151a8b65968e39761e6872be0a039
Author: David M. Johnson <[email protected]>
AuthorDate: Wed Nov 11 17:22:50 2026 -0500

    Tidy the install result pages and fix rough edges found upgrading to 7.0
    
    - The database create and upgrade result pages show a status alert, one
      Start Roller button and the script output in a collapsible panel. The
      first output line is no longer indented more than the rest.
    - The setup token page no longer logs a Struts warning about the
      write-only token property.
    - The media library and image chooser create a weblog's default media
      folder when it is missing, instead of failing.
    - A custom template with no content logs one warning line, not a stack
      trace per request.
    - The 404 page shows a plain message and a home link, and unknown .rol
      URLs no longer log a stack trace.
---
 CHANGES.md                                         |   9 ++
 .../ui/rendering/servlets/PageServlet.java         |  12 +++
 .../ui/rendering/servlets/PreviewServlet.java      |  12 +++
 .../ui/struts2/editor/MediaFileImageChooser.java   |   5 +
 .../weblogger/ui/struts2/editor/MediaFileView.java |  18 +++-
 .../main/resources/ApplicationResources.properties |  13 ++-
 .../resources/ApplicationResources_de.properties   |   1 -
 .../resources/ApplicationResources_ja.properties   |   1 -
 .../resources/ApplicationResources_ko.properties   |   2 -
 .../ApplicationResources_zh_CN.properties          |   1 -
 app/src/main/resources/log4j2.xml                  |   5 +
 .../webapp/WEB-INF/jsps/core/BootstrapToken.jsp    |   3 +-
 .../webapp/WEB-INF/jsps/core/CreateDatabase.jsp    |  81 +++++++--------
 .../webapp/WEB-INF/jsps/core/InstallMessages.jspf  |  22 ++++
 .../webapp/WEB-INF/jsps/core/UpgradeDatabase.jsp   |  74 ++++++--------
 app/src/main/webapp/roller-ui/errors/404.jsp       |  29 +-----
 .../ui/struts2/editor/MediaFileViewTest.java       | 111 +++++++++++++++++++++
 .../java/org/apache/roller/playwright/BaseIT.java  |   5 +-
 18 files changed, 269 insertions(+), 135 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index fa53dc883..1e4a1da62 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -41,6 +41,15 @@
 - **The rich text editor's menus show their labels again.** Summernote is
   upgraded to 0.9.1, and the panel chevron no longer appears on the
   editor's menu items.
+- **Fixes found while upgrading a 6.1 site to a 7.0.0 snapshot.**
+  - The database create and upgrade result pages show a clear status, one
+    Start Roller button, and the script output in a panel you can expand.
+  - The media library opens for weblogs that have no default media folder;
+    it creates the folder instead of failing.
+  - A custom template with no content logs one warning line instead of a
+    stack trace, and requests for unknown pages no longer log one either.
+  - The 404 page shows a plain message and a link to the home page, not
+    the server's internal error text.
 
 ### Behaviour changes worth reading before upgrading
 
diff --git 
a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PageServlet.java
 
b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PageServlet.java
index c8092d30b..f7376e27b 100644
--- 
a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PageServlet.java
+++ 
b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PageServlet.java
@@ -42,6 +42,7 @@ import org.apache.roller.weblogger.pojos.WeblogTheme;
 import org.apache.roller.weblogger.ui.core.RollerContext;
 import org.apache.roller.weblogger.ui.rendering.Renderer;
 import org.apache.roller.weblogger.ui.rendering.RendererManager;
+import org.apache.roller.weblogger.ui.rendering.RenderingException;
 import org.apache.roller.weblogger.ui.rendering.model.ModelLoader;
 import org.apache.roller.weblogger.ui.rendering.util.InvalidRequestException;
 import org.apache.roller.weblogger.ui.rendering.util.ModDateHeaderUtil;
@@ -504,6 +505,17 @@ public class PageServlet extends HttpServlet {
             log.debug("Looking up renderer");
             renderer = RendererManager.getRenderer(page,
                     pageRequest.getDeviceType());
+        } catch (RenderingException e) {
+            // expected when a custom template has no content; one line is 
enough
+            log.warn("No renderer for template '" + page.getName() + "' (" + 
page.getId()
+                    + ") of weblog '" + weblog.getHandle() + "': " + 
e.getMessage()
+                    + " The template may have no content for this device 
type.");
+
+            if (!response.isCommitted()) {
+                response.reset();
+            }
+            response.sendError(HttpServletResponse.SC_NOT_FOUND);
+            return;
         } catch (Exception e) {
             // nobody wants to render my content :(
             log.error("Couldn't find renderer for page " + page.getId(), e);
diff --git 
a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewServlet.java
 
b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewServlet.java
index 743749435..1e6972388 100644
--- 
a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewServlet.java
+++ 
b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewServlet.java
@@ -33,6 +33,7 @@ import 
org.apache.roller.weblogger.config.WebloggerRuntimeConfig;
 import org.apache.roller.weblogger.ui.core.RollerContext;
 import org.apache.roller.weblogger.ui.rendering.Renderer;
 import org.apache.roller.weblogger.ui.rendering.RendererManager;
+import org.apache.roller.weblogger.ui.rendering.RenderingException;
 import org.apache.roller.weblogger.ui.rendering.model.ModelLoader;
 import org.apache.roller.weblogger.ui.rendering.util.PreviewAccess;
 import org.apache.roller.weblogger.ui.rendering.util.WeblogPreviewRequest;
@@ -256,6 +257,17 @@ public class PreviewServlet extends HttpServlet {
         try {
             log.debug("Looking up renderer");
             renderer = RendererManager.getRenderer(page, deviceType);
+        } catch (RenderingException e) {
+            // expected when a custom template has no content; one line is 
enough
+            log.warn("No renderer for template '" + page.getName() + "' (" + 
page.getId()
+                    + ") of weblog '" + weblog.getHandle() + "': " + 
e.getMessage()
+                    + " The template may have no content for this device 
type.");
+
+            if (!response.isCommitted()) {
+                response.reset();
+            }
+            response.sendError(HttpServletResponse.SC_NOT_FOUND);
+            return;
         } catch(Exception e) {
             // nobody wants to render my content :(
             log.error("Couldn't find renderer for page "+page.getId(), e);
diff --git 
a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileImageChooser.java
 
b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileImageChooser.java
index e0ab18b12..5ac31712e 100644
--- 
a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileImageChooser.java
+++ 
b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileImageChooser.java
@@ -100,6 +100,11 @@ public class MediaFileImageChooser extends MediaFileBase {
             if (directory == null) {
                 directory = 
manager.getDefaultMediaFileDirectory(getActionWeblog());
             }
+            if (directory == null) {
+                // weblogs created by old Roller versions may have no default 
folder
+                directory = 
manager.createDefaultMediaFileDirectory(getActionWeblog());
+                WebloggerFactory.getWeblogger().flush();
+            }
             this.currentDirectory = directory;
             this.directoryId = directory.getId();
 
diff --git 
a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileView.java
 
b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileView.java
index 29a0f3300..8d94c6ff5 100644
--- 
a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileView.java
+++ 
b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileView.java
@@ -193,6 +193,19 @@ public class MediaFileView extends MediaFileBase {
      *
      * @return String The result of the action.
      */
+    /**
+     * Returns the weblog's default media folder, creating it if it is missing.
+     * Weblogs created by old Roller versions may not have one.
+     */
+    private MediaFileDirectory defaultDirectory(MediaFileManager manager) 
throws WebloggerException {
+        MediaFileDirectory directory = 
manager.getDefaultMediaFileDirectory(getActionWeblog());
+        if (directory == null) {
+            directory = 
manager.createDefaultMediaFileDirectory(getActionWeblog());
+            WebloggerFactory.getWeblogger().flush();
+        }
+        return directory;
+    }
+
     @SkipValidation
     @Override
     public String execute() {
@@ -206,7 +219,7 @@ public class MediaFileView extends MediaFileBase {
                         getActionWeblog(), this.directoryName);
             }
             if (directory == null) {
-                directory = 
manager.getDefaultMediaFileDirectory(getActionWeblog());
+                directory = defaultDirectory(manager);
             }
             this.currentDirectory = directory;
             this.directoryId = directory.getId();
@@ -355,8 +368,7 @@ public class MediaFileView extends MediaFileBase {
                 CacheManager.invalidate(getActionWeblog());
 
                 // re-route to default folder
-                mediaFileDir = manager
-                        .getDefaultMediaFileDirectory(getActionWeblog());
+                mediaFileDir = defaultDirectory(manager);
                 setDirectoryId(mediaFileDir.getId());
                 setDirectoryName(mediaFileDir.getName());
                 clearSearch();
diff --git a/app/src/main/resources/ApplicationResources.properties 
b/app/src/main/resources/ApplicationResources.properties
index 888f3f87f..405d294a1 100644
--- a/app/src/main/resources/ApplicationResources.properties
+++ b/app/src/main/resources/ApplicationResources.properties
@@ -480,6 +480,7 @@ error.text.403=You do not have the privileges necessary to 
access the requested
 
 error.title.404=Sorry! We couldn't find your document
 error.text.404=The file that you requested could not be found on this server. 
+error.home=Go to the home page
 
 
 error.permissionDenied.title=Permission Denied
@@ -645,11 +646,8 @@ Roller is able to connect to your database of type [{0}], 
but found no tables.
 installer.createTables=Would you like Roller to create the tables for you?
 installer.yesCreateTables=Yes - create tables now
 installer.tablesCreated=Tables created successfully
-installer.tablesCreatedExplanation=Database tables were created successfully \
-as you can see below. 
-installer.tryBootstrapping=Database tables are present and up-to-date. \
-Click <a href="{0}">here</a> to complete the installation process and start \
-using Roller.
+installer.tablesCreatedExplanation=Roller created its database tables. \
+Start Roller to finish setting up.
 installer.errorCreatingTables=Error creating tables
 installer.errorCreatingTablesExplanation=Error creating tables, possibly due \
 to an error in the database creation script or because you are using an \
@@ -667,8 +665,9 @@ installer.upgradeTables=Would you like Roller to upgrade 
the tables for you?
 installer.yesUpgradeTables=Yes - upgrade tables now
 installer.finishUpgrade=Start Roller
 installer.tablesUpgraded=Tables were upgraded successfully
-installer.tablesUpgradedExplanation=\
-Database tables were upgraded successfully as you can see below. 
+installer.tablesUpgradedExplanation=Roller upgraded its database tables to \
+the current version. Start Roller to continue.
+installer.scriptOutput=Database script output
 installer.errorUpgradingTables=Error upgrading tables
 installer.errorUpgradingTablesExplanation=Error upgrading tables, possibly due 
\
 to an error in the database creation script or because you are using an \
diff --git a/app/src/main/resources/ApplicationResources_de.properties 
b/app/src/main/resources/ApplicationResources_de.properties
index 35d9ca673..d031dc981 100644
--- a/app/src/main/resources/ApplicationResources_de.properties
+++ b/app/src/main/resources/ApplicationResources_de.properties
@@ -397,7 +397,6 @@ installer.tablesCreated=Tabellen erfolgreich erstellt
 installer.tablesCreatedExplanation=Datenbanktabellen wurden erfolgreich 
erstellt (siehe unten).
 installer.tablesUpgraded=Tabellen wurden erfolgreich aktualisiert
 installer.tablesUpgradedExplanation=Datenbanktabellen wurden erfolgreich 
aktualisiert (siehe unten).
-installer.tryBootstrapping=Datenbanktabellen sind vorhanden und aktuell. 
Klicken Sie <a href="{0}">hier</a> um den Installationsprozess 
abzuschlie\u00DFen und Roller zu starten.
 installer.unknownError=Ein unbekannter Fehler ist aufgetreten
 installer.upgradeTables=M\u00F6chten Sie, dass Roller die Tabellen f\u00FCr 
Sie aktualisiert?
 installer.whatHappened=Was ist geschehen?
diff --git a/app/src/main/resources/ApplicationResources_ja.properties 
b/app/src/main/resources/ApplicationResources_ja.properties
index f6ca6b556..538b5684b 100644
--- a/app/src/main/resources/ApplicationResources_ja.properties
+++ b/app/src/main/resources/ApplicationResources_ja.properties
@@ -1012,7 +1012,6 @@ 
themeEditor.customTheme=\u30AB\u30B9\u30BF\u30E0\u30C6\u30FC\u30DE
 
installer.error.connection.pageTitle=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u63A5\u7D9A\u30A8\u30E9\u30FC
 
installer.database.creation.pageTitle=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u30C6\u30FC\u30D6\u30EB\u751F\u6210
 
installer.database.upgrade.pageTitle=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u30C6\u30FC\u30D6\u30EB\u30A2\u30C3\u30D7\u30B0\u30EC\u30FC\u30C9
-installer.tryBootstrapping=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u30C6\u30FC\u30D6\u30EB\u306E\u6E96\u5099\u304C\u6574\u3044\u307E\u3057\u305F\u3002<a
 
href="{0}">\u3053\u3053\u3092\u30AF\u30EA\u30C3\u30AF</a>\u3057\u3066\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u30D7\u30ED\u30BB\u30B9\u3092\u5B8C\u4E86\u3057\u3001Roller\u3092\u4F7F\u3044\u59CB\u3081\u3066\u304F\u3060\u3055\u3044\u3002
 
installer.databaseUpgradeNeeded=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u30C6\u30FC\u30D6\u30EB\u306E\u30A2\u30C3\u30D7\u30B0\u30EC\u30FC\u30C9\u304C\u5FC5\u8981\u3067\u3059\u3002
 
installer.tablesCreatedExplanation=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u30C6\u30FC\u30D6\u30EB\u304C\u4EE5\u4E0B\u306E\u3088\u3046\u306B\u4F5C\u6210\u3055\u308C\u307E\u3057\u305F
 
installer.tablesUpgradedExplanation=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u30C6\u30FC\u30D6\u30EB\u304C\u4EE5\u4E0B\u306E\u3088\u3046\u306B\u30A2\u30C3\u30D7\u30B0\u30EC\u30FC\u30C9\u3055\u308C\u307E\u3057\u305F
diff --git a/app/src/main/resources/ApplicationResources_ko.properties 
b/app/src/main/resources/ApplicationResources_ko.properties
index 3adb9a1a4..310bec63b 100644
--- a/app/src/main/resources/ApplicationResources_ko.properties
+++ b/app/src/main/resources/ApplicationResources_ko.properties
@@ -507,8 +507,6 @@ installer.yesCreateTables=\uc608 - 
\ud14c\uc774\ube14\ub4e4\uc744 \uc9c0\uae08 \
 installer.tablesCreated=\ud14c\uc774\ube14\ub4e4\uc774 
\uc131\uacf5\uc801\uc73c\ub85c \uc0dd\uc131\ub418\uc5c8\uc2b5\ub2c8\ub2e4.
 installer.tablesCreatedExplanation=\ub370\uc774\ud130\ubca0\uc774\uc2a4 
\ud14c\uc774\ube14\ub4e4\uc774 \uc544\ub798\uc640 \uac19\uc774 \
 \uc131\uacf5\uc801\uc73c\ub85c \uc0dd\uc131\ub418\uc5c8\uc2b5\ub2c8\ub2e4.
-installer.tryBootstrapping=\ub370\uc774\ud130\ubca0\uc774\uc2a4 
\ud14c\uc774\ube14\ub4e4\uc774 \uc874\uc7ac\ud558\uba70 \ucd5c\uc2e0 
\uc0c1\ud0dc\uc785\ub2c8\ub2e4. \
-<a href="{0}">\uc5ec\uae30</a>\ub97c \ud074\ub9ad\ud558\uc5ec \uc124\uce58 
\uacfc\uc815\uc744 \uc644\ub8cc\ud558\uace0 \ub864\ub7ec 
\uc2dc\uc2a4\ud15c\uc744 \uc2dc\uc791\uc2dc\ud0a4\uc2ed\uc2dc\uc624.
 installer.errorCreatingTables=\ud14c\uc774\ube14 \uc0dd\uc131 \uc624\ub958
 installer.errorCreatingTablesExplanation=\ud14c\uc774\ube14 \uc0dd\uc131 
\uc624\ub958\uc785\ub2c8\ub2e4. \
 \ub370\uc774\ud130\ubca0\uc774\uc2a4 \uc0dd\uc131 
\uc2a4\ud06c\ub9bd\ud2b8\uc758 \uc624\ub958\uc774\uac70\ub098 
\uc9c0\uc6d0\ub418\uc9c0 \uc54a\ub294 
\ub370\uc774\ud130\ubca0\uc774\uc2a4\ub97c \uc0ac\uc6a9\ud574\uc11c 
\ubc1c\uc0dd\ud588\uc744 \uc218 \uc788\uc2b5\ub2c8\ub2e4. \
diff --git a/app/src/main/resources/ApplicationResources_zh_CN.properties 
b/app/src/main/resources/ApplicationResources_zh_CN.properties
index 03792b4a7..f2eefeded 100644
--- a/app/src/main/resources/ApplicationResources_zh_CN.properties
+++ b/app/src/main/resources/ApplicationResources_zh_CN.properties
@@ -615,7 +615,6 @@ installer.yesCreateTables=\u662F - 
\u7ACB\u5373\u521B\u5EFA\u8868
 installer.tablesCreated=\u8868\u521B\u5EFA\u6210\u529F
 
installer.tablesCreatedExplanation=\u6570\u636E\u5E93\u8868\u5DF2\u6210\u529F\u521B\u5EFA\uFF0C\u5982\u4F60\u5728\u4E0B\u9762\u6240\u770B\u5230\u7684\u3002
 
-installer.tryBootstrapping=\u6570\u636E\u5E93\u8868\u5DF2\u751F\u6210\u5E76\u4E3A\u6700\u65B0\u7248\u672C\u3002\u9756\u70B9\u51FB
 <a href="{0}">\u8FD9\u91CC</a> 
\u5B8C\u6210\u5B89\u88C5\u8FDB\u7A0B\u5E76\u5F00\u59CB\u4F7F\u7528 Roller\u3002
 
 
 installer.errorCreatingTables=\u8868\u521B\u5EFA\u5931\u8D25
diff --git a/app/src/main/resources/log4j2.xml 
b/app/src/main/resources/log4j2.xml
index 727baa0e1..ef09fa281 100644
--- a/app/src/main/resources/log4j2.xml
+++ b/app/src/main/resources/log4j2.xml
@@ -74,6 +74,11 @@ limitations under the License.
         <Logger name="org.apache.velocity"     level="info"  
additivity="false"> <AppenderRef ref="asyncRoller"/> </Logger>
         <Logger name="org.springframework"     level="info"  
additivity="false"> <AppenderRef ref="asyncRoller"/> </Logger>
         <Logger name="org.apache.struts2"      level="info"  
additivity="false"> <AppenderRef ref="asyncRoller"/> </Logger>
+        <!-- Struts logs a full stack trace for every request to an unknown 
.rol URL; the user gets a 404 -->
+        <Logger name="org.apache.struts2.dispatcher.Dispatcher" level="info" 
additivity="false">
+            <RegexFilter regex="Could not find action or result: .*" 
onMatch="DENY" onMismatch="NEUTRAL"/>
+            <AppenderRef ref="asyncRoller"/>
+        </Logger>
         <Logger name="org.openid4java"         level="info"  
additivity="false"> <AppenderRef ref="asyncRoller"/> </Logger>
         <Logger name="org.apache.tiles"        level="info"  
additivity="false"> <AppenderRef ref="asyncRoller"/> </Logger>
         <Logger name="org.eclipse.persistence" level="info"  
additivity="false"> <AppenderRef ref="asyncRoller"/> </Logger>
diff --git a/app/src/main/webapp/WEB-INF/jsps/core/BootstrapToken.jsp 
b/app/src/main/webapp/WEB-INF/jsps/core/BootstrapToken.jsp
index 7172be820..c59f40a29 100644
--- a/app/src/main/webapp/WEB-INF/jsps/core/BootstrapToken.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/core/BootstrapToken.jsp
@@ -26,7 +26,8 @@
             <s:hidden name="salt" />
             <div class="mb-3">
                 <label class="form-label" for="setup-token"><s:text 
name="installer.bootstrap.tokenLabel" /></label>
-                <s:textfield id="setup-token" name="token" theme="simple"
+                <%-- value="" keeps Struts from reading the write-only token 
property back --%>
+                <s:textfield id="setup-token" name="token" value="" 
theme="simple"
                         cssClass="form-control" autocomplete="off" 
autofocus="autofocus"
                         required="required"
                         
oninput="document.getElementById('setup-token-submit').disabled = 
!this.value.trim()" />
diff --git a/app/src/main/webapp/WEB-INF/jsps/core/CreateDatabase.jsp 
b/app/src/main/webapp/WEB-INF/jsps/core/CreateDatabase.jsp
index e5340d847..7ed740d60 100644
--- a/app/src/main/webapp/WEB-INF/jsps/core/CreateDatabase.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/core/CreateDatabase.jsp
@@ -17,60 +17,49 @@
 --%>
 <%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
 
+<div class="row">
+    <div class="col-lg-8 offset-lg-2">
+
 <s:if test="error">
-    
-    <h2><s:text name="installer.errorCreatingTables" /></h2> 
-    <p><s:text name="installer.errorCreatingTablesExplanation" /></p> 
-<pre>
-<s:iterator value="messages"><s:property/><br /></s:iterator>
-</pre>
-    
+
+        <h2><s:text name="installer.errorCreatingTables" /></h2>
+        <div class="alert alert-danger" role="alert">
+            <s:text name="installer.errorCreatingTablesExplanation" />
+        </div>
+        <%@ include file="/WEB-INF/jsps/core/InstallMessages.jspf" %>
+
 </s:if>
 <s:elseif test="success">
 
-    <h2><s:text name="installer.tablesCreated" /></h2>
-    
-    <p><s:text name="installer.tablesCreatedExplanation" /></p>
-    <%-- the message's link submits this form; bootstrapping needs a POST --%>
-    <p>
-        <s:text name="installer.tryBootstrapping">
-            <s:param>#bootstrap</s:param>
-        </s:text>
-    </p>
-    <s:url var="bootstrapUrl" action="install!bootstrap" />
-    <form id="bootstrapForm" action="<s:property value="#bootstrapUrl" />" 
method="post">
-        <input type="hidden" name="salt" value="<s:property value="salt" />" />
-        <noscript><button type="submit"><s:text name="installer.finishUpgrade" 
/></button></noscript>
-    </form>
-    <script>
-        
document.querySelector('a[href="#bootstrap"]').addEventListener('click', 
function (event) {
-            event.preventDefault();
-            document.getElementById('bootstrapForm').submit();
-        });
-    </script>
-    
-<pre>
-<s:iterator value="messages"><s:property/><br /></s:iterator>
-</pre>
+        <h2><s:text name="installer.tablesCreated" /></h2>
+        <div class="alert alert-success" role="status">
+            <s:text name="installer.tablesCreatedExplanation" />
+        </div>
+
+        <s:form action="install!bootstrap" theme="simple">
+            <s:hidden name="salt" />
+            <s:submit value="%{getText('installer.finishUpgrade')}" 
cssClass="btn btn-primary" />
+        </s:form>
+
+        <%@ include file="/WEB-INF/jsps/core/InstallMessages.jspf" %>
 
 </s:elseif>
 <s:else>
-    
-    <h2><s:text name="installer.noDatabaseTablesFound" /></h2>
 
-    <p>
-        <s:text name="installer.noDatabaseTablesExplanation">
-            <s:param value="databaseProductName" />
-        </s:text>
-    </p>
-    <p><s:text name="installer.createTables" /></p>
+        <h2><s:text name="installer.noDatabaseTablesFound" /></h2>
+        <p>
+            <s:text name="installer.noDatabaseTablesExplanation">
+                <s:param value="databaseProductName" />
+            </s:text>
+        </p>
+        <p><s:text name="installer.createTables" /></p>
+
+        <s:form action="install!create" theme="simple">
+            <s:hidden name="salt" />
+            <s:submit value="%{getText('installer.yesCreateTables')}" 
cssClass="btn btn-primary" />
+        </s:form>
 
-    <s:form action="install!create">
-               <s:hidden name="salt" />
-        <s:submit theme="simple" 
value="%{getText('installer.yesCreateTables')}" cssClass="btn 
btn-outline-secondary" />
-    </s:form>
-    
 </s:else>
 
-<br />
-<br />
+    </div>
+</div>
diff --git a/app/src/main/webapp/WEB-INF/jsps/core/InstallMessages.jspf 
b/app/src/main/webapp/WEB-INF/jsps/core/InstallMessages.jspf
new file mode 100644
index 000000000..987583fbe
--- /dev/null
+++ b/app/src/main/webapp/WEB-INF/jsps/core/InstallMessages.jspf
@@ -0,0 +1,22 @@
+<%--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  The ASF licenses this file to You
+  under the Apache License, Version 2.0 (the "License"); you may not
+  use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.  For additional information regarding
+  copyright in this work, please see the NOTICE file in the top level
+  directory of this distribution.
+--%>
+<%-- Database script output for the install pages: one message per line, open 
when setup failed. --%>
+<details class="mt-3"<s:if test="error"> open</s:if>>
+    <summary><s:text name="installer.scriptOutput"/></summary>
+    <pre class="bg-body-tertiary border rounded p-3 mt-2 small"><s:iterator 
value="messages" status="line"><s:property/><s:if 
test="!#line.last">&#10;</s:if></s:iterator></pre>
+</details>
diff --git a/app/src/main/webapp/WEB-INF/jsps/core/UpgradeDatabase.jsp 
b/app/src/main/webapp/WEB-INF/jsps/core/UpgradeDatabase.jsp
index edc9569ed..24aabb8fb 100644
--- a/app/src/main/webapp/WEB-INF/jsps/core/UpgradeDatabase.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/core/UpgradeDatabase.jsp
@@ -17,63 +17,49 @@
 --%>
 <%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
 
+<div class="row">
+    <div class="col-lg-8 offset-lg-2">
 
 <s:if test="error">
 
-    <h2><s:text name="installer.errorUpgradingTables"/></h2>
-    <p><s:text name="installer.errorUpgradingTablesExplanation"/></p>
-    <pre>
-        <s:iterator value="messages"><s:property/><br/></s:iterator>
-    </pre>
+        <h2><s:text name="installer.errorUpgradingTables"/></h2>
+        <div class="alert alert-danger" role="alert">
+            <s:text name="installer.errorUpgradingTablesExplanation"/>
+        </div>
+        <%@ include file="/WEB-INF/jsps/core/InstallMessages.jspf" %>
 
 </s:if>
 <s:elseif test="upgradeRequired">
 
-    <h2><s:text name="installer.databaseUpgradeNeeded"/></h2>
+        <h2><s:text name="installer.databaseUpgradeNeeded"/></h2>
+        <p>
+            <s:text name="installer.databaseUpgradeNeededExplanation">
+                <s:param value="databaseProductName"/>
+            </s:text>
+        </p>
+        <p><s:text name="installer.upgradeTables"/></p>
 
-    <p>
-        <s:text name="installer.databaseUpgradeNeededExplanation">
-            <s:param value="databaseProductName"/>
-        </s:text>
-    </p>
-    <p><s:text name="installer.upgradeTables"/></p>
-
-    <s:form action="install!upgrade">
-        <s:hidden name="salt"/>
-        <s:submit theme="simple" 
value="%{getText('installer.yesUpgradeTables')}" cssClass="btn btn-primary" />
-    </s:form>
+        <s:form action="install!upgrade" theme="simple">
+            <s:hidden name="salt"/>
+            <s:submit value="%{getText('installer.yesUpgradeTables')}" 
cssClass="btn btn-primary" />
+        </s:form>
 
 </s:elseif>
 <s:else>
 
-    <h2><s:text name="installer.tablesUpgraded"/></h2>
-
-    <p><s:text name="installer.tablesUpgradedExplanation"/></p>
-    <%-- the message's link submits this form; bootstrapping needs a POST --%>
-    <p>
-        <s:text name="installer.tryBootstrapping">
-            <s:param>#bootstrap</s:param>
-        </s:text>
-    </p>
-    <s:url var="bootstrapUrl" action="install!bootstrap" />
-    <form id="bootstrapForm" action="<s:property value="#bootstrapUrl" />" 
method="post">
-        <input type="hidden" name="salt" value="<s:property value="salt" />" />
-        <noscript><button type="submit"><s:text name="installer.finishUpgrade" 
/></button></noscript>
-    </form>
-    <script>
-        
document.querySelector('a[href="#bootstrap"]').addEventListener('click', 
function (event) {
-            event.preventDefault();
-            document.getElementById('bootstrapForm').submit();
-        });
-    </script>
+        <h2><s:text name="installer.tablesUpgraded"/></h2>
+        <div class="alert alert-success" role="status">
+            <s:text name="installer.tablesUpgradedExplanation"/>
+        </div>
 
-    <pre>
-        <s:iterator value="messages"><s:property/><br/></s:iterator>
-    </pre>
+        <s:form action="install!bootstrap" theme="simple">
+            <s:hidden name="salt"/>
+            <s:submit value="%{getText('installer.finishUpgrade')}" 
cssClass="btn btn-primary" />
+        </s:form>
 
-    <s:form action="install!bootstrap">
-        <s:hidden name="salt"/>
-        <s:submit theme="simple" value="%{getText('installer.finishUpgrade')}" 
cssClass="btn btn-primary" />
-    </s:form>
+        <%@ include file="/WEB-INF/jsps/core/InstallMessages.jspf" %>
 
 </s:else>
+
+    </div>
+</div>
diff --git a/app/src/main/webapp/roller-ui/errors/404.jsp 
b/app/src/main/webapp/roller-ui/errors/404.jsp
index 5ee7ba1de..203bcf60f 100644
--- a/app/src/main/webapp/roller-ui/errors/404.jsp
+++ b/app/src/main/webapp/roller-ui/errors/404.jsp
@@ -28,34 +28,11 @@
     </head>
     <body>
         
+        <%-- show only a plain message: the container's error message can name 
internal actions --%>
         <div style="padding: 15px 25px 25px 25px">
             <h2 class="error"><fmt:message key="error.title.404" /></h2>
-            
-            <c:set var="status_code" 
value="${requestScope['jakarta.servlet.error.status_code']}" />
-            <c:set var="message"     
value="${requestScope['jakarta.servlet.error.message']}" />
-            <c:set var="type"        
value="${requestScope['jakarta.servlet.error.type']}" />
-            
-            <table width="80%" border="1px" style="border-collapse: collapse;">
-                <tr>
-                    <td width="20%">Status Code</td>
-                    <td><c:out value="${status_code}" /></td>
-                </tr>
-                <tr>
-                    <td width="20%">Message</td>
-                    <td><c:out value="${message}" /></td>
-                </tr>
-                <tr>
-                    <td width="20%">Type</td>
-                    <td><c:out value="${type}" /></td>
-                </tr>
-                <tr>
-                    <td width="20%">Exception</td>
-                    <td><fmt:message key="error.text.404" /></td>
-                </tr>
-            </table>
+            <p><fmt:message key="error.text.404" /></p>
+            <p><a href="<c:url value="/"/>"><fmt:message key="error.home" 
/></a></p>
         </div>
-        
-        <br />
-        <br />
     </body>
 </html>
diff --git 
a/app/src/test/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileViewTest.java
 
b/app/src/test/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileViewTest.java
new file mode 100644
index 000000000..41f2604dc
--- /dev/null
+++ 
b/app/src/test/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileViewTest.java
@@ -0,0 +1,111 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.roller.weblogger.ui.struts2.editor;
+
+
+import java.util.Collections;
+
+import org.apache.roller.weblogger.business.MediaFileManager;
+import org.apache.roller.weblogger.business.Weblogger;
+import org.apache.roller.weblogger.business.WebloggerFactory;
+import org.apache.roller.weblogger.config.WebloggerRuntimeConfig;
+import org.apache.roller.weblogger.pojos.MediaFileDirectory;
+import org.apache.roller.weblogger.pojos.Weblog;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.MockedStatic;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyList;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.mockStatic;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+/**
+ * The media library opens a weblog's default folder. Weblogs created by old
+ * Roller versions may not have one.
+ */
+class MediaFileViewTest {
+
+    private MockedStatic<WebloggerFactory> factory;
+    private MockedStatic<WebloggerRuntimeConfig> runtimeConfig;
+    private Weblogger weblogger;
+    private MediaFileManager media;
+    private Weblog weblog;
+    private MediaFileView action;
+
+    @BeforeEach
+    void setUp() throws Exception {
+        media = mock(MediaFileManager.class);
+        weblogger = mock(Weblogger.class);
+        when(weblogger.getMediaFileManager()).thenReturn(media);
+        factory = mockStatic(WebloggerFactory.class);
+        factory.when(WebloggerFactory::getWeblogger).thenReturn(weblogger);
+        runtimeConfig = mockStatic(WebloggerRuntimeConfig.class);
+        
runtimeConfig.when(WebloggerRuntimeConfig::getRelativeContextURL).thenReturn("/roller");
+
+        when(media.getMediaFileCount(any(), any())).thenReturn(0L);
+        when(media.searchMediaFiles(any(), 
any())).thenReturn(Collections.emptyList());
+
+        weblog = mock(Weblog.class);
+        when(weblog.getHandle()).thenReturn("oldblog");
+
+        action = spy(new MediaFileView());
+        doAnswer(call -> 
call.getArgument(0)).when(action).getText(anyString());
+        doAnswer(call -> 
call.getArgument(0)).when(action).getText(anyString(), anyList());
+        action.setActionWeblog(weblog);
+    }
+
+    @AfterEach
+    void tearDown() {
+        runtimeConfig.close();
+        factory.close();
+    }
+
+    @Test
+    void createsMissingDefaultFolder() throws Exception {
+        MediaFileDirectory created = new MediaFileDirectory(weblog, "default", 
"default directory");
+        when(media.getDefaultMediaFileDirectory(weblog)).thenReturn(null);
+        
when(media.createDefaultMediaFileDirectory(weblog)).thenReturn(created);
+
+        action.execute();
+
+        assertFalse(action.hasActionErrors());
+        assertSame(created, action.getCurrentDirectory());
+        verify(weblogger).flush();
+    }
+
+    @Test
+    void usesExistingDefaultFolder() throws Exception {
+        MediaFileDirectory existing = new MediaFileDirectory(weblog, 
"default", "default directory");
+        when(media.getDefaultMediaFileDirectory(weblog)).thenReturn(existing);
+
+        action.execute();
+
+        assertFalse(action.hasActionErrors());
+        assertSame(existing, action.getCurrentDirectory());
+        verify(media, never()).createDefaultMediaFileDirectory(any());
+    }
+}
diff --git 
a/it-playwright/src/test/java/org/apache/roller/playwright/BaseIT.java 
b/it-playwright/src/test/java/org/apache/roller/playwright/BaseIT.java
index 692cce341..49386c2c1 100644
--- a/it-playwright/src/test/java/org/apache/roller/playwright/BaseIT.java
+++ b/it-playwright/src/test/java/org/apache/roller/playwright/BaseIT.java
@@ -108,12 +108,11 @@ abstract class BaseIT {
             p.waitForLoadState();
 
             // a database Roller has not installed yet: create the tables, then
-            // follow the installer's link, which posts the bootstrap form, to
-            // start the application
+            // press Start Roller to start the application
             var createTables = p.locator("form[action*='install!create'] 
input[type='submit']");
             if (createTables.count() > 0) {
                 createTables.click();
-                p.locator("a[href='#bootstrap']").click();
+                p.locator("form[action*='install!bootstrap'] 
input[type='submit']").click();
                 p.waitForLoadState();
             }
 

Reply via email to