Took a different approach to fixing the problem with CSS URLs.

Reverted "Fixed a problem where the path to the stylesheets is broken when the client-side webjar name is different from "pwm-client"."

This reverts commit 8c0c60734865f6660664f6fc4fb3d9081b4cdff1.

server/src/main/java/password/pwm/PwmConstants.java

@@ -75,7 +75,6 @@ public abstract class PwmConstants
     public static final String DEFAULT_CONFIG_FILE_FILENAME = readPwmConstantsBundle( "defaultConfigFilename" );
 
     public static final String PWM_APP_NAME = readPwmConstantsBundle( "pwm.appName" );
-    public static final String PWM_CLIENT_WEBJAR_NAME = readPwmConstantsBundle( "pwm.client.webjarName" );
     public static final String PWM_URL_HOME = readPwmConstantsBundle( "url.pwm-home" );
     public static final String PWM_URL_CLOUD = readPwmConstantsBundle( "url.pwm-cloud" );
 

server/src/main/java/password/pwm/http/tag/PwmScriptRefTag.java

@@ -30,6 +30,8 @@ import password.pwm.util.logging.PwmLogger;
 
 import javax.servlet.jsp.tagext.TagSupport;
 
+import static password.pwm.http.tag.url.PwmUrlTag.convertUrl;
+
 public class PwmScriptRefTag extends TagSupport
 {
 
@@ -70,14 +72,4 @@ public class PwmScriptRefTag extends TagSupport
         return EVAL_PAGE;
     }
 
-    private String convertUrl( final String input )
-    {
-        final String pwmClientUrl = "/resources/webjars/pwm-client/";
-        if ( input.contains( pwmClientUrl ) )
-        {
-            final String correctedUrl = "/resources/webjars/" + PwmConstants.PWM_APP_NAME.toLowerCase() + "-client/";
-            return input.replace( pwmClientUrl, correctedUrl );
-        }
-        return input;
-    }
 }

server/src/main/java/password/pwm/http/tag/url/PwmUrlTag.java

@@ -24,6 +24,7 @@ package password.pwm.http.tag.url;
 
 import password.pwm.AppProperty;
 import password.pwm.PwmApplication;
+import password.pwm.PwmConstants;
 import password.pwm.bean.LocalSessionStateBean;
 import password.pwm.config.PwmSetting;
 import password.pwm.error.PwmException;
@@ -59,6 +60,8 @@ public class PwmUrlTag extends PwmAbstractTag
     public int doEndTag( )
             throws javax.servlet.jsp.JspTagException
     {
+        String url = convertUrl(this.url);
+
         String outputURL = url;
         PwmRequest pwmRequest = null;
         try
@@ -204,4 +207,14 @@ public class PwmUrlTag extends PwmAbstractTag
         return themeURL;
     }
 
+    public static String convertUrl( final String input )
+    {
+        final String pwmClientUrl = "/resources/webjars/pwm-client/";
+        if ( input.contains( pwmClientUrl ) )
+        {
+            final String correctedUrl = "/resources/webjars/" + PwmConstants.PWM_APP_NAME.toLowerCase() + "-client/";
+            return input.replace( pwmClientUrl, correctedUrl );
+        }
+        return input;
+    }
 }

server/src/main/resources/password/pwm/PwmConstants.properties

@@ -31,7 +31,6 @@ httpHeaderAuthorizationBasic=Basic
 defaultBadPasswordAttempt=BADPASSWORDATTEMPT
 log.removedValue=*hidden*
 pwm.appName=PWM
-pwm.client.webjarName=pwm-client
 trial=false
 url.pwm-home=https://github.com/pwm-project/pwm
 url.pwm-cloud=https://pwm-cloud.appspot.com

server/src/main/webapp/WEB-INF/jsp/fragment/header.jsp

@@ -65,8 +65,7 @@
         </script>
     </pwm:script>
     <pwm:if test="<%=PwmIfTest.requestFlag%>" requestFlag="<%=PwmRequestFlag.INCLUDE_IAS_ANGULAR%>">
-        <% request.setAttribute("clientWebjarName", PwmConstants.PWM_CLIENT_WEBJAR_NAME); %>
-        <link rel="stylesheet" type="text/css" href="<pwm:url url='/public/resources/webjars/${clientWebjarName}/vendor/ias-icons.css' addContext="true"/>"/>
-        <link rel="stylesheet" type="text/css" href="<pwm:url url='/public/resources/webjars/${clientWebjarName}/vendor/ux-ias.css' addContext="true"/>"/>
+        <link rel="stylesheet" type="text/css" href="<pwm:url url='/public/resources/webjars/pwm-client/vendor/ias-icons.css' addContext="true"/>"/>
+        <link rel="stylesheet" type="text/css" href="<pwm:url url='/public/resources/webjars/pwm-client/vendor/ux-ias.css' addContext="true"/>"/>
     </pwm:if>
 </head>