* WW-5653 docs: add Bootstrap 5.3.x sample-app migration design
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
* WW-5653 docs: add Bootstrap 5 migration implementation plan
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
* WW-5653 build: add Bootstrap 5, Bootstrap Icons, showcase jQuery webjars
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
* WW-5653 feat(showcase): serve Bootstrap 5 and jQuery via webjars
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
* WW-5653 fix(showcase): serve html5 demo Bootstrap CSS via webjar
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
* WW-5653 feat(showcase): migrate navbar and top-level pages to Bootstrap 5
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
* WW-5653 fix(showcase): migrate leftover Bootstrap 2 icon and fixed-navbar classes
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
* WW-5653 feat(showcase): migrate tag-demo pages to Bootstrap 5
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
* WW-5653 feat(showcase): migrate validation-demo pages to Bootstrap 5
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
* WW-5653 feat(showcase): migrate fileupload and conversion pages to Bootstrap 5
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
* WW-5653 feat(showcase): migrate wait, token and empmanager pages to Bootstrap 5
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
* WW-5653 fix(showcase): remove BS3 carets and well class
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
* WW-5653 fix(showcase): use ms-auto for right nav and add nav-link to Home
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
* WW-5653 feat(rest-showcase): serve Bootstrap 5 CSS via webjars
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
* WW-5653 feat(rest-showcase): migrate JSP markup to Bootstrap 5
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
* WW-5653 fix(rest-showcase): migrate legacy BS2/BS3 grid classes to Bootstrap 5
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
* WW-5653 fix(showcase): drop obsolete css/js excludePattern so webjar JS is served
The old struts.action.excludePattern whitelisted the vendored /styles/*.css
and /js/*.js layout for container serving. After moving Bootstrap/jQuery to
webjars under /static/webjars/**, the '.*/js/.*\.js' entry matched the webjar
JS path (e.g. bootstrap.bundle.min.js) and excluded it from Struts' static
handler, so it fell through to the container and 404'd. Remaining webapp assets
(prettify.js, main.css) are served via default-servlet fall-through.
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
* WW-5653 fix(samples): migrate remaining BS2/BS3 classes (tables, buttons, progress, forms, navbar)
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
* WW-5653 chore(showcase): comment out verbose debug loggers
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
* WW-5653 fix(showcase): migrate Bootstrap 5 markup in ftl/vm/html templates
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
* WW-5653 test(showcase): disable JS in FreeMarkerManagerTest for Bootstrap 5
HtmlUnit's JS engine cannot parse Bootstrap 5's ES6 (bootstrap.bundle.min.js
uses 'class'), and the decorator now serves it, so the default WebClient threw
on script error. The test only asserts server-rendered FreeMarker output, so
JavaScript is disabled (matching Html5TagExampleTest).
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
* WW-5653 fix(showcase): replace dead Bootstrap 2 form and alert classes
Migrate new-person.ftl form off BS2 control-group/controls/form-actions to
Bootstrap 5 (mb-3, form-label, form-control), and replace the dead alert-error
class with alert-danger across the showcase pages.
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
* WW-5653 test(showcase): make integration tests tolerate Bootstrap 5 under HtmlUnit
HtmlUnit 5.2.0 cannot parse Bootstrap 5's minified ES6 (bootstrap.bundle.min.js
uses 'class'), which broke the showcase HtmlUnit integration tests once the
decorator started serving the bundle.
- Add ParameterUtils.createWebClient() which disables throwExceptionOnScriptError,
and route all integration tests through it (they assert server-rendered output,
not Bootstrap's client-side behaviour).
- Load bootstrap.bundle.min.js with 'defer' so a page's own inline scripts (e.g.
the async chat demo) still execute before HtmlUnit hits the bundle's parse
error; defer is also the recommended real-browser loading strategy.
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
* WW-5653 test(showcase): poll for async chat result instead of fixed sleep
AsyncTest relied on a fixed Thread.sleep(4000) for the server-push chat
round-trip, which is not enough on slower/newer JVMs (reproduced failing on
JDK 25). Poll the result element for up to ~30s via waitForBackgroundJavaScript
instead, making the test robust across JVMs.
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
* WW-5653 test(showcase): drive AsyncTest via HTTP instead of HtmlUnit
The browser-driven chat test was flaky on JDK 25 in CI: HtmlUnit's handling of
the async server-push long-poll timed out (message never rendered), even with
polling. The test's purpose is to validate the Servlet 3 async endpoints, which
needs no browser or JavaScript. Rewrite it to POST /async/sendMessage and read
/async/receiveNewMessages directly over HTTP and assert the JSON, making it
deterministic and independent of Bootstrap/HtmlUnit JS parsing.
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
* WW-5653 fix(showcase): drop progressbar role from wait progress bar
Resolves a SonarCloud accessibility finding (S6819) introduced by the Bootstrap 5
migration. The BS5 progress component is styled on .progress/.progress-bar divs;
the role/aria attributes were newly added (the BS3 original had none), so removing
them clears the finding while keeping the Bootstrap 5 styling.
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
* WW-5653 fix(showcase): correct BS5 alert wrapper and drop stray table tag
Address Copilot review on PR #1793:
- decorators/main.jsp: the dismissible wrapper was a second .alert with no
variant while the variant class (alert-danger, etc.) stayed on the inner
<ul>, producing a nested, uncoloured alert box. Move the alert* classes
onto the wrapper and strip them from the <ul> so the wrapper is the single
alert container.
- orders-edit.jsp: remove the stray, unclosed <table> start tag before
</s:form> (pre-existing invalid markup carried over during the migration).
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
* WW-5653 fix(showcase): remove BS3 navbar-header wrapper and orphan dropdown-submenu
Clean up two leftover Bootstrap 3 artifacts in the showcase decorator navbar:
- Drop the `navbar-header` wrapper (no BS5 CSS behind it) and make the brand
and toggler direct children of the `.container-fluid` flex container
(justify-content: space-between), with the brand first per BS5 convention.
- Remove the empty, unclosed `<li class="dropdown-submenu">` orphan before the
first item in the Examples menu; BS5 has no dropdown-submenu feature.
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
* WW-5653 fix(showcase): replace soft-deprecated navbar-light with data-bs-theme
navbar-light is soft-deprecated in Bootstrap 5.3. Switch the showcase navbar
to the current data-bs-theme="light" idiom; bg-light is retained for the
background.
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
* WW-5653 fix(showcase): normalize page-header replacement to border-bottom utilities
A handful of showcase pages replaced the BS3 page-header with a bare <div>
while the rest used <div class="border-bottom pb-2 mb-3">. Normalize those 35
header wrappers to the same border-bottom pb-2 mb-3 utilities so all showcase
page headers render consistently.
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
* WW-5653 fix(rest-showcase): add mb-3 to page-header replacement
Align rest-showcase order page headers with the showcase standard by using
border-bottom pb-2 mb-3 (was border-bottom pb-2), so header spacing is
consistent across both sample apps.
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
---------
Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>
- Fix REST Showcase JSP issue for s:link tags that replaced HTML link tags.
- s:link tags cannot use JSP EL in them. Modified JSPs to use scriptlet,
JSP expression, and OGNL expression to work with s:link tag.
it was needlessly tied to WebApplicationContext and a rest issue where the autowiring of returned
result objects wasn't copied into the rest plugin from xwork
WW-2193
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@674498 13f79535-47bb-0310-9956-ffa450edef68
Experience shows that if we set such things in examples, people will monkey them in production applications (and then blame the framework for poor performance). I strongly suggest that we try to make all examples both production-quality and production-ready.
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@611829 13f79535-47bb-0310-9956-ffa450edef68
Lukasz Lenart