From 45f30c260d7d74fb68eefe586468b6bb0c180e5f Mon Sep 17 00:00:00 2001
From: "Benito J. Gonzalez" <bgonzalez@unicon.net>
Date: Wed, 6 May 2026 07:52:03 -0700
Subject: [PATCH 1/2] refactor(webproxy): path-swap legacy
 /ResourceServingWebapp/ -> /resource-server/

Problem: gateway-sso-portlet.xml and the gateway docs referenced tango
icon paths under /ResourceServingWebapp/, the legacy resource-server
context that uPortal-start is in the process of retiring.

Goal: align with the modern /resource-server/ context so this portlet's
icons keep resolving once the legacy overlay is dropped.

Changes:
- src/main/webapp/WEB-INF/context/portlet/gateway-sso-portlet.xml:
  swap two p:iconUrl values from /ResourceServingWebapp/rs/tango/...
  to /resource-server/rs/tango/...
- docs/gateway_config.md: update three example iconUrl values to the
  same modern context.

Notes: the underlying tango/0.8.90 icon set ships at byte-identical
paths in the modern resource-server-webapp:1.5.x overlay. Tango is a
2009-era PNG icon set and is queued for replacement (FontAwesome
glyphs or modern icon webjar) as a separate frontend modernization
effort.
---
 docs/gateway_config.md                                      | 6 +++---
 .../webapp/WEB-INF/context/portlet/gateway-sso-portlet.xml  | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/gateway_config.md b/docs/gateway_config.md
index c2390786..b8ae7806 100644
--- a/docs/gateway_config.md
+++ b/docs/gateway_config.md
@@ -109,7 +109,7 @@ The description of the portlet itself lives in the portlet definition file:
             custom operations, in this case to also set the window name to the calculated field.
         -->
         <bean class="org.jasig.portlet.proxy.mvc.portlet.gateway.GatewayEntry" p:name="MyZimbra"
-              p:iconUrl="/ResourceServingWebapp/rs/tango/0.8.90/32x32/apps/internet-mail.png"
+              p:iconUrl="/resource-server/rs/tango/0.8.90/32x32/apps/internet-mail.png"
               p:javascriptFile="/WebProxyPortlet/scripts/custom-javascript.js">
 
             <!-- Custom java form fields.  Beans in list must implement org.jasig.portlet.proxy.mvc.service.web.IAuthenticationFormModifier
@@ -273,7 +273,7 @@ This is how you might add IAuthenticationFormModifier to your portlet definition
 
   ```
           <bean class="org.jasig.portlet.proxy.mvc.portlet.gateway.GatewayEntry" p:name="MyZimbra"
-              p:iconUrl="/ResourceServingWebapp/rs/tango/0.8.90/32x32/apps/internet-mail.png">
+              p:iconUrl="/resource-server/rs/tango/0.8.90/32x32/apps/internet-mail.png">
 
             <property name="authenticationFormModifier">
                 <util:list>
@@ -302,7 +302,7 @@ GatewayEntry bean; e.g.
 
   ```
 <bean class="org.jasig.portlet.proxy.mvc.portlet.gateway.GatewayEntry" p:name="WebAdvisor"
-      p:iconUrl="/ResourceServingWebapp/rs/tango/0.8.90/32x32/apps/internet-web-browser.png"
+      p:iconUrl="/resource-server/rs/tango/0.8.90/32x32/apps/internet-web-browser.png"
       p:javascriptFile="/WebProxyPortlet/scripts/custom-javascript.js">
 ...
 </bean>
diff --git a/src/main/webapp/WEB-INF/context/portlet/gateway-sso-portlet.xml b/src/main/webapp/WEB-INF/context/portlet/gateway-sso-portlet.xml
index 7b9aafb1..79834257 100644
--- a/src/main/webapp/WEB-INF/context/portlet/gateway-sso-portlet.xml
+++ b/src/main/webapp/WEB-INF/context/portlet/gateway-sso-portlet.xml
@@ -58,7 +58,7 @@
          -->
         <!--
         <bean class="org.jasig.portlet.proxy.mvc.portlet.gateway.GatewayEntry" p:name="MyZimbra"
