This is an automated email from the ASF dual-hosted git repository. rmaucher pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 986ac857b2a74e1f323f62aa80c8c17bfb24f426 Merge: 721a41083d 0fd76e0232 Author: Rémy Maucherat <[email protected]> AuthorDate: Wed Oct 7 09:51:26 2026 +0200 Merge pull request #1069 from rmaucher/main This is a new more modern manager/admin webapp for Tomcat. It aims at making Tomcat more user friendly during development, test and pre production deployment phases. The webapp is located in modules/manager2. A testsuite is included. Includes a change to actually allow JULI loggers reconfiguration without restart (use case: enable debug on the spot). Includes a change to allow a more dynamic behavior for SSLEnabled (depending on the presence of SSLHostConfig, since the legacy TLS configuration attributes have now been removed). PR#1069 .github/workflows/ci-manager2.yml | 72 + java/org/apache/catalina/connector/Connector.java | 7 + .../coyote/http11/AbstractHttp11Protocol.java | 9 + java/org/apache/juli/ClassLoaderLogManager.java | 186 +- .../apache/tomcat/util/net/AbstractEndpoint.java | 15 +- java/org/apache/tomcat/util/net/NioEndpoint.java | 15 + modules/manager2/LICENSE | 1155 ++++ modules/manager2/NOTICE | 5 + modules/manager2/README.md | 133 + modules/manager2/build.properties.default | 38 + modules/manager2/build.xml | 360 ++ modules/manager2/manager2-design.md | 1315 +++++ modules/manager2/resources/MANIFEST.MF | 6 + .../apache/tomcat/manager2/AccessLogSupport.java | 221 + .../main/java/org/apache/tomcat/manager2/Api.java | 114 + .../org/apache/tomcat/manager2/AppsApiServlet.java | 758 +++ .../apache/tomcat/manager2/ClusterSnapshot.java | 324 ++ .../apache/tomcat/manager2/ConfigApiServlet.java | 5545 ++++++++++++++++++++ .../java/org/apache/tomcat/manager2/Constants.java | 53 + .../org/apache/tomcat/manager2/CsrfFilter.java | 144 + .../org/apache/tomcat/manager2/ErrorServlet.java | 60 + .../org/apache/tomcat/manager2/HeadersFilter.java | 67 + .../org/apache/tomcat/manager2/HomeServlet.java | 85 + .../apache/tomcat/manager2/HostsApiServlet.java | 248 + .../main/java/org/apache/tomcat/manager2/Html.java | 162 + .../org/apache/tomcat/manager2/I18nServlet.java | 126 + .../main/java/org/apache/tomcat/manager2/Json.java | 124 + .../apache/tomcat/manager2/LocalStrings.properties | 1145 ++++ .../org/apache/tomcat/manager2/LocaleFilter.java | 48 + .../tomcat/manager2/LogConfigApiServlet.java | 602 +++ .../java/org/apache/tomcat/manager2/LogParser.java | 297 ++ .../org/apache/tomcat/manager2/LoginServlet.java | 248 + .../org/apache/tomcat/manager2/LogoutServlet.java | 51 + .../org/apache/tomcat/manager2/LogsApiServlet.java | 797 +++ .../apache/tomcat/manager2/StatusApiServlet.java | 370 ++ .../org/apache/tomcat/manager2/StatusHistory.java | 237 + .../org/apache/tomcat/manager2/StatusSnapshot.java | 564 ++ .../java/org/apache/tomcat/manager2/Strings.java | 229 + .../apache/tomcat/manager2/UsersApiServlet.java | 912 ++++ .../tomcat/manager2/Manager2ConfigTestBase.java | 639 +++ .../tomcat/manager2/Manager2WebappTestBase.java | 409 ++ .../tomcat/manager2/TestClusterSnapshot.java | 617 +++ .../tomcat/manager2/TestManager2Cluster.java | 266 + .../tomcat/manager2/TestManager2ConfigAccess.java | 82 + .../manager2/TestManager2ConfigChildren.java | 292 ++ .../tomcat/manager2/TestManager2ConfigCluster.java | 288 + .../manager2/TestManager2ConfigLifecycle.java | 389 ++ .../tomcat/manager2/TestManager2ConfigSsl.java | 563 ++ .../tomcat/manager2/TestManager2ConfigStore.java | 478 ++ .../tomcat/manager2/TestManager2ConfigTree.java | 226 + .../tomcat/manager2/TestManager2Descriptions.java | 91 + .../tomcat/manager2/TestManager2WebappApps.java | 174 + .../tomcat/manager2/TestManager2WebappAuth.java | 290 + .../manager2/TestManager2WebappLogConfig.java | 130 + .../tomcat/manager2/TestManager2WebappLogs.java | 260 + .../tomcat/manager2/TestManager2WebappRbac.java | 135 + .../tomcat/manager2/TestManager2WebappShell.java | 171 + .../tomcat/manager2/TestManager2WebappStatus.java | 164 + .../tomcat/manager2/TestManager2WebappUsers.java | 206 + modules/manager2/webapp/META-INF/context.xml | 32 + modules/manager2/webapp/WEB-INF/web.xml | 444 ++ modules/manager2/webapp/css/manager2.css | 1204 +++++ modules/manager2/webapp/error-403.html | 34 + modules/manager2/webapp/error-404.html | 34 + modules/manager2/webapp/images/favicon.ico | Bin 0 -> 21630 bytes modules/manager2/webapp/images/tomcat.svg | 967 ++++ modules/manager2/webapp/index.html | 65 + modules/manager2/webapp/js/api.js | 186 + modules/manager2/webapp/js/charts.js | 260 + modules/manager2/webapp/js/i18n.js | 92 + modules/manager2/webapp/js/logconfig.js | 181 + modules/manager2/webapp/js/logviewer.js | 411 ++ modules/manager2/webapp/js/main.js | 224 + modules/manager2/webapp/js/pages/accesslog.js | 29 + modules/manager2/webapp/js/pages/apps.js | 682 +++ modules/manager2/webapp/js/pages/cluster.js | 183 + modules/manager2/webapp/js/pages/configuration.js | 1175 +++++ modules/manager2/webapp/js/pages/dashboard.js | 223 + modules/manager2/webapp/js/pages/diagnostics.js | 262 + modules/manager2/webapp/js/pages/hosts.js | 210 + modules/manager2/webapp/js/pages/logs.js | 31 + modules/manager2/webapp/js/pages/monitoring.js | 286 + modules/manager2/webapp/js/pages/users.js | 532 ++ modules/manager2/webapp/js/router.js | 101 + modules/manager2/webapp/js/ui.js | 499 ++ modules/manager2/webapp/login.html | 54 + .../org/apache/juli/TestClassLoaderLogManager.java | 128 + webapps/docs/changelog.xml | 5 + 88 files changed, 31241 insertions(+), 10 deletions(-) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
