[java-identity-provider] branch main updated: IDP-1669 Accessibility on IdP pages

[Rod Widdowson]

This is an automated email from the git hooks/post-receive script.

rdw pushed a commit to branch main
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=bc0cc996957e770f2cdc361cafcb83da0889b019

The following commit(s) were added to refs/heads/main by this push:
     new bc0cc9969 IDP-1669 Accessibility on IdP pages
bc0cc9969 is described below

commit bc0cc996957e770f2cdc361cafcb83da0889b019
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Tue Mar 1 20:17:25 2022 +0000

    IDP-1669 Accessibility on IdP pages
    
    https://shibboleth.atlassian.net/browse/IDP-1669
    
    Always freshen up edit-webapp/css and edit-webapp-images
---
 .../java/net/shibboleth/idp/installer/V4Install.java | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/idp-installer/src/main/java/net/shibboleth/idp/installer/V4Install.java b/idp-installer/src/main/java/net/shibboleth/idp/installer/V4Install.java
index 6c5fcda81..dbbcfc773 100644
--- a/idp-installer/src/main/java/net/shibboleth/idp/installer/V4Install.java
+++ b/idp-installer/src/main/java/net/shibboleth/idp/installer/V4Install.java
@@ -375,31 +375,35 @@ public class V4Install extends AbstractInitializableComponent {
      */
     protected void handleEditWebApp() throws BuildException {
         final Path editWebApp = installerProps.getTargetDir().resolve("edit-webapp");
+        final Path distEditWebApp =  installerProps.getTargetDir().resolve("dist").resolve("webapp");
+        final Path css = editWebApp.resolve("css");
+        final Path images = editWebApp.resolve("images");
+        final Path suppliedInput = installerProps.getInitialEditWeb();
+        final boolean doCopy;
         if (Files.exists(editWebApp)) {
             checkWebXml(editWebApp.resolve("WEB-INF").resolve("web.xml"));
-            return;
-        }
-        final Path suppliedInput = installerProps.getInitialEditWeb();
-        if (suppliedInput != null) {
+            doCopy = true;
+        } else if (suppliedInput != null) {
             final Copy copy = InstallerSupport.getCopyTask(suppliedInput, editWebApp);
             copy.setFailOnError(false);
             copy.execute();
+            doCopy = false;
         } else {
             InstallerSupport.createDirectory(editWebApp);
-            final Path css = editWebApp.resolve("css");
             InstallerSupport.createDirectory(css);
-            final Path images = editWebApp.resolve("images");
             InstallerSupport.createDirectory(images);
             InstallerSupport.createDirectory(editWebApp.resolve("WEB-INF"));
             InstallerSupport.createDirectory(editWebApp.resolve("WEB-INF").resolve("lib"));
             InstallerSupport.createDirectory(editWebApp.resolve("WEB-INF").resolve("classes"));
-            final Path distEditWebApp =  installerProps.getTargetDir().resolve("dist").resolve("webapp");
+            doCopy = true;
+        }
+        if (doCopy) {
             final Copy cssCopy = InstallerSupport.getCopyTask(distEditWebApp.resolve("css"), css);
             cssCopy.setFailOnError(false);
             cssCopy.execute();
             final Copy imagesCopy = InstallerSupport.getCopyTask(distEditWebApp.resolve("images"), images);
             imagesCopy.setFailOnError(false);
-            imagesCopy.execute();
+            imagesCopy.execute();            
         }
     }
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.