This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a commit to branch jakarta
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
commit 17704634773ffaf3042c828d751d4e397bac29d3
Merge: 7bf665751 9fd6d0119
Author: Juan Pablo Santos RodrÃguez <juanpa...@apache.org>
AuthorDate: Thu Dec 19 23:17:01 2024 +0100
Merge pull request #370 from weberjn/jakarta
Jakarta
.gitignore | 24 +-
LICENSE | 2 -
jspwiki-210-adapters/pom.xml | 32 +-
jspwiki-210-test-adaptees/pom.xml | 2 +-
jspwiki-api/pom.xml | 165 +++---
.../src/main/java/org/apache/wiki/api/Release.java | 8 +-
.../java/org/apache/wiki/api/core/Context.java | 4 +-
.../main/java/org/apache/wiki/api/core/Engine.java | 2 +-
.../java/org/apache/wiki/api/spi/ContextDSL.java | 2 +-
.../java/org/apache/wiki/api/spi/ContextSPI.java | 2 +-
.../java/org/apache/wiki/api/spi/EngineDSL.java | 4 +-
.../java/org/apache/wiki/api/spi/EngineSPI.java | 2 +-
.../java/org/apache/wiki/api/spi/SessionDSL.java | 2 +-
.../java/org/apache/wiki/api/spi/SessionSPI.java | 2 +-
.../main/java/org/apache/wiki/api/spi/Wiki.java | 2 +-
.../test/java/org/apache/wiki/api/ReleaseTest.java | 3 +
.../apache/wiki/api/spi/ContextSPITestImpl.java | 2 +-
.../org/apache/wiki/api/spi/EngineSPITestImpl.java | 2 +-
.../apache/wiki/api/spi/SessionSPITestImpl.java | 2 +-
.../java/org/apache/wiki/api/spi/WikiTest.java | 4 +-
jspwiki-bom/pom.xml | 4 +-
jspwiki-bootstrap/pom.xml | 12 +-
.../WikiBootstrapServletContextListener.java | 17 +-
.../WikiBootstrapServletContextListenerTest.java | 4 +-
.../wiki/bootstrap/spi/ContextSPITestImpl.java | 2 +-
.../wiki/bootstrap/spi/EngineSPITestImpl.java | 2 +-
.../wiki/bootstrap/spi/SessionSPITestImpl.java | 2 +-
jspwiki-cache/pom.xml | 2 +-
jspwiki-event/pom.xml | 2 +-
jspwiki-http/pom.xml | 14 +-
.../wiki/http/filter/CsrfProtectionFilter.java | 16 +-
jspwiki-it-tests/jspwiki-it-test-cma-jdbc/pom.xml | 2 +-
jspwiki-it-tests/jspwiki-it-test-cma/pom.xml | 2 +-
.../jspwiki-it-test-custom-absolute-urls/pom.xml | 2 +-
.../jspwiki-it-test-custom-jdbc/pom.xml | 2 +-
jspwiki-it-tests/jspwiki-it-test-custom/pom.xml | 2 +-
jspwiki-it-tests/jspwiki-selenide-tests/pom.xml | 2 +-
jspwiki-it-tests/pom.xml | 2 +-
jspwiki-kendra-searchprovider/pom.xml | 29 +-
.../search/kendra/KendraSearchProviderTest.java | 8 +-
jspwiki-main/pom.xml | 612 ++++++++++-----------
.../src/main/java/org/apache/wiki/WikiContext.java | 6 +-
.../src/main/java/org/apache/wiki/WikiEngine.java | 4 +-
.../src/main/java/org/apache/wiki/WikiServlet.java | 14 +-
.../src/main/java/org/apache/wiki/WikiSession.java | 4 +-
.../main/java/org/apache/wiki/ajax/AjaxUtil.java | 4 +-
.../wiki/ajax/WikiAjaxDispatcherServlet.java | 10 +-
.../java/org/apache/wiki/ajax/WikiAjaxServlet.java | 6 +-
.../apache/wiki/attachment/AttachmentServlet.java | 69 +--
.../apache/wiki/auth/AuthenticationManager.java | 2 +-
.../org/apache/wiki/auth/AuthorizationManager.java | 2 +-
.../main/java/org/apache/wiki/auth/Authorizer.java | 2 +-
.../wiki/auth/DefaultAuthenticationManager.java | 4 +-
.../wiki/auth/DefaultAuthorizationManager.java | 2 +-
.../org/apache/wiki/auth/DefaultUserManager.java | 6 +-
.../java/org/apache/wiki/auth/SessionMonitor.java | 8 +-
.../apache/wiki/auth/authorize/GroupManager.java | 2 +-
.../apache/wiki/auth/authorize/WebAuthorizer.java | 6 +-
.../auth/authorize/WebContainerAuthorizer.java | 8 +-
.../wiki/auth/login/AnonymousLoginModule.java | 4 +-
.../auth/login/CookieAssertionLoginModule.java | 8 +-
.../login/CookieAuthenticationLoginModule.java | 6 +-
.../wiki/auth/login/HttpRequestCallback.java | 6 +-
.../auth/login/WebContainerCallbackHandler.java | 2 +-
.../wiki/auth/login/WebContainerLoginModule.java | 4 +-
.../wiki/auth/login/WikiCallbackHandler.java | 2 +-
.../apache/wiki/auth/user/DefaultUserProfile.java | 2 +-
.../org/apache/wiki/auth/user/UserProfile.java | 2 +-
.../java/org/apache/wiki/filters/SpamFilter.java | 6 +-
.../apache/wiki/plugin/DefaultPluginManager.java | 2 +-
.../main/java/org/apache/wiki/plugin/Denounce.java | 2 +-
.../org/apache/wiki/plugin/SampleAjaxPlugin.java | 6 +-
.../org/apache/wiki/preferences/Preferences.java | 4 +-
.../org/apache/wiki/rpc/atom/AtomAPIServlet.java | 10 +-
.../main/java/org/apache/wiki/rss/AtomFeed.java | 2 +-
.../src/main/java/org/apache/wiki/rss/Feed.java | 2 +-
.../main/java/org/apache/wiki/rss/RSS20Feed.java | 2 +-
.../apache/wiki/search/DefaultSearchManager.java | 4 +-
.../org/apache/wiki/spi/ContextSPIDefaultImpl.java | 2 +-
.../org/apache/wiki/spi/EngineSPIDefaultImpl.java | 2 +-
.../org/apache/wiki/spi/SessionSPIDefaultImpl.java | 2 +-
.../apache/wiki/tags/AdminBeanIteratorInfo.java | 6 +-
.../apache/wiki/tags/AttachmentsIteratorInfo.java | 6 +-
.../apache/wiki/tags/AttachmentsIteratorTag.java | 4 +-
.../java/org/apache/wiki/tags/BreadcrumbsTag.java | 4 +-
.../java/org/apache/wiki/tags/CalendarTag.java | 4 +-
.../java/org/apache/wiki/tags/CheckLockInfo.java | 6 +-
.../java/org/apache/wiki/tags/CheckLockTag.java | 2 +-
.../java/org/apache/wiki/tags/CommentLinkTag.java | 2 +-
.../main/java/org/apache/wiki/tags/ContentTag.java | 4 +-
.../main/java/org/apache/wiki/tags/CookieTag.java | 10 +-
.../java/org/apache/wiki/tags/DiffLinkTag.java | 2 +-
.../java/org/apache/wiki/tags/EditLinkTag.java | 2 +-
.../org/apache/wiki/tags/EditorIteratorInfo.java | 6 +-
.../main/java/org/apache/wiki/tags/EditorTag.java | 4 +-
.../org/apache/wiki/tags/HistoryIteratorInfo.java | 6 +-
.../org/apache/wiki/tags/HistoryIteratorTag.java | 4 +-
.../org/apache/wiki/tags/IfNoSearchResultsTag.java | 2 +-
.../main/java/org/apache/wiki/tags/IncludeTag.java | 4 +-
.../java/org/apache/wiki/tags/InsertDiffTag.java | 4 +-
.../java/org/apache/wiki/tags/InsertPageTag.java | 2 +-
.../java/org/apache/wiki/tags/IteratorTag.java | 8 +-
.../main/java/org/apache/wiki/tags/LinkTag.java | 6 +-
.../main/java/org/apache/wiki/tags/LinkToTag.java | 2 +-
.../java/org/apache/wiki/tags/PageInfoLinkTag.java | 2 +-
.../main/java/org/apache/wiki/tags/ParamTag.java | 6 +-
.../main/java/org/apache/wiki/tags/PluginTag.java | 4 +-
.../java/org/apache/wiki/tags/RSSImageLinkTag.java | 2 +-
.../apache/wiki/tags/SearchResultIteratorInfo.java | 6 +-
.../apache/wiki/tags/SearchResultIteratorTag.java | 6 +-
.../org/apache/wiki/tags/SearchResultsSizeTag.java | 2 +-
.../org/apache/wiki/tags/SearchResultsTag.java | 2 +-
.../org/apache/wiki/tags/SetPaginationTag.java | 2 +-
.../org/apache/wiki/tags/SpamFilterInputsTag.java | 4 +-
.../src/main/java/org/apache/wiki/tags/TabTag.java | 2 +-
.../org/apache/wiki/tags/TabbedSectionTag.java | 4 +-
.../java/org/apache/wiki/tags/TranslateTag.java | 8 +-
.../java/org/apache/wiki/tags/UploadLinkTag.java | 2 +-
.../java/org/apache/wiki/tags/UserNameTag.java | 2 +-
.../java/org/apache/wiki/tags/UserProfileTag.java | 2 +-
.../java/org/apache/wiki/tags/VariableTag.java | 4 +-
.../java/org/apache/wiki/tags/WikiBodyTag.java | 8 +-
.../java/org/apache/wiki/tags/WikiTagBase.java | 8 +-
.../wiki/tasks/auth/SaveUserProfileTask.java | 4 +-
.../java/org/apache/wiki/ui/CommandResolver.java | 2 +-
.../org/apache/wiki/ui/DefaultCommandResolver.java | 2 +-
.../org/apache/wiki/ui/DefaultTemplateManager.java | 6 +-
.../java/org/apache/wiki/ui/EditorManager.java | 2 +-
.../main/java/org/apache/wiki/ui/Installer.java | 4 +-
.../java/org/apache/wiki/ui/TemplateManager.java | 4 +-
.../java/org/apache/wiki/ui/WikiJSPFilter.java | 20 +-
.../org/apache/wiki/ui/WikiRequestWrapper.java | 4 +-
.../java/org/apache/wiki/ui/WikiServletFilter.java | 26 +-
.../apache/wiki/ui/admin/WikiFormAdminBean.java | 4 +-
.../wiki/ui/admin/beans/PlainEditorAdminBean.java | 2 +-
.../org/apache/wiki/ui/admin/beans/UserBean.java | 2 +-
.../wiki/ui/progress/DefaultProgressManager.java | 4 +-
.../org/apache/wiki/url/DefaultURLConstructor.java | 2 +-
.../org/apache/wiki/url/ShortURLConstructor.java | 2 +-
.../apache/wiki/url/ShortViewURLConstructor.java | 2 +-
.../java/org/apache/wiki/url/URLConstructor.java | 2 +-
.../wiki/variables/DefaultVariableManager.java | 4 +-
.../java/org/apache/wiki/xmlrpc/RPCServlet.java | 10 +-
.../src/main/resources/META-INF/jspwiki.tld | 4 +-
.../test/java/org/apache/wiki/HttpMockFactory.java | 152 +++++
.../test/java/org/apache/wiki/MemoryProfiling.java | 4 +-
.../src/test/java/org/apache/wiki/TestEngine.java | 65 +--
.../test/java/org/apache/wiki/WikiServletTest.java | 38 +-
.../test/java/org/apache/wiki/WikiSessionTest.java | 198 +++----
.../wiki/auth/AuthenticationManagerTest.java | 5 +-
.../apache/wiki/auth/AuthorizationManagerTest.java | 25 +-
.../java/org/apache/wiki/auth/TestAuthorizer.java | 6 +-
.../java/org/apache/wiki/auth/UserManagerTest.java | 59 +-
.../java/org/apache/wiki/auth/acl/AclImplTest.java | 2 +-
.../wiki/auth/authorize/XMLGroupDatabaseTest.java | 1 -
.../wiki/auth/login/AnonymousLoginModuleTest.java | 68 +--
.../auth/login/CookieAssertionLoginModuleTest.java | 71 +--
.../auth/login/WebContainerLoginModuleTest.java | 73 +--
.../apache/wiki/auth/user/XMLUserDatabaseTest.java | 1 +
.../wiki/parser/JSPWikiMarkupParserTest.java | 427 +++++++-------
.../java/org/apache/wiki/plugin/DenounceTest.java | 0
.../java/org/apache/wiki/plugin/IfPluginTest.java | 17 +-
.../wiki/plugin/ReferringPagesPluginTest.java | 32 +-
.../plugin/ReferringUndefinedPagesPluginTest.java | 19 +-
.../org/apache/wiki/search/SearchManagerTest.java | 36 +-
.../wiki/tasks/pages/SaveWikiPageTaskTest.java | 11 +-
.../org/apache/wiki/ui/CommandResolverTest.java | 50 +-
.../org/apache/wiki/url/UrlConstructorTest.java | 2 +-
.../java/org/apache/wiki/web/StreamRedirector.java | 46 --
.../java/org/apache/wiki/web/TestContainer.java | 296 ----------
.../apache/wiki/workflow/ApprovalWorkflowTest.java | 29 +-
jspwiki-main/src/test/resources/WEB-INF/web.xml | 10 +-
jspwiki-markdown/pom.xml | 26 +-
.../wiki/render/markdown/MarkdownRendererTest.java | 3 +-
jspwiki-portable/pom.xml | 2 +-
jspwiki-tika-searchprovider/pom.xml | 21 +-
.../wiki/search/tika/TikaSearchProviderTest.java | 2 +
jspwiki-util/pom.xml | 20 +-
.../main/java/org/apache/wiki/util/FormUtil.java | 2 +-
.../main/java/org/apache/wiki/util/HttpUtil.java | 6 +-
.../main/java/org/apache/wiki/util/MailUtil.java | 30 +-
.../java/org/apache/wiki/util/PropertyReader.java | 25 +-
.../java/org/apache/wiki/util/HttpUtilTest.java | 10 +-
.../java/org/apache/wiki/util/MailUtilTest.java | 4 +-
.../org/apache/wiki/util/PropertyReaderTest.java | 6 +-
jspwiki-war/pom.xml | 479 ++++++++--------
jspwiki-war/src/main/config/dev/OldChangeLog | 2 +-
jspwiki-war/src/main/webapp/Captcha.jsp | 4 +-
jspwiki-war/src/main/webapp/Comment.jsp | 6 +-
jspwiki-war/src/main/webapp/Error.jsp | 4 +-
jspwiki-war/src/main/webapp/Install.jsp | 2 +-
jspwiki-war/src/main/webapp/LostPassword.jsp | 4 +-
jspwiki-war/src/main/webapp/Rename.jsp | 2 +-
jspwiki-war/src/main/webapp/WEB-INF/web.xml | 10 +-
jspwiki-war/src/main/webapp/XHRHtml2Markup.jsp | 2 +-
.../main/webapp/templates/210/AttachmentTab.jsp | 2 +-
.../main/webapp/templates/210/CommentContent.jsp | 4 +-
.../main/webapp/templates/210/ConflictContent.jsp | 4 +-
.../src/main/webapp/templates/210/DiffTab.jsp | 6 +-
.../main/webapp/templates/210/DisplayMessage.jsp | 4 +-
.../src/main/webapp/templates/210/EditContent.jsp | 6 +-
.../main/webapp/templates/210/EditGroupContent.jsp | 4 +-
.../src/main/webapp/templates/210/EditTemplate.jsp | 2 +-
.../src/main/webapp/templates/210/Favorites.jsp | 4 +-
.../src/main/webapp/templates/210/FindContent.jsp | 6 +-
.../src/main/webapp/templates/210/Footer.jsp | 4 +-
.../src/main/webapp/templates/210/GroupContent.jsp | 4 +-
.../src/main/webapp/templates/210/GroupTab.jsp | 4 +-
.../src/main/webapp/templates/210/Header.jsp | 2 +-
.../src/main/webapp/templates/210/InfoContent.jsp | 6 +-
.../src/main/webapp/templates/210/LoginContent.jsp | 6 +-
.../main/webapp/templates/210/NewGroupContent.jsp | 4 +-
.../webapp/templates/210/PageActionsBottom.jsp | 4 +-
.../main/webapp/templates/210/PageActionsTop.jsp | 4 +-
.../src/main/webapp/templates/210/PageContent.jsp | 4 +-
.../src/main/webapp/templates/210/PageTab.jsp | 4 +-
.../webapp/templates/210/PreferencesContent.jsp | 4 +-
.../main/webapp/templates/210/PreferencesTab.jsp | 8 +-
.../main/webapp/templates/210/PreviewContent.jsp | 4 +-
.../src/main/webapp/templates/210/ProfileTab.jsp | 6 +-
.../src/main/webapp/templates/210/SearchBox.jsp | 2 +-
.../main/webapp/templates/210/UploadTemplate.jsp | 4 +-
.../src/main/webapp/templates/210/UserBox.jsp | 4 +-
.../src/main/webapp/templates/210/ViewTemplate.jsp | 2 +-
.../main/webapp/templates/210/WorkflowContent.jsp | 6 +-
.../webapp/templates/210/admin/UserManagement.jsp | 4 +-
.../src/main/webapp/templates/210/commonheader.jsp | 4 +-
.../main/webapp/templates/210/editors/CKeditor.jsp | 4 +-
.../src/main/webapp/templates/210/editors/FCK.jsp | 4 +-
.../main/webapp/templates/210/editors/TinyMCE.jsp | 4 +-
.../main/webapp/templates/210/editors/plain.jsp | 4 +-
.../main/webapp/templates/210/editors/preview.jsp | 4 +-
.../main/webapp/templates/210/editors/wysiwyg.jsp | 4 +-
.../main/webapp/templates/default/AJAXPreview.jsp | 2 +-
.../main/webapp/templates/default/AJAXSearch.jsp | 6 +-
.../webapp/templates/default/AttachmentTab.jsp | 6 +-
.../webapp/templates/default/CommentContent.jsp | 6 +-
.../webapp/templates/default/ConflictContent.jsp | 4 +-
.../src/main/webapp/templates/default/DiffTab.jsp | 6 +-
.../webapp/templates/default/DisplayMessage.jsp | 4 +-
.../main/webapp/templates/default/EditContent.jsp | 6 +-
.../webapp/templates/default/EditGroupContent.jsp | 8 +-
.../main/webapp/templates/default/EditTemplate.jsp | 2 +-
.../main/webapp/templates/default/FindContent.jsp | 6 +-
.../src/main/webapp/templates/default/Footer.jsp | 4 +-
.../src/main/webapp/templates/default/GroupTab.jsp | 6 +-
.../src/main/webapp/templates/default/Header.jsp | 6 +-
.../main/webapp/templates/default/InfoContent.jsp | 8 +-
.../main/webapp/templates/default/LoginContent.jsp | 6 +-
.../src/main/webapp/templates/default/Nav.jsp | 8 +-
.../main/webapp/templates/default/PageContent.jsp | 4 +-
.../src/main/webapp/templates/default/PageInfo.jsp | 4 +-
.../src/main/webapp/templates/default/PageTab.jsp | 6 +-
.../templates/default/PreferencesContent.jsp | 6 +-
.../webapp/templates/default/PreferencesTab.jsp | 8 +-
.../webapp/templates/default/PreviewContent.jsp | 4 +-
.../main/webapp/templates/default/ProfileTab.jsp | 6 +-
.../main/webapp/templates/default/SearchBox.jsp | 2 +-
.../src/main/webapp/templates/default/Sidebar.jsp | 6 +-
.../webapp/templates/default/UploadTemplate.jsp | 6 +-
.../src/main/webapp/templates/default/UserBox.jsp | 6 +-
.../main/webapp/templates/default/ViewTemplate.jsp | 4 +-
.../webapp/templates/default/WorkflowContent.jsp | 8 +-
.../templates/default/admin/UserManagement.jsp | 4 +-
.../main/webapp/templates/default/commonheader.jsp | 4 +-
.../webapp/templates/default/editors/CKeditor.jsp | 6 +-
.../webapp/templates/default/editors/TinyMCE.jsp | 6 +-
.../webapp/templates/default/editors/plain.jsp | 6 +-
.../webapp/templates/default/editors/preview.jsp | 4 +-
.../webapp/templates/default/editors/wysiwyg.jsp | 6 +-
.../main/webapp/templates/reader/ViewTemplate.jsp | 2 +-
jspwiki-wikipages/de/pom.xml | 2 +-
jspwiki-wikipages/en/pom.xml | 2 +-
jspwiki-wikipages/es/pom.xml | 2 +-
jspwiki-wikipages/fi/pom.xml | 2 +-
jspwiki-wikipages/fr/pom.xml | 2 +-
jspwiki-wikipages/it/pom.xml | 2 +-
jspwiki-wikipages/nl/pom.xml | 2 +-
jspwiki-wikipages/pom.xml | 2 +-
jspwiki-wikipages/pt_BR/pom.xml | 2 +-
jspwiki-wikipages/ru/pom.xml | 2 +-
jspwiki-wikipages/zh_CN/pom.xml | 2 +-
jspwiki-wysiwyg/pom.xml | 19 +-
pom.xml | 199 +++----
284 files changed, 2172 insertions(+), 2382 deletions(-)
