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

snoopdave pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/roller.git


The following commit(s) were added to refs/heads/master by this push:
     new f41dbb10e Tidy the install result pages and fix rough edges found 
upgrading to 7.0 (#244)
f41dbb10e is described below

commit f41dbb10e329a5d16368bbe09e2004697a8bf90b
Author: David M. Johnson <[email protected]>
AuthorDate: Sat Nov 14 13:17:27 2026 -0500

    Tidy the install result pages and fix rough edges found upgrading to 7.0 
(#244)
    
    * 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.
    
    * Address review comments on the hit-list fixes
    
    - Add MediaFileManager.getOrCreateDefaultMediaFileDirectory and use it
      everywhere a default media folder is needed, including the MetaWeblog
      and AtomPub media paths.
    - Look renderers up with RendererManager.findRenderer and share the 404
      handling between PageServlet and PreviewServlet, logging the "no
      content" warning only when nothing else has logged the cause.
    
    * Address second review of the hit-list fixes
    
    Tolerate duplicate default media folders, log a failing renderer factory and
    skip it, log the error in NoRenderer, stop creating the default folder on an
    AtomPub GET, and drop stale translated installer texts.
    
    * Create the default media folder on theme import; drop the log4j2 filter 
for unknown actions
    
    Address the third review of the hit-list fixes:
    - ThemeManagerImpl uses getOrCreateDefaultMediaFileDirectory, so importing a
      theme into a weblog with no default media folder no longer ends up with a
      null directory for root-level resources. New test in ThemeManagerTest.
    - Remove the Dispatcher logger filter that hid Struts' 'Could not find 
action
      or result' message, so a misconfigured action is not hidden.
    - CHANGES.md follows both changes.
---
 CHANGES.md                                         |  9 ++
 .../weblogger/business/MediaFileManager.java       |  9 ++
 .../business/jpa/JPAMediaFileManagerImpl.java      | 32 ++++---
 .../business/themes/ThemeManagerImpl.java          |  7 +-
 .../weblogger/ui/rendering/RendererManager.java    | 29 +++++--
 .../ui/rendering/servlets/NoRenderer.java          | 62 ++++++++++++++
 .../ui/rendering/servlets/PageServlet.java         | 17 +---
 .../ui/rendering/servlets/PreviewServlet.java      | 18 ++--
 .../weblogger/ui/struts2/editor/EntryEdit.java     |  6 +-
 .../weblogger/ui/struts2/editor/MediaFileAdd.java  |  5 +-
 .../ui/struts2/editor/MediaFileImageChooser.java   |  2 +-
 .../weblogger/ui/struts2/editor/MediaFileView.java |  5 +-
 .../webservices/atomprotocol/MediaCollection.java  |  3 +-
 .../webservices/xmlrpc/MetaWeblogAPIHandler.java   |  2 +-
 .../main/resources/ApplicationResources.properties | 13 ++-
 .../resources/ApplicationResources_de.properties   |  5 --
 .../resources/ApplicationResources_ja.properties   |  5 --
 .../resources/ApplicationResources_ko.properties   | 14 ----
 .../ApplicationResources_zh_CN.properties          |  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 +------
 .../roller/weblogger/business/MediaFileTest.java   | 59 +++++++++++++
 .../weblogger/business/ThemeManagerTest.java       | 38 +++++++++
 .../ui/rendering/servlets/NoRendererTest.java      | 74 +++++++++++++++++
 .../struts2/editor/EntryEditInlineImagesTest.java  |  2 +-
 .../ui/struts2/editor/MediaFileViewTest.java       | 97 ++++++++++++++++++++++
 .../atomprotocol/MediaCollectionPathTest.java      |  4 +-
 .../java/org/apache/roller/playwright/BaseIT.java  |  5 +-
 31 files changed, 514 insertions(+), 222 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 80333f77f..235284196 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -74,6 +74,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, and theme import works, for weblogs that have
+    no default media folder; Roller creates the folder instead of failing.
+  - A custom template with no content logs one warning line instead of a
+    stack trace.
+  - 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/business/MediaFileManager.java 
b/app/src/main/java/org/apache/roller/weblogger/business/MediaFileManager.java
index 326b46feb..90079cfa5 100644
--- 
a/app/src/main/java/org/apache/roller/weblogger/business/MediaFileManager.java
+++ 
b/app/src/main/java/org/apache/roller/weblogger/business/MediaFileManager.java
@@ -175,6 +175,15 @@ public interface MediaFileManager {
     MediaFileDirectory getDefaultMediaFileDirectory(Weblog weblog)
             throws WebloggerException;
 
+    /**
+     * Get the default folder for media files, creating it first if the weblog
+     * has none. Weblogs created by old Roller versions may not have one, so
+     * callers that need a folder should use this, not
+     * {@link #getDefaultMediaFileDirectory(Weblog)}.
+     */
+    MediaFileDirectory getOrCreateDefaultMediaFileDirectory(Weblog weblog)
+            throws WebloggerException;
+
     /**
      * Move a set of media files to a new directory.
      */
diff --git 
a/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAMediaFileManagerImpl.java
 
b/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAMediaFileManagerImpl.java
index d7cea2411..6ba8511c6 100644
--- 
a/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAMediaFileManagerImpl.java
+++ 
b/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAMediaFileManagerImpl.java
@@ -440,11 +440,14 @@ public class JPAMediaFileManagerImpl implements 
MediaFileManager {
                 .getNamedQuery("MediaFileDirectory.getByWeblogAndName", 
MediaFileDirectory.class);
         q.setParameter(1, weblog);
         q.setParameter(2, name);
-        try {
-            return q.getSingleResult();
-        } catch (NoResultException e) {
-            return null;
+        // Two requests that both found no folder can each have created one, 
and
+        // the table has no unique constraint, so don't fail on a duplicate
+        List<MediaFileDirectory> found = q.getResultList();
+        if (found.size() > 1) {
+            log.warn("Weblog " + weblog.getHandle() + " has " + found.size()
+                    + " media folders named '" + name + "'; using the first");
         }
+        return found.isEmpty() ? null : found.get(0);
     }
 
     /**
@@ -524,6 +527,20 @@ public class JPAMediaFileManagerImpl implements 
MediaFileManager {
         return getMediaFileDirectoryByName(weblog, "default");
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public MediaFileDirectory getOrCreateDefaultMediaFileDirectory(Weblog 
weblog)
+            throws WebloggerException {
+        MediaFileDirectory directory = getDefaultMediaFileDirectory(weblog);
+        if (directory == null) {
+            directory = createDefaultMediaFileDirectory(weblog);
+            roller.flush();
+        }
+        return directory;
+    }
+
     /**
      * {@inheritDoc}
      */
@@ -789,12 +806,7 @@ public class JPAMediaFileManagerImpl implements 
MediaFileManager {
                                     // create weblog's mediafile directory if
                                     // needed
                                     MediaFileDirectory root = this
-                                            
.getDefaultMediaFileDirectory(weblog);
-                                    if (root == null) {
-                                        root = this
-                                                
.createDefaultMediaFileDirectory(weblog);
-                                        roller.flush();
-                                    }
+                                            
.getOrCreateDefaultMediaFileDirectory(weblog);
 
                                     // upgrade!
                                     upgradeUploadsDir(
diff --git 
a/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeManagerImpl.java
 
b/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeManagerImpl.java
index 744cc5715..20b72564f 100644
--- 
a/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeManagerImpl.java
+++ 
b/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeManagerImpl.java
@@ -201,11 +201,6 @@ public class ThemeManagerImpl implements ThemeManager {
                WeblogManager wmgr = roller.getWeblogManager();
                MediaFileManager fileMgr = roller.getMediaFileManager();
 
-               MediaFileDirectory root = 
fileMgr.getDefaultMediaFileDirectory(weblog);
-        if (root == null) {
-            log.warn("Weblog " + weblog.getHandle() + " does not have a root 
MediaFile directory");
-        }
-
                Set<ComponentType> importedActionTemplates = 
EnumSet.noneOf(ComponentType.class);
                ThemeTemplate stylesheetTemplate = theme.getStylesheet();
                for (ThemeTemplate themeTemplate : theme.getTemplates()) {
@@ -314,7 +309,7 @@ public class ThemeManagerImpl implements ThemeManager {
                                String justPath;
 
                                if (resourcePath.indexOf('/') == -1) {
-                                       mdir = 
fileMgr.getDefaultMediaFileDirectory(weblog);
+                                       mdir = 
fileMgr.getOrCreateDefaultMediaFileDirectory(weblog);
                                        justPath = "";
                                        justName = resourcePath;
 
diff --git 
a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/RendererManager.java
 
b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/RendererManager.java
index 676971413..76884ee3c 100644
--- 
a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/RendererManager.java
+++ 
b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/RendererManager.java
@@ -81,17 +81,34 @@ public final class RendererManager {
     public static Renderer getRenderer(Template template, 
MobileDeviceRepository.DeviceType deviceType)
             throws RenderingException {
 
-        Renderer renderer;
+        Renderer renderer = findRenderer(template, deviceType);
+        if (renderer == null) {
+            throw new RenderingException("No renderer found for template " + 
template.getId() + "!");
+        }
+        return renderer;
+    }
+
+    /**
+     * Like {@link #getRenderer}, but returns null when no factory can render
+     * the template, for callers that answer that case with a 404. A factory
+     * that fails while creating a renderer has already logged why.
+     */
+    public static Renderer findRenderer(Template template, 
MobileDeviceRepository.DeviceType deviceType) {
 
         // iterate over our renderer factories and see if one of them
         // wants to handle this content
         for (RendererFactory rendererFactory : rendererFactories) {
-            renderer = rendererFactory.getRenderer(template, deviceType);
-            if (renderer != null) {
-                return renderer;
+            try {
+                Renderer renderer = rendererFactory.getRenderer(template, 
deviceType);
+                if (renderer != null) {
+                    return renderer;
+                }
+            } catch (RuntimeException e) {
+                // a factory that fails must not stop the others, or turn a 
404 into a 500
+                log.error("Renderer factory " + 
rendererFactory.getClass().getName()
+                        + " failed for template " + template.getId(), e);
             }
         }
-
-        throw new RenderingException("No renderer found for template " + 
template.getId() + "!");
+        return null;
     }
 }
diff --git 
a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/NoRenderer.java
 
b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/NoRenderer.java
new file mode 100644
index 000000000..3bffcef90
--- /dev/null
+++ 
b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/NoRenderer.java
@@ -0,0 +1,62 @@
+/*
+ * 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.
+ */
+
+package org.apache.roller.weblogger.ui.rendering.servlets;
+
+import java.io.IOException;
+import jakarta.servlet.http.HttpServletResponse;
+import org.apache.commons.logging.Log;
+import org.apache.roller.weblogger.WebloggerException;
+import org.apache.roller.weblogger.pojos.Template;
+import org.apache.roller.weblogger.pojos.TemplateRendition.RenditionType;
+import org.apache.roller.weblogger.pojos.Weblog;
+
+/**
+ * The answer to a page or preview request for a template that no renderer can
+ * render: log it once and send a 404.
+ */
+final class NoRenderer {
+
+    private NoRenderer() {
+    }
+
+    static void sendNotFound(HttpServletResponse response, Template page, 
Weblog weblog, Log log)
+            throws IOException {
+        if (hasNoContent(page, log)) {
+            // nothing else logs this case
+            log.warn("No renderer for template '" + page.getName() + "' (" + 
page.getId()
+                    + ") of weblog '" + weblog.getHandle() + "': it has no 
content.");
+        } else {
+            // the renderer factory already logged why it could not create a 
renderer
+            log.debug("No renderer for template " + page.getId());
+        }
+        if (!response.isCommitted()) {
+            response.reset();
+        }
+        response.sendError(HttpServletResponse.SC_NOT_FOUND);
+    }
+
+    private static boolean hasNoContent(Template page, Log log) {
+        try {
+            return page.getTemplateRendition(RenditionType.STANDARD) == null;
+        } catch (WebloggerException e) {
+            log.warn("Could not read the content of template " + page.getId(), 
e);
+            return false;
+        }
+    }
+}
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..ca9391a76 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
@@ -499,19 +499,10 @@ public class PageServlet extends HttpServlet {
         }
 
         // lookup Renderer we are going to use
-        Renderer renderer;
-        try {
-            log.debug("Looking up renderer");
-            renderer = RendererManager.getRenderer(page,
-                    pageRequest.getDeviceType());
-        } catch (Exception e) {
-            // nobody wants to render my content :(
-            log.error("Couldn't find renderer for page " + page.getId(), e);
-
-            if (!response.isCommitted()) {
-                response.reset();
-            }
-            response.sendError(HttpServletResponse.SC_NOT_FOUND);
+        log.debug("Looking up renderer");
+        Renderer renderer = RendererManager.findRenderer(page, 
pageRequest.getDeviceType());
+        if (renderer == null) {
+            NoRenderer.sendNotFound(response, page, weblog, log);
             return;
         }
 
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..d2cf6595d 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
@@ -252,21 +252,13 @@ public class PreviewServlet extends HttpServlet {
         
         
         // lookup Renderer we are going to use
-        Renderer renderer;
-        try {
-            log.debug("Looking up renderer");
-            renderer = RendererManager.getRenderer(page, deviceType);
-        } catch(Exception e) {
-            // nobody wants to render my content :(
-            log.error("Couldn't find renderer for page "+page.getId(), e);
-            
-            if (!response.isCommitted()) {
-                response.reset();
-            }
-            response.sendError(HttpServletResponse.SC_NOT_FOUND);
+        log.debug("Looking up renderer");
+        Renderer renderer = RendererManager.findRenderer(page, deviceType);
+        if (renderer == null) {
+            NoRenderer.sendNotFound(response, page, weblog, log);
             return;
         }
-        
+
         // render content
         CachedContent rendererOutput = new 
CachedContent(RollerConstants.TWENTYFOUR_KB_IN_BYTES);
         try {
diff --git 
a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryEdit.java
 
b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryEdit.java
index 329d065ce..2c89a3f71 100644
--- 
a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryEdit.java
+++ 
b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryEdit.java
@@ -394,11 +394,7 @@ public final class EntryEdit extends UIAction {
                 MediaFileManager mediaManager = WebloggerFactory.getWeblogger()
                         .getMediaFileManager();
                 MediaFileDirectory directory = mediaManager
-                        .getDefaultMediaFileDirectory(getActionWeblog());
-                if (directory == null) {
-                    directory = mediaManager.createDefaultMediaFileDirectory(
-                            getActionWeblog());
-                }
+                        
.getOrCreateDefaultMediaFileDirectory(getActionWeblog());
                 Map<String, String> mediaUrls = new HashMap<>();
                 getBean().setText(replaceInlineImages(submittedText,
                         textImages, images, mediaUrls, directory,
diff --git 
a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileAdd.java
 
b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileAdd.java
index 25475eed9..773c27c4a 100644
--- 
a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileAdd.java
+++ 
b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileAdd.java
@@ -112,10 +112,7 @@ public class MediaFileAdd extends MediaFileBase implements 
UploadedFilesAware {
 
             } else {
                 MediaFileDirectory root = mgr
-                        .getDefaultMediaFileDirectory(getActionWeblog());
-                if (root == null) {
-                    root = 
mgr.createDefaultMediaFileDirectory(getActionWeblog());
-                }
+                        
.getOrCreateDefaultMediaFileDirectory(getActionWeblog());
                 setDirectory(root);
             }
             if (getDirectory() == null) {
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 d9b699c1e..1ca3ad286 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
@@ -101,7 +101,7 @@ public class MediaFileImageChooser extends MediaFileBase {
                 directory = 
manager.getMediaFileDirectoryByName(getActionWeblog(), this.directoryName);
             }
             if (directory == null) {
-                directory = 
manager.getDefaultMediaFileDirectory(getActionWeblog());
+                directory = 
manager.getOrCreateDefaultMediaFileDirectory(getActionWeblog());
             }
             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..0ba43aac9 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
@@ -206,7 +206,7 @@ public class MediaFileView extends MediaFileBase {
                         getActionWeblog(), this.directoryName);
             }
             if (directory == null) {
-                directory = 
manager.getDefaultMediaFileDirectory(getActionWeblog());
+                directory = 
manager.getOrCreateDefaultMediaFileDirectory(getActionWeblog());
             }
             this.currentDirectory = directory;
             this.directoryId = directory.getId();
@@ -355,8 +355,7 @@ public class MediaFileView extends MediaFileBase {
                 CacheManager.invalidate(getActionWeblog());
 
                 // re-route to default folder
-                mediaFileDir = manager
-                        .getDefaultMediaFileDirectory(getActionWeblog());
+                mediaFileDir = 
manager.getOrCreateDefaultMediaFileDirectory(getActionWeblog());
                 setDirectoryId(mediaFileDir.getId());
                 setDirectoryName(mediaFileDir.getName());
                 clearSearch();
diff --git 
a/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/MediaCollection.java
 
b/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/MediaCollection.java
index 93e55d0e5..0dac6b9f6 100644
--- 
a/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/MediaCollection.java
+++ 
b/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/MediaCollection.java
@@ -126,7 +126,7 @@ public class MediaCollection {
                     }
 
                     MediaFileDirectory mdir = justPath.isEmpty()
-                        ? fileMgr.getDefaultMediaFileDirectory(website)
+                        ? fileMgr.getOrCreateDefaultMediaFileDirectory(website)
                         : fileMgr.getMediaFileDirectoryByName(website, 
justPath);
                     if (mdir == null) {
                         throw new AtomNotFoundException("Cannot find media 
directory: " + justPath);
@@ -301,6 +301,7 @@ public class MediaCollection {
                 dir = fmgr.getMediaFileDirectoryByName(website, path);
             } else {
                 log.debug("Fetching root resource collection from weblog " + 
handle);
+                // a read: don't create the folder, the 404 below says it is 
missing
                 dir = fmgr.getDefaultMediaFileDirectory(website);
             }
             if (dir == null) {
diff --git 
a/app/src/main/java/org/apache/roller/weblogger/webservices/xmlrpc/MetaWeblogAPIHandler.java
 
b/app/src/main/java/org/apache/roller/weblogger/webservices/xmlrpc/MetaWeblogAPIHandler.java
index fe20c8850..f61806500 100644
--- 
a/app/src/main/java/org/apache/roller/weblogger/webservices/xmlrpc/MetaWeblogAPIHandler.java
+++ 
b/app/src/main/java/org/apache/roller/weblogger/webservices/xmlrpc/MetaWeblogAPIHandler.java
@@ -374,7 +374,7 @@ public class MetaWeblogAPIHandler extends BloggerAPIHandler 
{
             
             Weblogger roller = WebloggerFactory.getWeblogger();
             MediaFileManager fmgr = roller.getMediaFileManager();
-            MediaFileDirectory root = 
fmgr.getDefaultMediaFileDirectory(website);
+            MediaFileDirectory root = 
fmgr.getOrCreateDefaultMediaFileDirectory(website);
  
             // Try to save file
             MediaFile mf = new MediaFile();
diff --git a/app/src/main/resources/ApplicationResources.properties 
b/app/src/main/resources/ApplicationResources.properties
index 9e38b9f52..6aba0a2d1 100644
--- a/app/src/main/resources/ApplicationResources.properties
+++ b/app/src/main/resources/ApplicationResources.properties
@@ -501,6 +501,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
@@ -665,11 +666,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 \
@@ -687,8 +685,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 a9c5d9411..7b0fc7435 100644
--- a/app/src/main/resources/ApplicationResources_de.properties
+++ b/app/src/main/resources/ApplicationResources_de.properties
@@ -359,17 +359,12 @@ installer.error.connection.pageTitle=Fehler bei der 
Datenbankverbindung
 # unknown error
 installer.error.unknown.pageTitle=Unbekannter Fehler
 installer.errorCreatingTables=Fehler beim Anlegen von Tabellen
-installer.errorCreatingTablesExplanation=Fehler bei der Erstellung von 
Tabellen, m\u00F6glicherweise aufgrund eines Fehlers im 
Datenbankerstellungsscript oder weil Sie eine nicht unterst\u00FCtzte Datenbank 
benutzen. Sie m\u00FCssen dies Problem beheben und anschlie\u00DFend neustarten 
oder Roller neu ausrichten bevor Sie fortfahren k\u00F6nnen. Es folgen die 
Erfolgs- und Fehlermeldungen des Erstellungsprozesses:
 installer.errorUpgradingTables=Fehler beim Aktualisieren von Tabellen
-installer.errorUpgradingTablesExplanation=Fehler bei der Aktualisierung von 
Tabellen, m\u00F6glicherweise aufgrund eines Fehlers im 
Datenbankerstellungsscript oder weil Sie eine nicht unterst\u00FCtzte Datenbank 
benutzen. Sie m\u00FCssen dies Problem beheben und anschlie\u00DFend neustarten 
oder Roller neu ausrichten bevor Sie fortfahren k\u00F6nnen. Es folgen die 
Erfolgs- und Fehlermeldungen des Erstellungsprozesses: 
 installer.heresTheStackTrace=Um Ihnen bei der Behebung des Problems zu helfen 
finden sie hier ein Stack Trace f\u00FCr diese Ausnahme:
 installer.noDatabaseTablesExplanation=Roller konnte eine Verbindung zu Ihrer 
Datenbank vom Typ [{0}] aufbauen, konnte aber keine Tabellen finden.
 installer.noDatabaseTablesFound=Keine Datenbanktabellen gefunden
 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 087693d4d..82d7f6309 100644
--- a/app/src/main/resources/ApplicationResources_ja.properties
+++ b/app/src/main/resources/ApplicationResources_ja.properties
@@ -953,10 +953,7 @@ 
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
 
ConfigForm.adminEmail=Planet\u7BA1\u7406\u8005\u306E\u30E1\u30FC\u30EB\u30A2\u30C9\u30EC\u30B9
 Bookmark.error.urlNull=URL\u306F\u5FC5\u9808\u9805\u76EE\u3067\u3059
 Bookmark.error.urlBad=\u7121\u52B9\u306AURL\u3067\u3059
@@ -1028,7 +1025,6 @@ 
mediaFile.error.view.dirNameInvalid=\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u540D\u
 
mediaFileAdd.tags=\u30BF\u30B0\uFF08\u30B9\u30DA\u30FC\u30B9\u3067\u5206\u5272\uFF09
 
themeEditor.yourThemeStyleSheet=<em>\u5171\u6709\u30C6\u30FC\u30DE</em>\u306E\u30C7\u30D5\u30A9\u30EB\u30C8\u30FB\u30B9\u30BF\u30A4\u30EB\u30B7\u30FC\u30C8\u3092\u4F7F\u7528\u3057\u3066\u3044\u307E\u3059\u3002
 
pageForm.useManualContentType=\u72EC\u81EA\u306EContent-Type\u3092\u4F7F\u7528\u3059\u308B
-installer.errorUpgradingTablesExplanation=\u30C6\u30FC\u30D6\u30EB\u306E\u30A2\u30C3\u30D7\u30B0\u30EC\u30FC\u30C9\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u306E\u30A2\u30C3\u30D7\u30B0\u30EC\u30FC\u30C9\u30B9\u30AF\u30EA\u30D7\u30C8\u306B\u554F\u984C\u304C\u3042\u308B\u304B\u3001\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u306A\u3044\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u304C\u4F7F\u7528\u3055\u308C\u3066\u3044\u308B
 [...]
 
userRegister.heading.authentication=\u3069\u306E\u3088\u3046\u306B\u8A8D\u8A3C\u3057\u307E\u3059\u304B?
 mediaFileView.title=\u30E1\u30C7\u30A3\u30A2\u30FB\u30D5\u30A1\u30A4\u30EB
 
memberPermissions.saveError=\u6A29\u9650\u3092\u4FDD\u5B58\u3059\u308B\u969B\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F
@@ -1232,7 +1228,6 @@ 
mediaFileEdit.includeGallery=\u30AE\u30E3\u30E9\u30EA\u30FC\u306B\u542B\u3081\u3
 
statCount.weblogCommentCountType=\u30D6\u30ED\u30B0\u306E\u30B3\u30E1\u30F3\u30C8\u6570
 
mediaFileSuccess.subtitle=\u65B0\u3057\u3044\u30A8\u30F3\u30C8\u30EA\u3092\u4F5C\u6210\u3057\u307E\u3059\u304B?
 
categoriesForm.noresults=\u73FE\u5728\u3001\u30AB\u30C6\u30B4\u30EA\u306F\u3042\u308A\u307E\u305B\u3093
-installer.errorCreatingTablesExplanation=\u30C6\u30FC\u30D6\u30EB\u306E\u4F5C\u6210\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u4F5C\u6210\u30B9\u30AF\u30EA\u30D7\u30C8\u306B\u554F\u984C\u304C\u3042\u308B\u304B\u3001\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u306A\u3044\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u304C\u4F7F\u7528\u3055\u308C\u3066\u3044\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002\u3042\u306A\
 [...]
 
mediaFileImageChooser.dirPageTip=\u753B\u50CF\u3092\u30AF\u30EA\u30C3\u30AF\u3057\u3066\u9078\u629E\u3059\u308B\u304B\u3001\u30D5\u30A9\u30EB\u30C0\u30FB\u30C9\u30ED\u30C3\u30D7\u30C0\u30A6\u30F3\u3078\u306E\u30B9\u30A4\u30C3\u30C1\u3092\u4F7F\u3063\u3066\u4ED6\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306B\u79FB\u52D5\u3057\u3066\u304F\u3060\u3055\u3044\u3002
 mediaFileView.others=\u305D\u306E\u4ED6
 
stylesheetEdit.revert=\u30B9\u30BF\u30A4\u30EB\u30B7\u30FC\u30C8\u3092\u5FA9\u5143
diff --git a/app/src/main/resources/ApplicationResources_ko.properties 
b/app/src/main/resources/ApplicationResources_ko.properties
index e7c225ea9..0750641f4 100644
--- a/app/src/main/resources/ApplicationResources_ko.properties
+++ b/app/src/main/resources/ApplicationResources_ko.properties
@@ -481,15 +481,7 @@ installer.noDatabaseTablesExplanation=\
 installer.createTables=\ud14c\uc774\ube14\ub4e4\uc744 
\uc0dd\uc131\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c?
 installer.yesCreateTables=\uc608 - \ud14c\uc774\ube14\ub4e4\uc744 \uc9c0\uae08 
\uc0dd\uc131
 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. \
-\uc774 \ubb38\uc81c\ub97c \uc218\uc815\ud558\uc2e0 \ud6c4, \ub864\ub7ec 
\uc2dc\uc2a4\ud15c\uc744 \uc7ac\uc2dc\uc791\ud558\uac70\ub098 
\uc7ac\ubc30\ud3ec\ud558\uc2ed\uc2dc\uc624. \
-\ub2e4\uc74c\uc740 \ud14c\uc774\ube14 \uc0dd\uc131 \uacfc\uc815\uc758 
\uc131\uacf5 \ub610\ub294 \uc624\ub958 \uba54\uc2dc\uc9c0\uc785\ub2c8\ub2e4:
 
 # upgrade tables
 installer.database.upgrade.pageTitle=\ub370\uc774\ud130\ubca0\uc774\uc2a4 
\ud14c\uc774\ube14 \uc5c5\uadf8\ub808\uc774\ub4dc
@@ -500,13 +492,7 @@ installer.databaseUpgradeNeededExplanation=\
 installer.upgradeTables=\ud14c\uc774\ube14\ub4e4\uc744 
\uc5c5\uadf8\ub808\uc774\ub4dc\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c?
 installer.yesUpgradeTables=\uc608 - \ud14c\uc774\ube14\ub4e4\uc744 
\uc9c0\uae08 \uc5c5\uadf8\ub808\uc774\ub4dc
 installer.tablesUpgraded=\ud14c\uc774\ube14\ub4e4\uc774 
\uc131\uacf5\uc801\uc73c\ub85c \uc5c5\uadf8\ub808\uc774\ub4dc 
\ub418\uc5c8\uc2b5\ub2c8\ub2e4.
-installer.tablesUpgradedExplanation=\
-\ub370\uc774\ud130\ubca0\uc774\uc2a4 \ud14c\uc774\ube14\ub4e4\uc774 
\uc544\ub798\uc640 \uac19\uc774 \uc131\uacf5\uc801\uc73c\ub85c 
\uc5c5\uadf8\ub808\uc774\ub4dc \ub418\uc5c8\uc2b5\ub2c8\ub2e4.
 installer.errorUpgradingTables=\ud14c\uc774\ube14 
\uc5c5\uadf8\ub808\uc774\ub4dc \uc624\ub958
-installer.errorUpgradingTablesExplanation=\ud14c\uc774\ube14 
\uc5c5\uadf8\ub808\uc774\ub4dc \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. \
-\uc774 \ubb38\uc81c\ub97c \uc218\uc815\ud558\uc2e0 \ud6c4, \ub864\ub7ec 
\uc2dc\uc2a4\ud15c\uc744 \uc7ac\uc2dc\uc791\ud558\uac70\ub098 
\uc7ac\ubc30\ud3ec\ud558\uc2dc\uae30 \ubc14\ub78d\ub2c8\ub2e4. \
-\ub2e4\uc74c\uc740 \uc5c5\uadf8\ub808\uc774\ub4dc \uacfc\uc815\uc758 
\uc131\uacf5 \ub610\ub294 \uc624\ub958 \uba54\uc2dc\uc9c0\uc785\ub2c8\ub2e4:
 
 # ----------------------------------------------------------------------- Login
 
diff --git a/app/src/main/resources/ApplicationResources_zh_CN.properties 
b/app/src/main/resources/ApplicationResources_zh_CN.properties
index e60e58344..216d7dd20 100644
--- a/app/src/main/resources/ApplicationResources_zh_CN.properties
+++ b/app/src/main/resources/ApplicationResources_zh_CN.properties
@@ -556,13 +556,10 @@ installer.noDatabaseTablesExplanation=Roller 
\u80FD\u591F\u8FDE\u63A5\u5230\u4F6
 installer.createTables=\u4F60\u8981\u8BA9 Roller 
\u4E3A\u4F60\u521B\u5EFA\u8868\u5417\uFF1F
 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
-installer.errorCreatingTablesExplanation=\u521B\u5EFA\u8868\u65F6\u53D1\u751F\u9519\u8BEF\uFF0C\u53EF\u80FD\u662F\u7531\u4E8E\u6570\u636E\u5E93\u521B\u5EFA\u811A\u672C\u4E2D\u7684\u9519\u8BEF\u6216\u662F\u56E0\u4E3A\u4F60\u4F7F\u7528\u4E86\u4E0D\u53D7\u652F\u6301\u7684\u6570\u636E\u5E93\u3002\u4F60\u5FC5\u987B\u4FEE\u590D\u6B64\u95EE\u9898\u7136\u540E\u91CD\u65B0\u542F\u52A8\u6216\u91CD\u65B0\u90E8\u7F72
 Roller \u624D\u80FD\u7EE7\u7EED\u4E0B\u4E00\u6B65\u3002 
\u4EE5\u4E0B\u662F\u5728\u52 [...]
 
 
 # upgrade tables
@@ -575,10 +572,8 @@ installer.upgradeTables=\u4F60\u8981\u8BA9 Roller 
\u4E3A\u4F60\u5347\u7EA7\u8FD9
 installer.yesUpgradeTables=\u662F - \u7ACB\u5373\u5347\u7EA7\u8868
 installer.finishUpgrade=\u542F\u52A8 Roller
 installer.tablesUpgraded=\u6570\u636E\u8868\u5DF2\u6210\u529F\u5347\u7EA7
-installer.tablesUpgradedExplanation=\u6570\u636E\u8868\u5DF2\u6210\u529F\u5347\u7EA7\uFF0C\u5982\u4F60\u5728\u4E0B\u9762\u6240\u770B\u5230\u7684\u3002
 
 installer.errorUpgradingTables=\u8868\u5347\u7EA7\u51FA\u9519
-installer.errorUpgradingTablesExplanation=\u5347\u7EA7\u8868\u65F6\u53D1\u751F\u9519\u8BEF\uFF0C\u53EF\u80FD\u662F\u7531\u4E8E\u6570\u636E\u5E93\u521B\u5EFA\u811A\u672C\u4E2D\u7684\u9519\u8BEF\u6216\u662F\u56E0\u4E3A\u4F60\u4F7F\u7528\u4E86\u4E0D\u53D7\u652F\u6301\u7684\u6570\u636E\u5E93\u3002\u4F60\u5FC5\u987B\u4FEE\u590D\u6B64\u95EE\u9898\u7136\u540E\u91CD\u65B0\u542F\u52A8\u6216\u91CD\u65B0\u90E8\u7F72
 Roller \u624D\u80FD\u7EE7\u7EED\u4E0B\u4E00\u6B65\u3002 
\u4EE5\u4E0B\u662F\u5728\u5 [...]
 
 
 # ----------------------------------------------------------------------- Login
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/business/MediaFileTest.java 
b/app/src/test/java/org/apache/roller/weblogger/business/MediaFileTest.java
index f7e7648b1..e642a6083 100644
--- a/app/src/test/java/org/apache/roller/weblogger/business/MediaFileTest.java
+++ b/app/src/test/java/org/apache/roller/weblogger/business/MediaFileTest.java
@@ -136,6 +136,65 @@ public class MediaFileTest  {
         TestUtils.endSession(true);
     }
 
+    /**
+     * A weblog with no default folder (old Roller versions) gets one on 
demand.
+     */
+    @Test
+    public void testGetOrCreateDefaultMediaFileDirectory() throws Exception {
+        User testUser = TestUtils.setupUser("mediaFileDefaultUser");
+        Weblog testWeblog = TestUtils.setupWeblog("mediaFileDefaultWeblog", 
testUser);
+        TestUtils.endSession(true);
+
+        MediaFileManager mfMgr = 
WebloggerFactory.getWeblogger().getMediaFileManager();
+        testWeblog = TestUtils.getManagedWebsite(testWeblog);
+        MediaFileDirectory existing = 
mfMgr.getOrCreateDefaultMediaFileDirectory(testWeblog);
+        assertEquals(mfMgr.getDefaultMediaFileDirectory(testWeblog), existing);
+
+        mfMgr.removeMediaFileDirectory(existing);
+        WebloggerFactory.getWeblogger().flush();
+        TestUtils.endSession(true);
+
+        testWeblog = TestUtils.getManagedWebsite(testWeblog);
+        assertNull(mfMgr.getDefaultMediaFileDirectory(testWeblog));
+        MediaFileDirectory created = 
mfMgr.getOrCreateDefaultMediaFileDirectory(testWeblog);
+        assertNotNull(created);
+        TestUtils.endSession(true);
+
+        testWeblog = TestUtils.getManagedWebsite(testWeblog);
+        assertEquals(created, 
mfMgr.getOrCreateDefaultMediaFileDirectory(testWeblog));
+
+        TestUtils.endSession(true);
+        TestUtils.teardownWeblog(testWeblog.getId());
+        TestUtils.teardownUser(testUser.getUserName());
+        TestUtils.endSession(true);
+    }
+
+    /**
+     * Two requests can each create the default folder of a weblog that has
+     * none; looking it up must still work.
+     */
+    @Test
+    public void testDuplicateDefaultMediaFileDirectoryIsTolerated() throws 
Exception {
+        User testUser = TestUtils.setupUser("mediaFileDupUser");
+        Weblog testWeblog = TestUtils.setupWeblog("mediaFileDupWeblog", 
testUser);
+        TestUtils.endSession(true);
+
+        MediaFileManager mfMgr = 
WebloggerFactory.getWeblogger().getMediaFileManager();
+        testWeblog = TestUtils.getManagedWebsite(testWeblog);
+        mfMgr.createMediaFileDirectory(new MediaFileDirectory(testWeblog, 
"default", "second"));
+        WebloggerFactory.getWeblogger().flush();
+        TestUtils.endSession(true);
+
+        testWeblog = TestUtils.getManagedWebsite(testWeblog);
+        assertNotNull(mfMgr.getDefaultMediaFileDirectory(testWeblog));
+        assertNotNull(mfMgr.getOrCreateDefaultMediaFileDirectory(testWeblog));
+
+        TestUtils.endSession(true);
+        TestUtils.teardownWeblog(testWeblog.getId());
+        TestUtils.teardownUser(testUser.getUserName());
+        TestUtils.endSession(true);
+    }
+
     /**
      * Test directory creation
      */
diff --git 
a/app/src/test/java/org/apache/roller/weblogger/business/ThemeManagerTest.java 
b/app/src/test/java/org/apache/roller/weblogger/business/ThemeManagerTest.java
index e4d3aa2be..96c1fe5c0 100644
--- 
a/app/src/test/java/org/apache/roller/weblogger/business/ThemeManagerTest.java
+++ 
b/app/src/test/java/org/apache/roller/weblogger/business/ThemeManagerTest.java
@@ -23,10 +23,14 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.roller.weblogger.TestUtils;
 import org.apache.roller.weblogger.business.themes.ThemeManager;
+import org.apache.roller.weblogger.pojos.MediaFileDirectory;
+import org.apache.roller.weblogger.pojos.User;
+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 static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
 
@@ -58,6 +62,40 @@ public class ThemeManagerTest  {
         assertNotNull( themeManager.getTheme("terminal") );
         assertNotNull( themeManager.getTheme("terminal").getStylesheet() );
     }
+
+    /** A weblog with no default media folder still gets a theme's root-level 
images. */
+    @Test
+    public void testImportThemeIntoWeblogWithoutDefaultMediaFolder() throws 
Exception {
+        User user = TestUtils.setupUser("themeImportUser");
+        Weblog weblog = TestUtils.setupWeblog("themeImportWeblog", user);
+        TestUtils.endSession(true);
+
+        MediaFileManager mfMgr = 
WebloggerFactory.getWeblogger().getMediaFileManager();
+        weblog = TestUtils.getManagedWebsite(weblog);
+        
mfMgr.removeMediaFileDirectory(mfMgr.getOrCreateDefaultMediaFileDirectory(weblog));
+        WebloggerFactory.getWeblogger().flush();
+        TestUtils.endSession(true);
+
+        ThemeManager themeManager = 
WebloggerFactory.getWeblogger().getThemeManager();
+        themeManager.initialize();
+        weblog = TestUtils.getManagedWebsite(weblog);
+        assertNull(mfMgr.getDefaultMediaFileDirectory(weblog));
+
+        // the frontpage theme lists root-level images such as 
roller-tan-logo.gif
+        themeManager.importTheme(weblog, themeManager.getTheme("frontpage"), 
false);
+        WebloggerFactory.getWeblogger().flush();
+        TestUtils.endSession(true);
+
+        weblog = TestUtils.getManagedWebsite(weblog);
+        MediaFileDirectory root = mfMgr.getDefaultMediaFileDirectory(weblog);
+        assertNotNull(root);
+        assertEquals(1, root.getMediaFiles().stream()
+                .filter(f -> 
"roller-tan-logo.gif".equals(f.getName())).count());
+
+        TestUtils.teardownWeblog(weblog.getId());
+        TestUtils.teardownUser(user.getUserName());
+        TestUtils.endSession(true);
+    }
         
 }
 
diff --git 
a/app/src/test/java/org/apache/roller/weblogger/ui/rendering/servlets/NoRendererTest.java
 
b/app/src/test/java/org/apache/roller/weblogger/ui/rendering/servlets/NoRendererTest.java
new file mode 100644
index 000000000..94f3945fb
--- /dev/null
+++ 
b/app/src/test/java/org/apache/roller/weblogger/ui/rendering/servlets/NoRendererTest.java
@@ -0,0 +1,74 @@
+/*
+ * 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.
+ */
+
+package org.apache.roller.weblogger.ui.rendering.servlets;
+
+import jakarta.servlet.http.HttpServletResponse;
+import org.apache.commons.logging.Log;
+import org.apache.roller.weblogger.pojos.Template;
+import org.apache.roller.weblogger.pojos.TemplateRendition;
+import org.apache.roller.weblogger.pojos.TemplateRendition.RenditionType;
+import org.apache.roller.weblogger.pojos.Weblog;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+class NoRendererTest {
+
+    private HttpServletResponse response;
+    private Template page;
+    private Weblog weblog;
+    private Log log;
+
+    @BeforeEach
+    void setUp() {
+        response = mock(HttpServletResponse.class);
+        page = mock(Template.class);
+        when(page.getId()).thenReturn("t1");
+        when(page.getName()).thenReturn("Weblog");
+        weblog = mock(Weblog.class);
+        when(weblog.getHandle()).thenReturn("blog");
+        log = mock(Log.class);
+    }
+
+    @Test
+    void logsOneWarningForATemplateWithNoContent() throws Exception {
+        
when(page.getTemplateRendition(RenditionType.STANDARD)).thenReturn(null);
+
+        NoRenderer.sendNotFound(response, page, weblog, log);
+
+        verify(log).warn(org.mockito.ArgumentMatchers.contains("it has no 
content"));
+        verify(response).sendError(HttpServletResponse.SC_NOT_FOUND);
+    }
+
+    @Test
+    void doesNotRepeatWhatTheRendererFactoryLogged() throws Exception {
+        
when(page.getTemplateRendition(RenditionType.STANDARD)).thenReturn(mock(TemplateRendition.class));
+
+        NoRenderer.sendNotFound(response, page, weblog, log);
+
+        verify(log, never()).warn(anyString());
+        verify(log, never()).error(anyString());
+        verify(response).sendError(HttpServletResponse.SC_NOT_FOUND);
+    }
+}
diff --git 
a/app/src/test/java/org/apache/roller/weblogger/ui/struts2/editor/EntryEditInlineImagesTest.java
 
b/app/src/test/java/org/apache/roller/weblogger/ui/struts2/editor/EntryEditInlineImagesTest.java
index d405b8357..37bf62201 100644
--- 
a/app/src/test/java/org/apache/roller/weblogger/ui/struts2/editor/EntryEditInlineImagesTest.java
+++ 
b/app/src/test/java/org/apache/roller/weblogger/ui/struts2/editor/EntryEditInlineImagesTest.java
@@ -105,7 +105,7 @@ class EntryEditInlineImagesTest {
         factory.when(WebloggerFactory::getWeblogger).thenReturn(weblogger);
         when(urls.getMediaFileURL(any(), anyString(), anyBoolean()))
                 .thenAnswer(call -> "https://blog.example/media/"; + 
call.getArgument(1));
-        when(mediaManager.getDefaultMediaFileDirectory(any()))
+        when(mediaManager.getOrCreateDefaultMediaFileDirectory(any()))
                 .thenReturn(new MediaFileDirectory());
         when(contentManager.canSave(any(), anyString(), anyString(), 
anyLong(), any()))
                 .thenReturn(true);
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..e6d0d97e8
--- /dev/null
+++ 
b/app/src/test/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileViewTest.java
@@ -0,0 +1,97 @@
+/*
+ * 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 showsTheDefaultFolderWhenNoneIsChosen() throws Exception {
+        MediaFileDirectory directory = new MediaFileDirectory(weblog, 
"default", "default directory");
+        
when(media.getOrCreateDefaultMediaFileDirectory(weblog)).thenReturn(directory);
+
+        action.execute();
+
+        assertFalse(action.hasActionErrors());
+        assertSame(directory, action.getCurrentDirectory());
+    }
+}
diff --git 
a/app/src/test/java/org/apache/roller/weblogger/webservices/atomprotocol/MediaCollectionPathTest.java
 
b/app/src/test/java/org/apache/roller/weblogger/webservices/atomprotocol/MediaCollectionPathTest.java
index b8d956263..ff443e227 100644
--- 
a/app/src/test/java/org/apache/roller/weblogger/webservices/atomprotocol/MediaCollectionPathTest.java
+++ 
b/app/src/test/java/org/apache/roller/weblogger/webservices/atomprotocol/MediaCollectionPathTest.java
@@ -84,7 +84,7 @@ class MediaCollectionPathTest {
 
         defaultDir = mock(MediaFileDirectory.class);
         when(defaultDir.getMediaFiles()).thenReturn(Collections.emptySet());
-        
when(files.getDefaultMediaFileDirectory(weblog)).thenReturn(defaultDir);
+        
when(files.getOrCreateDefaultMediaFileDirectory(weblog)).thenReturn(defaultDir);
         when(files.getMediaFileDirectoryByName(weblog, 
"default")).thenReturn(defaultDir);
 
         collection = new MediaCollection(new User(), 
"https://blog.example/roller-services/app";);
@@ -118,7 +118,7 @@ class MediaCollectionPathTest {
                 () -> collection.postMedia(request("/blog/resources"), 
mediaEntry(null)));
 
         assertTrue(refused.getMessage().contains("refused"), 
refused.getMessage());
-        verify(files).getDefaultMediaFileDirectory(weblog);
+        verify(files).getOrCreateDefaultMediaFileDirectory(weblog);
     }
 
     @Test
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 989a3b4a6..a51b2cbf6 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