This is an automated email from the ASF dual-hosted git repository.
mraible pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/roller.git
from 0ceb0f329 Fix AtomPub media naming, paging and XML output, and editor
menus (#213)
add ff34095f3 Upgrade to Java 17, Derby 10.16.1.1, and fix SLF4J bridge
add 68e4af471 Remove OAuth 1.0a, OpenID 2.0 filter, and unused dependencies
add a1c737709 Fork XmlRpcServlet and AtomServlet into Roller codebase
add 44e81c8f9 Migrate to Jakarta EE 10, Spring 7, Struts 7, and
EclipseLink 5
add 01086d666 Upgrade Jetty Maven plugin to 12, Tomcat to 10.1, and
PostgreSQL to 16
add 96f4e7945 Update CI matrix to require Java 17 minimum
add ecb194dbd Fix it-selenium module for Jakarta EE 10 migration
add 33fe72e3a Fix Struts DTD reference: struts-7.0.dtd does not exist
add 6621c85ea Rename fileUpload interceptor to actionFileUpload for Struts
7
add 273825447 Fix Struts 7 parameter binding, OGNL allowlist, and static
content path
add 191ff819f Fix mvn jetty:run for the Jetty 12 plugin
add 7867dc129 Permit unmatched requests explicitly under Spring Security 7
add 2a395960e Serve WebJar assets from META-INF/resources instead of the
webjars servlet
add b9dff9843 Restore the bootstrap form theme via the Jakarta
struts2-bootstrap-plugin
add d12aa2217 Fix the it-selenium jetty harness for the Jetty 12 plugin
add e62111edd Deliver uploaded files via Struts 7's UploadedFilesAware
interface
add 47a8cdd6b Test against JDK 25 and upgrade Mockito so it can mock there
add dd2b28397 Fix AtomPub basic authentication checking the wrong user's
password
add 14937ad9d Run CI on pull requests that target feature branches so
stacked PRs get checks
add a90829305 Restore null path info handling in the forked Atom adapter
and stop reusing the PostgreSQL 10 data directory
add b58edfdb0 Target Jakarta EE 11 so Spring Framework 7 runs on its
supported baseline
add aec70d0ef Refuse stale AtomPub auth schemes and answer missing
Content-Type with 415
add 067afeeea Merge remote-tracking branch 'upstream/master' into
feature/jakarta-ee-10-migration
add 14993e291 Address review feedback: drop committed logs, inject servlet
objects, target Servlet 6.1
add fc2d81948 Update dependencies to their latest compatible releases and
clear known CVEs
add c5d854bd3 Update the JDBC driver and mail jars the Docker image
downloads
add 6129f439b Let the setup token page share UIAction's injected request
add 3e81b25af Bind request parameters only to @StrutsParameter-annotated
members
add 492160a93 Merge master into feature/jakarta-ee-10-migration
add 2f89e31fd Add Roller 7 upgrade notes for the Jakarta EE baseline and
the OAuth 1.0a and OpenID 2.0 removals
add 987c99010 Drop a comment about the removed OAuth path in the AtomPub
servlet
add 74bc2eed6 Merge master into feature/jakarta-ee-10-migration
new 457de9ca0 Merge pull request #154 from
mraible/feature/jakarta-ee-10-migration
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/main.yml | 6 +-
.gitignore | 3 +-
CHANGES.md | 11 +
Dockerfile | 12 +-
app/pom.xml | 169 ++++-----
.../org/apache/roller/planet/util/MailUtil.java | 16 +-
.../roller/weblogger/business/MailProvider.java | 6 +-
.../weblogger/business/MultiWeblogURLStrategy.java | 16 -
.../roller/weblogger/business/OAuthManager.java | 142 -------
.../roller/weblogger/business/URLStrategy.java | 10 -
.../roller/weblogger/business/Weblogger.java | 7 -
.../roller/weblogger/business/WebloggerImpl.java | 14 -
.../business/jpa/JPAOAuthManagerImpl.java | 420 ---------------------
.../weblogger/business/jpa/JPAWebloggerImpl.java | 2 -
.../weblogger/business/jpa/JPAWebloggerModule.java | 7 -
.../business/themes/ThemeManagerImpl.java | 4 +-
.../roller/weblogger/planet/ui/PlanetConfig.java | 14 +-
.../planet/ui/PlanetGroupBean.java} | 62 +--
.../weblogger/planet/ui/PlanetGroupSubs.java | 74 ++--
.../roller/weblogger/planet/ui/PlanetGroups.java | 8 +-
.../roller/weblogger/planet/ui/PlanetUIAction.java | 2 +-
.../weblogger/pojos/OAuthAccessorRecord.java | 185 ---------
.../weblogger/pojos/OAuthConsumerRecord.java | 110 ------
.../roller/weblogger/ui/core/CmaRollerContext.java | 2 +-
.../roller/weblogger/ui/core/RollerContext.java | 12 +-
.../roller/weblogger/ui/core/RollerSession.java | 21 +-
.../weblogger/ui/core/filters/BootstrapFilter.java | 20 +-
.../ui/core/filters/BootstrapSecurityFilter.java | 4 +-
.../ui/core/filters/CharEncodingFilter.java | 12 +-
...CustomOpenIDAuthenticationProcessingFilter.java | 114 ------
.../weblogger/ui/core/filters/DebugFilter.java | 16 +-
.../weblogger/ui/core/filters/IPBanFilter.java | 16 +-
.../weblogger/ui/core/filters/InitFilter.java | 14 +-
.../weblogger/ui/core/filters/LoadSaltFilter.java | 4 +-
.../ui/core/filters/PersistenceSessionFilter.java | 16 +-
.../ui/core/filters/RoleAssignmentFilter.java | 16 +-
.../weblogger/ui/core/filters/SaltValidator.java | 4 +-
.../filters/SpringFirewallExceptionFilter.java | 16 +-
.../ui/core/filters/ValidateSaltFilter.java | 16 +-
.../ui/core/filters/XmlRpcEnabledFilter.java | 14 +-
.../weblogger/ui/core/security/AutoProvision.java | 2 +-
.../ui/core/security/BasicUserAutoProvision.java | 2 +-
.../ui/core/security/BootstrapSecurity.java | 2 +-
.../ui/core/security/CustomUserRegistry.java | 2 +-
.../ui/core/security/RollerUserDetailsService.java | 59 +--
.../ui/core/tags/calendar/CalendarTag.java | 6 +-
.../weblogger/ui/rendering/RequestMapper.java | 6 +-
.../ui/rendering/WeblogRequestMapper.java | 8 +-
.../filters/DeviceResolverRequestFilter.java | 8 +-
.../ui/rendering/filters/RequestMappingFilter.java | 16 +-
.../rendering/mobile/MobileDeviceRepository.java | 4 +-
.../ui/rendering/model/CalendarModel.java | 2 +-
.../plugins/comments/CommentAuthenticator.java | 2 +-
.../comments/CommentAuthenticatorUtils.java | 2 +-
.../comments/DefaultCommentAuthenticator.java | 2 +-
.../plugins/comments/LdapCommentAuthenticator.java | 4 +-
.../plugins/comments/MathCommentAuthenticator.java | 4 +-
.../servlets/CommentAuthenticatorServlet.java | 10 +-
.../ui/rendering/servlets/CommentServlet.java | 12 +-
.../ui/rendering/servlets/FeedServlet.java | 10 +-
.../rendering/servlets/MediaResourceServlet.java | 10 +-
.../ui/rendering/servlets/PageServlet.java | 14 +-
.../ui/rendering/servlets/PlanetFeedServlet.java | 10 +-
.../rendering/servlets/PreviewResourceServlet.java | 12 +-
.../ui/rendering/servlets/PreviewServlet.java | 14 +-
.../ui/rendering/servlets/RSDServlet.java | 10 +-
.../ui/rendering/servlets/ResourceServlet.java | 12 +-
.../ui/rendering/servlets/SearchServlet.java | 14 +-
.../ui/rendering/util/ModDateHeaderUtil.java | 4 +-
.../weblogger/ui/rendering/util/ParsedRequest.java | 2 +-
.../weblogger/ui/rendering/util/PlanetRequest.java | 2 +-
.../ui/rendering/util/WeblogCommentRequest.java | 2 +-
.../ui/rendering/util/WeblogFeedRequest.java | 2 +-
.../rendering/util/WeblogMediaResourceRequest.java | 2 +-
.../ui/rendering/util/WeblogPageRequest.java | 2 +-
.../ui/rendering/util/WeblogPreviewRequest.java | 2 +-
.../util/WeblogPreviewResourceRequest.java | 2 +-
.../weblogger/ui/rendering/util/WeblogRequest.java | 2 +-
.../ui/rendering/util/WeblogResourceRequest.java | 2 +-
.../ui/rendering/util/WeblogSearchRequest.java | 2 +-
.../ui/rendering/util/mobile/DeviceResolver.java | 2 +-
.../ui/rendering/util/mobile/DeviceUtils.java | 2 +-
.../rendering/util/mobile/LiteDeviceResolver.java | 2 +-
.../util/mobile/MobileDeviceRepository.java | 2 +-
.../rendering/velocity/WebappResourceLoader.java | 2 +-
.../weblogger/ui/struts2/admin/CacheInfo.java | 2 +
.../ui/struts2/admin/GlobalCommentManagement.java | 12 +-
.../weblogger/ui/struts2/admin/GlobalConfig.java | 40 +-
.../weblogger/ui/struts2/admin/PingTargetEdit.java | 2 +
.../weblogger/ui/struts2/admin/PingTargets.java | 2 +
.../weblogger/ui/struts2/admin/UserAdmin.java | 2 +
.../weblogger/ui/struts2/admin/UserEdit.java | 2 +
.../ui/struts2/ajax/CommentDataServlet.java | 8 +-
.../ui/struts2/ajax/ThemeDataServlet.java | 8 +-
.../weblogger/ui/struts2/ajax/UserDataServlet.java | 8 +-
.../weblogger/ui/struts2/core/BootstrapToken.java | 23 +-
.../weblogger/ui/struts2/core/CreateWeblog.java | 2 +
.../weblogger/ui/struts2/core/FrontpageSetup.java | 8 +-
.../roller/weblogger/ui/struts2/core/Install.java | 7 +-
.../roller/weblogger/ui/struts2/core/Login.java | 2 +
.../roller/weblogger/ui/struts2/core/MainMenu.java | 2 +
.../weblogger/ui/struts2/core/OAuthAuthorize.java | 101 -----
.../weblogger/ui/struts2/core/OAuthKeys.java | 117 ------
.../roller/weblogger/ui/struts2/core/Profile.java | 2 +
.../roller/weblogger/ui/struts2/core/Register.java | 18 +-
.../weblogger/ui/struts2/editor/BookmarkEdit.java | 3 +
.../weblogger/ui/struts2/editor/Bookmarks.java | 5 +
.../ui/struts2/editor/BookmarksImport.java | 69 ++--
.../weblogger/ui/struts2/editor/CategoryEdit.java | 2 +
.../ui/struts2/editor/CategoryRemove.java | 3 +
.../weblogger/ui/struts2/editor/Comments.java | 2 +
.../weblogger/ui/struts2/editor/Entries.java | 2 +
.../ui/struts2/editor/EntryAddWithMediaFile.java | 5 +
.../weblogger/ui/struts2/editor/EntryEdit.java | 2 +
.../weblogger/ui/struts2/editor/EntryRemove.java | 2 +
.../weblogger/ui/struts2/editor/FolderEdit.java | 16 +-
.../weblogger/ui/struts2/editor/MediaFileAdd.java | 70 ++--
.../weblogger/ui/struts2/editor/MediaFileBase.java | 4 +
.../weblogger/ui/struts2/editor/MediaFileEdit.java | 411 +++++++++-----------
.../ui/struts2/editor/MediaFileImageChooser.java | 3 +
.../weblogger/ui/struts2/editor/MediaFileView.java | 7 +
.../weblogger/ui/struts2/editor/Members.java | 26 +-
.../weblogger/ui/struts2/editor/MembersInvite.java | 3 +
.../roller/weblogger/ui/struts2/editor/Pings.java | 2 +
.../ui/struts2/editor/StylesheetEdit.java | 3 +
.../weblogger/ui/struts2/editor/TemplateEdit.java | 2 +
.../weblogger/ui/struts2/editor/Templates.java | 4 +
.../weblogger/ui/struts2/editor/ThemeEdit.java | 4 +
.../weblogger/ui/struts2/editor/WeblogConfig.java | 2 +
.../roller/weblogger/ui/struts2/util/UIAction.java | 29 +-
.../ui/struts2/util/UIActionInterceptor.java | 8 +-
.../struts2/util/UIActionPrepareInterceptor.java | 4 +-
.../ui/struts2/util/UISecurityInterceptor.java | 4 +-
.../ui/struts2/util/ValidateSaltInterceptor.java | 10 +-
.../roller/weblogger/ui/tags/StringTagSupport.java | 6 +-
.../weblogger/ui/tags/TruncateNicelyTag.java | 2 +-
.../roller/weblogger/ui/tags/WordWrapTag.java | 2 +-
.../apache/roller/weblogger/util/I18nMessages.java | 2 +-
.../org/apache/roller/weblogger/util/MailUtil.java | 16 +-
.../roller/weblogger/util/MediaTypePolicy.java | 2 +-
.../apache/roller/weblogger/util/Utilities.java | 8 +-
.../webservices/atomprotocol/AtomException.java | 2 +-
.../atomprotocol/AtomNotAuthorizedException.java | 2 +-
.../atomprotocol/AtomNotFoundException.java | 2 +-
.../webservices/atomprotocol/AtomReader.java | 2 +-
.../webservices/atomprotocol/AtomRequest.java | 2 +-
.../atomprotocol/CollectionSupport.java | 2 +-
.../webservices/atomprotocol/MediaCollection.java | 2 +-
.../atomprotocol/RollerAtomHandler.java | 48 +--
.../atomprotocol/RollerAtomServlet.java | 8 +-
.../webservices/oauth/AccessTokenServlet.java | 99 -----
.../webservices/oauth/AuthorizationServlet.java | 276 --------------
.../webservices/oauth/RequestTokenServlet.java | 110 ------
.../webservices/opensearch/OpenSearchServlet.java | 8 +-
.../webservices/tagdata/TagDataServlet.java | 8 +-
.../webservices/xmlrpc/RollerXmlRpcServlet.java | 213 +++++++++++
.../xmlrpc/RollerXmlRpcServletServer.java | 150 ++++++++
.../main/resources/ApplicationResources.properties | 37 +-
.../resources/ApplicationResources_ja.properties | 21 +-
.../ApplicationResources_zh_CN.properties | 37 +-
app/src/main/resources/META-INF/persistence.xml | 9 +-
.../org/apache/roller/planet/pojos/Planet.orm.xml | 4 +-
.../apache/roller/planet/pojos/PlanetGroup.orm.xml | 4 +-
.../planet/pojos/RuntimeConfigProperty.orm.xml | 4 +-
.../roller/planet/pojos/Subscription.orm.xml | 4 +-
.../roller/planet/pojos/SubscriptionEntry.orm.xml | 4 +-
.../apache/roller/weblogger/pojos/AutoPing.orm.xml | 4 +-
.../pojos/CustomTemplateRendition.orm.xml | 4 +-
.../roller/weblogger/pojos/MediaFile.orm.xml | 4 +-
.../weblogger/pojos/MediaFileDirectory.orm.xml | 4 +-
.../roller/weblogger/pojos/MediaFileTag.orm.xml | 4 +-
.../weblogger/pojos/OAuthAccessorRecord.orm.xml | 66 ----
.../weblogger/pojos/OAuthConsumerRecord.orm.xml | 48 ---
.../weblogger/pojos/ObjectPermission.orm.xml | 4 +-
.../roller/weblogger/pojos/PingQueueEntry.orm.xml | 4 +-
.../roller/weblogger/pojos/PingTarget.orm.xml | 4 +-
.../weblogger/pojos/RuntimeConfigProperty.orm.xml | 4 +-
.../apache/roller/weblogger/pojos/TaskLock.orm.xml | 4 +-
.../org/apache/roller/weblogger/pojos/User.orm.xml | 4 +-
.../apache/roller/weblogger/pojos/UserRole.orm.xml | 4 +-
.../apache/roller/weblogger/pojos/Weblog.orm.xml | 4 +-
.../roller/weblogger/pojos/WeblogBookmark.orm.xml | 4 +-
.../weblogger/pojos/WeblogBookmarkFolder.orm.xml | 4 +-
.../roller/weblogger/pojos/WeblogCategory.orm.xml | 4 +-
.../roller/weblogger/pojos/WeblogEntry.orm.xml | 4 +-
.../weblogger/pojos/WeblogEntryAttribute.orm.xml | 4 +-
.../weblogger/pojos/WeblogEntryComment.orm.xml | 4 +-
.../roller/weblogger/pojos/WeblogEntryTag.orm.xml | 4 +-
.../pojos/WeblogEntryTagAggregate.orm.xml | 4 +-
.../roller/weblogger/pojos/WeblogHitCount.orm.xml | 4 +-
.../weblogger/pojos/WeblogPermission.orm.xml | 4 +-
.../roller/weblogger/pojos/WeblogTemplate.orm.xml | 4 +-
app/src/main/resources/sql/400-to-500-migration.vm | 23 --
app/src/main/resources/sql/510-to-520-migration.vm | 2 -
app/src/main/resources/sql/createdb.vm | 25 --
app/src/main/resources/sql/droptables.sql | 4 -
app/src/main/resources/struts.xml | 32 +-
.../webapp/WEB-INF/jsps/core/MainMenuSidebar.jsp | 8 -
.../webapp/WEB-INF/jsps/core/OAuthAuthorize.jsp | 40 --
.../main/webapp/WEB-INF/jsps/core/OAuthKeys.jsp | 72 ----
.../main/webapp/WEB-INF/jsps/taglibs-struts2.jsp | 1 -
app/src/main/webapp/WEB-INF/security.xml | 47 +--
app/src/main/webapp/WEB-INF/tiles.xml | 14 +-
app/src/main/webapp/WEB-INF/web.xml | 57 +--
app/src/main/webapp/roller-ui/errors/403.jsp | 6 +-
app/src/main/webapp/roller-ui/errors/404.jsp | 6 +-
app/src/main/webapp/roller-ui/errors/413.jsp | 2 +-
app/src/main/webapp/roller-ui/errors/error.jsp | 8 +-
app/src/main/webapp/roller-ui/logout-redirect.jsp | 2 +-
.../business/jpa/JPAOAuthManagerTest.java | 124 ------
.../planet/ui/PlanetAvailabilityTest.java | 18 +-
.../weblogger/ui/core/RollerSessionTest.java | 4 +-
.../ui/core/filters/LoadSaltFilterTest.java | 8 +-
.../ui/core/filters/ValidateSaltFilterTest.java | 9 +-
.../model/SearchResultsFeedModelTest.java | 2 +-
.../ui/rendering/model/SearchResultsModelTest.java | 2 +-
.../comments/LdapCommentAuthenticatorTest.java | 4 +-
.../admin/GlobalConfigAtomPubLimitTest.java | 6 +-
.../ui/struts2/ajax/CommentDataServletTest.java | 8 +-
.../struts2/editor/AuthoringActionScopingTest.java | 14 +-
.../ui/struts2/editor/FolderEditSaveTest.java | 4 +-
.../util/StrutsParameterAnnotationTest.java | 330 ++++++++++++++++
.../struts2/util/ValidateSaltInterceptorTest.java | 8 +-
.../roller/weblogger/util/MediaTypePolicyTest.java | 8 +-
.../atomprotocol/AtomExceptionTest.java | 2 +-
.../webservices/atomprotocol/AtomReaderTest.java | 2 +-
.../webservices/atomprotocol/AtomRequestTest.java | 2 +-
.../atomprotocol/MediaCollectionTest.java | 2 +-
.../atomprotocol/RollerAtomHandlerTest.java | 4 +-
.../atomprotocol/RollerAtomManagementTest.java | 4 +-
.../atomprotocol/RollerAtomProtocolTest.java | 4 +-
.../atomprotocol/RollerAtomServletTest.java | 12 +-
.../oauth/AuthorizationServletTest.java | 400 --------------------
.../xmlrpc/XmlRpcExtensionTypeTest.java | 6 +-
app/src/test/resources/jetty.xml | 20 +-
app/src/test/resources/roller-jettyrun.properties | 3 +-
docker-compose.yml | 9 +-
docs/roller-atompub-guide.adoc | 25 +-
docs/security-model.md | 8 +-
it-selenium/pom.xml | 51 ++-
.../roller/selenium/editor/AbstractEntryPage.java | 5 +-
pom.xml | 33 +-
testing/junit-cleartables-mysql.sql | 2 -
243 files changed, 1840 insertions(+), 3945 deletions(-)
delete mode 100644
app/src/main/java/org/apache/roller/weblogger/business/OAuthManager.java
delete mode 100644
app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAOAuthManagerImpl.java
copy app/src/main/java/org/apache/roller/{planet/pojos/Planet.java =>
weblogger/planet/ui/PlanetGroupBean.java} (54%)
delete mode 100644
app/src/main/java/org/apache/roller/weblogger/pojos/OAuthAccessorRecord.java
delete mode 100644
app/src/main/java/org/apache/roller/weblogger/pojos/OAuthConsumerRecord.java
delete mode 100644
app/src/main/java/org/apache/roller/weblogger/ui/core/filters/CustomOpenIDAuthenticationProcessingFilter.java
delete mode 100644
app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/OAuthAuthorize.java
delete mode 100644
app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/OAuthKeys.java
delete mode 100644
app/src/main/java/org/apache/roller/weblogger/webservices/oauth/AccessTokenServlet.java
delete mode 100644
app/src/main/java/org/apache/roller/weblogger/webservices/oauth/AuthorizationServlet.java
delete mode 100644
app/src/main/java/org/apache/roller/weblogger/webservices/oauth/RequestTokenServlet.java
create mode 100644
app/src/main/java/org/apache/roller/weblogger/webservices/xmlrpc/RollerXmlRpcServlet.java
create mode 100644
app/src/main/java/org/apache/roller/weblogger/webservices/xmlrpc/RollerXmlRpcServletServer.java
delete mode 100644
app/src/main/resources/org/apache/roller/weblogger/pojos/OAuthAccessorRecord.orm.xml
delete mode 100644
app/src/main/resources/org/apache/roller/weblogger/pojos/OAuthConsumerRecord.orm.xml
delete mode 100644 app/src/main/webapp/WEB-INF/jsps/core/OAuthAuthorize.jsp
delete mode 100644 app/src/main/webapp/WEB-INF/jsps/core/OAuthKeys.jsp
delete mode 100644
app/src/test/java/org/apache/roller/weblogger/business/jpa/JPAOAuthManagerTest.java
create mode 100644
app/src/test/java/org/apache/roller/weblogger/ui/struts2/util/StrutsParameterAnnotationTest.java
delete mode 100644
app/src/test/java/org/apache/roller/weblogger/webservices/oauth/AuthorizationServletTest.java