-              p:iconUrl="/ResourceServingWebapp/rs/tango/0.8.90/32x32/apps/internet-mail.png">
+              p:iconUrl="/resource-server/rs/tango/0.8.90/32x32/apps/internet-mail.png">
 
             <property name="contentRequests">
                 <util:map>
@@ -115,7 +115,7 @@
         -->
         <!--
         <bean class="org.jasig.portlet.proxy.mvc.portlet.gateway.GatewayEntry" p:name="WebAdvisor"
-              p:iconUrl="/ResourceServingWebapp/rs/tango/0.8.90/32x32/apps/internet-web-browser.png"
+              p:iconUrl="/resource-server/rs/tango/0.8.90/32x32/apps/internet-web-browser.png"
               p:javascriptFile="/WebProxyPortlet/scripts/custom-javascript.js">
 
             <!- beans in list must implement org.jasig.portlet.proxy.mvc.service.web.IAuthenticationFormModifier

From 8197bc2d7c863b5b6d6a6975ad7687af2db5b25e Mon Sep 17 00:00:00 2001
From: "Benito J. Gonzalez" <bgonzalez@unicon.net>
Date: Thu, 7 May 2026 18:26:03 -0700
Subject: [PATCH 2/2] chore(deps): drop resource-server-content overlay
 (lingering lodash + dead libs)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Problem: WebproxyPortlet declared a runtime <dependency> on the
resource-server-content WAR overlay plus a maven-war-plugin <overlay>
config that pulled in rs/jquery/1.11.0/, rs/jquery/1.12.2/,
rs/jqueryui/1.8.24/, and 3 famfamfam silk PNGs. The overlay also
unpacked the entire rs/* tree of legacy libraries (lodash 4.17.4
with 4 known CVEs, underscore, backbone, modernizr, normalize, plus
jquery-plugins) into the WAR for nothing — none of which any source
file references after 45f30c2 path-swapped the legacy
/ResourceServingWebapp/ context to /resource-server/.

Goal: drop the entire overlay (dep + maven-war-plugin extract).
JSPs that consume the famfamfam PNGs (gateway.jsp, gatewayEdit.jsp)
use <rs:resourceURL value="/rs/famfamfam/..."/>, which the rs:*
taglib resolves via cross-context lookup against the resource server
context deployed elsewhere (uPortal-start's resource-server-content
overlay). The local WAR copies were fallbacks the taglib never
emitted.

Changes:
- pom.xml: drop the runtime <dependency> on resource-server-content;
  drop the maven-war-plugin <overlay> config that extracted jquery,
  jqueryui, and the 3 famfamfam PNGs. resource-server-utils (type=jar;
  provides the rs:* taglibs the JSPs use) is unchanged.

Notes: paired with 45f30c2 which did the source-side path swap to
/resource-server/. When uPortal-start retires resource-server-content
(broader fleet effort), the rs:resourceURL famfamfam refs will need
either a webjar swap or a portlet-local PNG checkout — out of scope
here.
---
 pom.xml | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/pom.xml b/pom.xml
index 9b2de1d5..e3668cc3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -153,12 +153,6 @@
             <artifactId>bcutil-jdk18on</artifactId>
             <version>${bouncycastle.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.jasig.resourceserver</groupId>
-            <artifactId>resource-server-content</artifactId>
-            <version>${resource-server.version}</version>
-            <type>war</type>
-        </dependency>
         <dependency>
             <groupId>org.jsoup</groupId>
             <artifactId>jsoup</artifactId>
@@ -316,20 +310,6 @@
                     <attachClasses>true</attachClasses>
                     <warName>${project.artifactId}</warName>
                     <webXml>src/main/webapp/WEB-INF/web.xml</webXml>
-                    <overlays>
-                        <overlay>
-                            <groupId>org.jasig.resourceserver</groupId>
-                            <artifactId>resource-server-content</artifactId>
-                            <includes>
-				<include>rs/jquery/1.12.2/</include>
-                                <include>rs/jquery/1.11.0/</include>
-                                <include>/rs/jqueryui/1.8.24/</include>
-                                <include>/rs/famfamfam/silk/1.3/error.png</include>
-                                <include>/rs/famfamfam/silk/1.3/application_delete.png</include>
-                                <include>/rs/famfamfam/silk/1.3/application_edit.png</include>
-                            </includes>
-                        </overlay>
-                    </overlays>
                 </configuration>
             </plugin>
             <plugin>