refactor: path-swap to /resource-server/ + drop resource-server-content overlay#277
Merged
bjagg merged 2 commits intoMay 8, 2026
Merged
Conversation
…urce-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.
ChristianMurphy
approved these changes
May 7, 2026
… dead libs) 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.
bjagg
changed the title
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Two commits, both part of the broader resource-server consolidation:
45f30c2(prior) — path-swap legacy/ResourceServingWebapp/to/resource-server/across JSPs and Spring portlet config.8197bc2(new) — drop theresource-server-contentWAR overlay (dep + maven-war-plugin extract). The overlay was unpacking lodash 4.17.4 (4 CVEs), underscore, backbone, modernizr, normalize, and jquery-plugins into the WAR for nothing, plus an explicit extract of jquery 1.11.0/1.12.2, jqueryui 1.8.24, and 3 famfamfam silk PNGs.Why this is safe
gateway.jspandgatewayEdit.jspconsume the famfamfam PNGs via<rs:resourceURL value="/rs/famfamfam/..."/>. Thers:*taglib does cross-context lookup against the resource-server context (uPortal-start'sresource-server-contentoverlay still serves these). Local WAR copies were fallbacks the taglib never emitted.gatewayNewPage.jspreferences/resource-server/webjars/jquery/dist/jquery.min.jsdirectly — modern path, served by uPortal-start's resource-server overlay.grep -rEn '/WebproxyPortlet/rs/' src/returns no matches.Test plan
mvn clean install -DskipTestsbuilds (verified locally on Java 11)rs/directory (verified)/p/gateway/?pCm=viewand?pCm=editrender with the icon thumbnails intact (icons resolve via uPortal-start's/resource-server/rs/famfamfam/...).Future cleanup
When uPortal-start drops
resource-server-content, the JSP<rs:resourceURL>famfamfam refs need a swap (webjar or portlet-local checkout). Not in this PR's scope.