This is an automated email from the ASF dual-hosted git repository.
rmaucher pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
from 721a41083d Fix javadoc warnings
add 86a2ccdf84 Add manager2 webapp as a module
add 2a7d10c3ec Add remove upgrade protocol
add 266320500f Merge branch 'apache:main' into main
add 36aa7f5c70 Add lifecycle operations to the component tree
add c3b807d722 Add UpgradeProtocol configuration
add 6b60aec0c1 Fix some properties issues for resources
add daeea6d855 Merge branch 'apache:main' into main
add cbe4336634 Merge branch 'apache:main' into main
add b515e8b387 Merge branch 'apache:main' into main
add 4d34d87e76 Remove patch
add 6463f5a91a Improve webapp reactive behavior significantly
add 4f93c52ef7 Add download for logs
add 1c2b80478e Merge branch 'apache:main' into main
add f08b3d3d73 Update to use the new StoreConfig layout restoration
add aa4a835e24 Fold side bar to save space
add 8748e71f01 UI tweaks and content optimizations
add a875bbac6f Add CPU and memory cards to the Monitoring page
add 8601f9e140 Full localization of missing items
add b621125ea3 Merge branch 'apache:main' into main
add dab61a7c0a Merge branch 'apache:main' into main
add 02a7db7e58 Update for new context flag to avoid saving to server.xml
add 89ee4f2ebf Merge branch 'apache:main' into main
add 960fee1d6f Add missing localization
add 6843c98f46 Optimize instanceof
add 553d6d020c Fix alignment when sidebar pops out
add 0aa052c3d2 Merge branch 'apache:main' into main
add 89d20aa360 Avoid negative busy threads values on init
add d687e69a33 Remove some instanceof abuse
add 2e9397f2f4 Merge branch 'apache:main' into main
add 524efda49a Merge branch 'apache:main' into main
add 8fc18e0aee Merge branch 'apache:main' into main
add afd46b0337 Merge branch 'apache:main' into main
add 6f8fbfcc34 Add support for PSK element
add 21a2977f9c Merge branch 'apache:main' into main
add 4995ec3522 Merge branch 'apache:main' into main
add 2229e696be Merge branch 'apache:main' into main
add b1909af069 Merge branch 'apache:main' into main
add e7dc100265 Merge branch 'apache:main' into main
add 2237d636c3 Merge branch 'apache:main' into main
add 5aeef93b88 Add log level configuration
add 5f6fa08c2b Add cluster view tab
add 0ff5eec6f0 Fix wrong available memory reported
add 8fcafd1584 Resolve some warnings
add 420f12f2d3 Add validate target
add ff7edfddd1 Testsuite fixes and improvements
add b97a3a36e7 CI
add b4d2274a22 Merge branch 'apache:main' into main
add 0c6a76b91b Merge branch 'main' of [email protected]:rmaucher/tomcat.git
into main
add 573f40253f Fix target
add 4cea7ba6db Remove CI
add e43b806cf2 Merge branch 'apache:main' into main
add 2461296e6a Second attempt
add ac291191fe Tomcat tests must be built
add 60d86f160e Another attempt
add e5f062b5b0 Additional fixes
add 750cf32f3f Add the test status report
add 903bd8d6e8 Merge branch 'apache:main' into main
add cb7b4197ae Merge branch 'apache:main' into main
add 5cbe075b83 Merge branch 'apache:main' into main
add 4906dd8ac8 Merge branch 'apache:main' into main
add 0b0e4a1f4b Merge branch 'apache:main' into main
add 8dcadbfa56 Merge branch 'apache:main' into main
add a9ac1c793f Merge branch 'apache:main' into main
add a60b8c9059 Merge branch 'apache:main' into main
add 4364db7a5c Add changelog entry
add bde58d4bb0 Merge branch 'apache:main' into main
add 80d3ab477b Merge branch 'apache:main' into main
add 0fd76e0232 Merge branch 'apache:main' into main
new 986ac857b2 Merge pull request #1069 from rmaucher/main
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.github/workflows/{ci.yml => ci-manager2.yml} | 28 +-
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 +
LICENSE => modules/manager2/LICENSE | 0
.../default.notice => modules/manager2/NOTICE | 4 +-
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 ++++++++++++++++++++
.../org/apache/tomcat/manager2}/Constants.java | 33 +-
.../org/apache/tomcat/manager2/CsrfFilter.java | 144 +
.../org/apache/tomcat/manager2/ErrorServlet.java | 60 +
.../org/apache/tomcat/manager2/HeadersFilter.java | 41 +-
.../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 | 24 +-
.../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 | 35 +-
.../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 +
.../manager2/webapp/images}/favicon.ico | Bin
.../manager2/webapp/images}/tomcat.svg | 0
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 +
.../manager2/webapp/js/pages/accesslog.js | 17 +-
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 +
.../manager2/webapp/js/pages/logs.js | 19 +-
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, 28897 insertions(+), 77 deletions(-)
copy .github/workflows/{ci.yml => ci-manager2.yml} (77%)
copy LICENSE => modules/manager2/LICENSE (100%)
copy res/META-INF/default.notice => modules/manager2/NOTICE (59%)
create mode 100644 modules/manager2/README.md
create mode 100644 modules/manager2/build.properties.default
create mode 100644 modules/manager2/build.xml
create mode 100644 modules/manager2/manager2-design.md
create mode 100644 modules/manager2/resources/MANIFEST.MF
create mode 100644
modules/manager2/src/main/java/org/apache/tomcat/manager2/AccessLogSupport.java
create mode 100644
modules/manager2/src/main/java/org/apache/tomcat/manager2/Api.java
create mode 100644
modules/manager2/src/main/java/org/apache/tomcat/manager2/AppsApiServlet.java
create mode 100644
modules/manager2/src/main/java/org/apache/tomcat/manager2/ClusterSnapshot.java
create mode 100644
modules/manager2/src/main/java/org/apache/tomcat/manager2/ConfigApiServlet.java
copy {java/org/apache/catalina/core =>
modules/manager2/src/main/java/org/apache/tomcat/manager2}/Constants.java (55%)
create mode 100644
modules/manager2/src/main/java/org/apache/tomcat/manager2/CsrfFilter.java
create mode 100644
modules/manager2/src/main/java/org/apache/tomcat/manager2/ErrorServlet.java
copy test/org/apache/catalina/startup/UrlPatternFilter.java =>
modules/manager2/src/main/java/org/apache/tomcat/manager2/HeadersFilter.java
(50%)
create mode 100644
modules/manager2/src/main/java/org/apache/tomcat/manager2/HomeServlet.java
create mode 100644
modules/manager2/src/main/java/org/apache/tomcat/manager2/HostsApiServlet.java
create mode 100644
modules/manager2/src/main/java/org/apache/tomcat/manager2/Html.java
create mode 100644
modules/manager2/src/main/java/org/apache/tomcat/manager2/I18nServlet.java
create mode 100644
modules/manager2/src/main/java/org/apache/tomcat/manager2/Json.java
create mode 100644
modules/manager2/src/main/java/org/apache/tomcat/manager2/LocalStrings.properties
copy test/org/apache/catalina/startup/UrlPatternFilter.java =>
modules/manager2/src/main/java/org/apache/tomcat/manager2/LocaleFilter.java
(62%)
create mode 100644
modules/manager2/src/main/java/org/apache/tomcat/manager2/LogConfigApiServlet.java
create mode 100644
modules/manager2/src/main/java/org/apache/tomcat/manager2/LogParser.java
create mode 100644
modules/manager2/src/main/java/org/apache/tomcat/manager2/LoginServlet.java
copy test/org/apache/catalina/startup/DuplicateMappingParamServlet.java =>
modules/manager2/src/main/java/org/apache/tomcat/manager2/LogoutServlet.java
(57%)
create mode 100644
modules/manager2/src/main/java/org/apache/tomcat/manager2/LogsApiServlet.java
create mode 100644
modules/manager2/src/main/java/org/apache/tomcat/manager2/StatusApiServlet.java
create mode 100644
modules/manager2/src/main/java/org/apache/tomcat/manager2/StatusHistory.java
create mode 100644
modules/manager2/src/main/java/org/apache/tomcat/manager2/StatusSnapshot.java
create mode 100644
modules/manager2/src/main/java/org/apache/tomcat/manager2/Strings.java
create mode 100644
modules/manager2/src/main/java/org/apache/tomcat/manager2/UsersApiServlet.java
create mode 100644
modules/manager2/src/test/java/org/apache/tomcat/manager2/Manager2ConfigTestBase.java
create mode 100644
modules/manager2/src/test/java/org/apache/tomcat/manager2/Manager2WebappTestBase.java
create mode 100644
modules/manager2/src/test/java/org/apache/tomcat/manager2/TestClusterSnapshot.java
create mode 100644
modules/manager2/src/test/java/org/apache/tomcat/manager2/TestManager2Cluster.java
create mode 100644
modules/manager2/src/test/java/org/apache/tomcat/manager2/TestManager2ConfigAccess.java
create mode 100644
modules/manager2/src/test/java/org/apache/tomcat/manager2/TestManager2ConfigChildren.java
create mode 100644
modules/manager2/src/test/java/org/apache/tomcat/manager2/TestManager2ConfigCluster.java
create mode 100644
modules/manager2/src/test/java/org/apache/tomcat/manager2/TestManager2ConfigLifecycle.java
create mode 100644
modules/manager2/src/test/java/org/apache/tomcat/manager2/TestManager2ConfigSsl.java
create mode 100644
modules/manager2/src/test/java/org/apache/tomcat/manager2/TestManager2ConfigStore.java
create mode 100644
modules/manager2/src/test/java/org/apache/tomcat/manager2/TestManager2ConfigTree.java
create mode 100644
modules/manager2/src/test/java/org/apache/tomcat/manager2/TestManager2Descriptions.java
create mode 100644
modules/manager2/src/test/java/org/apache/tomcat/manager2/TestManager2WebappApps.java
create mode 100644
modules/manager2/src/test/java/org/apache/tomcat/manager2/TestManager2WebappAuth.java
create mode 100644
modules/manager2/src/test/java/org/apache/tomcat/manager2/TestManager2WebappLogConfig.java
create mode 100644
modules/manager2/src/test/java/org/apache/tomcat/manager2/TestManager2WebappLogs.java
create mode 100644
modules/manager2/src/test/java/org/apache/tomcat/manager2/TestManager2WebappRbac.java
create mode 100644
modules/manager2/src/test/java/org/apache/tomcat/manager2/TestManager2WebappShell.java
create mode 100644
modules/manager2/src/test/java/org/apache/tomcat/manager2/TestManager2WebappStatus.java
create mode 100644
modules/manager2/src/test/java/org/apache/tomcat/manager2/TestManager2WebappUsers.java
create mode 100644 modules/manager2/webapp/META-INF/context.xml
create mode 100644 modules/manager2/webapp/WEB-INF/web.xml
create mode 100644 modules/manager2/webapp/css/manager2.css
create mode 100644 modules/manager2/webapp/error-403.html
create mode 100644 modules/manager2/webapp/error-404.html
copy {webapps/ROOT => modules/manager2/webapp/images}/favicon.ico (100%)
copy {webapps/ROOT => modules/manager2/webapp/images}/tomcat.svg (100%)
create mode 100644 modules/manager2/webapp/index.html
create mode 100644 modules/manager2/webapp/js/api.js
create mode 100644 modules/manager2/webapp/js/charts.js
create mode 100644 modules/manager2/webapp/js/i18n.js
create mode 100644 modules/manager2/webapp/js/logconfig.js
create mode 100644 modules/manager2/webapp/js/logviewer.js
create mode 100644 modules/manager2/webapp/js/main.js
copy test/org/apache/catalina/loader/TesterUnweavedClass.java =>
modules/manager2/webapp/js/pages/accesslog.js (64%)
create mode 100644 modules/manager2/webapp/js/pages/apps.js
create mode 100644 modules/manager2/webapp/js/pages/cluster.js
create mode 100644 modules/manager2/webapp/js/pages/configuration.js
create mode 100644 modules/manager2/webapp/js/pages/dashboard.js
create mode 100644 modules/manager2/webapp/js/pages/diagnostics.js
create mode 100644 modules/manager2/webapp/js/pages/hosts.js
copy test/org/apache/catalina/loader/TesterNeverWeavedClass.java =>
modules/manager2/webapp/js/pages/logs.js (61%)
create mode 100644 modules/manager2/webapp/js/pages/monitoring.js
create mode 100644 modules/manager2/webapp/js/pages/users.js
create mode 100644 modules/manager2/webapp/js/router.js
create mode 100644 modules/manager2/webapp/js/ui.js
create mode 100644 modules/manager2/webapp/login.html
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]