You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by mr...@apache.org on 2026/10/11 01:06:34 UTC

(roller) branch feature/oidc-login updated (5985ad281 -> 17aadd6ba)

This is an automated email from the ASF dual-hosted git repository.

mraible pushed a change to branch feature/oidc-login
in repository https://gitbox.apache.org/repos/asf/roller.git


    from 5985ad281 Merge branch 'feature/jakarta-ee-10-migration' into feature/oidc-login
     add ec5cbf190 End the identity provider session when an OIDC user logs out
     add a944dcb5e Change database host port in Dockerfile (#151)
     add 43f52907e Fold release and disclosure lessons into the release and security skills (#195)
     add aff1a496c Start Roller 7 development: set version to 7.0.0-SNAPSHOT
     add 9f408a21e No single quotes in media file insert url on mediaFileAdd!save.rol (#193)
     add eaca41ffe Update the gaurav theme's jQuery and Bootstrap, drop unused jQuery 2.1.1
     add 32f477e80 Merge pull request #196 from apache/upgrade-gaurav-jquery
     add 62475d91e Add the ASF license header to source files that were missing it
     add 2a34c6d95 Check license headers with Apache RAT in CI
     add 4b5600c5a Merge pull request #194 from apache/add-missing-license-headers
     add 15d4fce0c Add security model and SECURITY.md (#202)
     add 080043a89 Start 6.1.7 development: set version to 6.1.7-SNAPSHOT
     add a59d5ff42 No single quotes in media file insert url on mediaFileAdd!save.rol (#197)
     add 6bb32105e Run CI and CodeQL on roller-6.1.x (#206)
     add c2789ab8c Adopt Apache Commons Secure XML for XML parsing (#201)
     add e41a1a12f Turn Planet off by default and require POST for its admin changes (#200)
     add 51c943b24 ROL-2184: Preserve pasted entry images when publishing (#205)
     add 5adadd9dd Fix bugs found while testing the 6.1.7 integration build (#207)
     add e34adddb3 Keep wrapped pojos out of the template surface (#199)
     add 736ab11de Serve AtomPub through a Roller servlet (#198)
     add b67a82b91 Update the NOTICE copyright year to 2026
     add ece656fbe Print the one-time setup token to the console as well as the log
     add cb13c09bf Leave runtime logs directories out of the source archive
     add eb902c608 Set version to 6.1.7
     add e25af330f Merge branch 'roller-6.1.x' into master
     add 3dc3cc90a Filter HTML-significant characters out of tag names (#208)
     add 1d739efc5 Merge branch 'roller-6.1.x' into master
     add c2ca40ed8 Replace ROME Propono AtomPub server with self-contained StAX implementation (#210)
     add 359c4804c Bring #209 and #211 into master (#212)
     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 17aadd6ba Merge branch 'feature/jakarta-ee-10-migration' into feature/oidc-login

No new revisions were added by this update.

Summary of changes:
 .github/codeql/codeql-config.yml                   |  16 +
 .github/workflows/codeql-analysis.yml              |  20 +-
 .github/workflows/main.yml                         |  28 +-
 CHANGES.md                                         | 120 ++++-
 NOTICE.txt                                         |   2 +-
 SECURITY.md                                        |  50 ++
 app/nbactions.xml                                  |  17 +
 app/pom.xml                                        |  55 +-
 .../roller/planet/config/PlanetRuntimeConfig.java  |  27 +-
 .../org/apache/roller/planet/pojos/Template.java   |  18 +
 .../roller/weblogger/business/WeblogManager.java   |   7 +
 .../roller/weblogger/business/WebloggerImpl.java   |  24 +-
 .../business/jpa/JPAWeblogEntryManagerImpl.java    |   9 +-
 .../business/jpa/JPAWeblogManagerImpl.java         |  14 +
 .../business/themes/TemplateRuleException.java     |  73 +++
 .../business/themes/WeblogTemplateEditor.java      | 231 +++++++++
 .../planet/tasks/RefreshRollerPlanetTask.java      |   4 +
 .../weblogger/planet/tasks/SyncWebsitesTask.java   |   4 +
 .../roller/weblogger/planet/ui/PlanetConfig.java   |   3 +
 .../weblogger/planet/ui/PlanetGroupSubs.java       |   9 +
 .../roller/weblogger/planet/ui/PlanetGroups.java   |   3 +
 .../roller/weblogger/planet/ui/PlanetUIAction.java |  20 +
 .../pojos/wrapper/WeblogCategoryWrapper.java       |   7 +-
 .../pojos/wrapper/WeblogEntryTagWrapper.java       |   8 +-
 .../pojos/wrapper/WeblogEntryWrapper.java          |  11 +-
 .../weblogger/pojos/wrapper/WeblogWrapper.java     |   9 +-
 .../roller/weblogger/pojos/wrapper/Wrappers.java   |  49 ++
 .../ui/core/RollerLoginSessionManager.java         |  18 +
 .../ui/core/filters/BootstrapSecurityFilter.java   |  18 +
 .../ui/core/filters/ValidateSaltFilter.java        |  25 +
 .../ui/core/security/BootstrapSecurity.java        |   8 +-
 .../weblogger/ui/core/security/LogoutRedirect.java |  84 +++
 .../ui/core/security/RollerUserDetailsService.java |  18 +
 .../ui/core/tags/calendar/package-info.java        |  18 +
 .../weblogger/ui/core/util/menu/package-info.java  |  18 +
 .../weblogger/ui/rendering/RequestMapper.java      |  17 +
 .../weblogger/ui/rendering/model/SiteModel.java    |   3 +-
 .../ui/rendering/model/UtilitiesModel.java         |   5 +-
 .../weblogger/ui/rendering/model/package-info.java |  18 +
 .../ui/rendering/pagers/package-info.java          |  18 +
 .../rendering/plugins/comments/package-info.java   |  18 +
 .../ui/rendering/servlets/PlanetFeedServlet.java   |  10 +-
 .../ui/rendering/servlets/package-info.java        |  18 +
 .../ui/rendering/util/cache/package-info.java      |  18 +
 .../weblogger/ui/rendering/util/package-info.java  |  18 +
 .../ui/rendering/velocity/package-info.java        |  18 +
 .../weblogger/ui/struts2/admin/GlobalConfig.java   |   7 +-
 .../weblogger/ui/struts2/admin/package-info.java   |  18 +
 .../weblogger/ui/struts2/ajax/package-info.java    |  18 +
 .../weblogger/ui/struts2/core/package-info.java    |  18 +
 .../weblogger/ui/struts2/editor/CategoryEdit.java  |   5 +
 .../ui/struts2/editor/EntryAddWithMediaFile.java   |   6 +-
 .../weblogger/ui/struts2/editor/EntryEdit.java     | 242 +++++++++
 .../weblogger/ui/struts2/editor/FolderEdit.java    |   2 +-
 .../weblogger/ui/struts2/editor/TemplateEdit.java  |  32 +-
 .../weblogger/ui/struts2/editor/Templates.java     | 185 ++-----
 .../weblogger/ui/struts2/editor/package-info.java  |  18 +
 .../weblogger/ui/struts2/pagers/package-info.java  |  18 +
 .../ui/struts2/util/UISecurityEnforced.java        |   9 +
 .../ui/struts2/util/UISecurityInterceptor.java     |   8 +
 .../weblogger/ui/struts2/util/package-info.java    |  18 +
 .../roller/weblogger/util/HTMLSanitizer.java       |  17 +-
 .../roller/weblogger/util/InlineImageData.java     | 265 ++++++++++
 .../roller/weblogger/util/SafeSAXBuilder.java      |  13 +-
 .../roller/weblogger/util/SecureXmlParsers.java    |  94 ++++
 .../apache/roller/weblogger/util/Utilities.java    |  40 +-
 .../roller/weblogger/util/cache/CachedContent.java |  17 +
 .../webservices/atomprotocol/AtomCategories.java   |  66 +++
 .../webservices/atomprotocol/AtomCategory.java     |  53 ++
 .../webservices/atomprotocol/AtomCollection.java   |  60 +++
 .../webservices/atomprotocol/AtomConstants.java    |  51 ++
 .../webservices/atomprotocol/AtomContent.java      |  54 ++
 .../webservices/atomprotocol/AtomEntry.java        | 194 +++++++
 .../webservices/atomprotocol/AtomException.java    |  47 ++
 .../webservices/atomprotocol/AtomFeed.java         |  74 +++
 .../atomprotocol/AtomLink.java}                    |  59 ++-
 .../atomprotocol/AtomMediaResource.java            |  63 +++
 .../atomprotocol/AtomNotAuthorizedException.java}  |  17 +-
 .../atomprotocol/AtomNotFoundException.java}       |  16 +-
 .../atomprotocol/AtomPerson.java}                  |  49 +-
 .../webservices/atomprotocol/AtomReader.java       | 304 +++++++++++
 .../webservices/atomprotocol/AtomRequest.java      |  86 +++
 .../atomprotocol/AtomServiceDoc.java}              |  19 +-
 .../atomprotocol/AtomWorkspace.java}               |  39 +-
 .../webservices/atomprotocol/AtomWriter.java       | 288 +++++++++++
 .../atomprotocol/CategoryCollection.java           | 246 +++++++++
 .../atomprotocol/CollectionSupport.java            | 135 +++++
 .../atomprotocol/CommentCollection.java            | 262 ++++++++++
 .../webservices/atomprotocol/EntryCollection.java  | 230 ++++-----
 .../webservices/atomprotocol/MediaCollection.java  | 317 ++++++------
 .../atomprotocol/RollerAtomHandler.java            | 178 ++++---
 .../atomprotocol/RollerAtomRequestImpl.java        | 137 -----
 .../atomprotocol/RollerAtomService.java            | 139 +++--
 .../atomprotocol/RollerAtomServlet.java            | 574 ++++++++++-----------
 .../atomprotocol/TemplateCollection.java           | 299 +++++++++++
 .../webservices/atomprotocol/package-info.java     |   3 +-
 .../resources-filtered/roller-version.properties   |  16 +
 .../main/resources/ApplicationResources.properties |   8 +
 app/src/main/resources/META-INF/persistence.xml    |  17 +
 .../org/apache/roller/planet/pojos/Planet.orm.xml  |  17 +
 .../apache/roller/planet/pojos/PlanetGroup.orm.xml |  17 +
 .../planet/pojos/RuntimeConfigProperty.orm.xml     |  17 +
 .../roller/planet/pojos/Subscription.orm.xml       |  17 +
 .../roller/planet/pojos/SubscriptionEntry.orm.xml  |  17 +
 .../roller/weblogger/config/roller.properties      |  21 +-
 .../roller/weblogger/config/runtimeConfigDefs.xml  |   5 +
 .../apache/roller/weblogger/pojos/AutoPing.orm.xml |  17 +
 .../pojos/CustomTemplateRendition.orm.xml          |  17 +
 .../roller/weblogger/pojos/MediaFile.orm.xml       |  17 +
 .../weblogger/pojos/MediaFileDirectory.orm.xml     |  17 +
 .../roller/weblogger/pojos/MediaFileTag.orm.xml    |  17 +
 .../weblogger/pojos/ObjectPermission.orm.xml       |  17 +
 .../roller/weblogger/pojos/PingQueueEntry.orm.xml  |  17 +
 .../roller/weblogger/pojos/PingTarget.orm.xml      |  17 +
 .../weblogger/pojos/RuntimeConfigProperty.orm.xml  |  17 +
 .../apache/roller/weblogger/pojos/TaskLock.orm.xml |  17 +
 .../org/apache/roller/weblogger/pojos/User.orm.xml |  17 +
 .../apache/roller/weblogger/pojos/UserRole.orm.xml |  17 +
 .../apache/roller/weblogger/pojos/Weblog.orm.xml   |  17 +
 .../roller/weblogger/pojos/WeblogBookmark.orm.xml  |  17 +
 .../weblogger/pojos/WeblogBookmarkFolder.orm.xml   |  17 +
 .../roller/weblogger/pojos/WeblogCategory.orm.xml  |  17 +
 .../roller/weblogger/pojos/WeblogEntry.orm.xml     |  17 +
 .../weblogger/pojos/WeblogEntryAttribute.orm.xml   |  17 +
 .../weblogger/pojos/WeblogEntryComment.orm.xml     |  17 +
 .../roller/weblogger/pojos/WeblogEntryTag.orm.xml  |  17 +
 .../pojos/WeblogEntryTagAggregate.orm.xml          |  17 +
 .../roller/weblogger/pojos/WeblogHitCount.orm.xml  |  17 +
 .../weblogger/pojos/WeblogPermission.orm.xml       |  17 +
 .../roller/weblogger/pojos/WeblogTemplate.orm.xml  |  17 +
 .../ui/struts2/admin/UserEdit-validation.xml       |  17 +
 .../weblogger/ui/struts2/admin/admin-menu.xml      |  17 +
 .../ui/struts2/core/CreateWeblog-validation.xml    |  17 +
 .../ui/struts2/core/Profile-validation.xml         |  17 +
 .../ui/struts2/core/Register-validation.xml        |  17 +
 .../ui/struts2/editor/BookmarkEdit-validation.xml  |  17 +
 .../ui/struts2/editor/CategoryEdit-validation.xml  |  17 +
 .../ui/struts2/editor/EntryEdit-validation.xml     |  17 +
 .../ui/struts2/editor/FolderEdit-validation.xml    |  17 +
 .../ui/struts2/editor/MediaFileEdit-validation.xml |  17 +
 .../ui/struts2/editor/TemplateEdit-validation.xml  |  17 +
 .../ui/struts2/editor/WeblogConfig-validation.xml  |  17 +
 .../weblogger/ui/struts2/editor/editor-menu.xml    |  17 +
 .../xmlrpc/webserver/XmlRpcServlet.properties      |  16 +
 app/src/main/resources/propono.properties          |   2 -
 app/src/main/resources/sql/310-to-400-migration.vm |  17 +
 app/src/main/resources/sql/400-to-500-migration.vm |  17 +
 app/src/main/resources/sql/500-to-510-migration.vm |  17 +
 app/src/main/resources/sql/510-to-520-migration.vm |  17 +
 app/src/main/resources/sql/520-to-610-migration.vm |  17 +
 app/src/main/resources/sql/control.vm              |  18 +-
 app/src/main/resources/sql/createdb.vm             |  17 +
 app/src/main/resources/sql/dbscripts.properties    |  16 +
 app/src/main/resources/sql/macros.vm               |  18 +-
 app/src/main/resources/struts.properties           |  16 +
 .../resources/template/roller/theme.properties     |  16 +
 app/src/main/webapp/META-INF/context.xml-example   |  17 +
 .../webapp/WEB-INF/jboss-deployment-structure.xml  |  17 +
 app/src/main/webapp/WEB-INF/jboss-web.xml          |  17 +
 .../webapp/WEB-INF/jsps/admin/GlobalConfig.jsp     |   2 +-
 .../main/webapp/WEB-INF/jsps/admin/PingTargets.jsp |  12 +-
 .../webapp/WEB-INF/jsps/core/BootstrapToken.jsp    |  17 +
 .../main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp  |  81 +--
 .../main/webapp/WEB-INF/jsps/editor/Categories.jsp |  16 +-
 .../webapp/WEB-INF/jsps/editor/EntryEditor.jsp     |  19 +-
 app/src/main/webapp/WEB-INF/jsps/tiles/head.jsp    |  20 +
 app/src/main/webapp/WEB-INF/sun-web.xml            |  17 +
 app/src/main/webapp/WEB-INF/taglib.tld             |  17 +
 .../main/webapp/WEB-INF/velocity/roller-custom.vm  |  16 +
 .../WEB-INF/velocity/templates/menu/menu-list.vm   |  18 +-
 .../WEB-INF/velocity/templates/menu/menu-tabbed.vm |  16 +
 .../velocity/templates/navbar/navbar-css.vm        |  17 +
 .../velocity/templates/navbar/navbar-horizontal.vm |  17 +
 .../velocity/templates/navbar/navbar-vertical.vm   |  17 +
 .../velocity/templates/weblog/noop_decorator.vm    |  18 +-
 .../velocity/templates/weblog/popupcomments.vm     |  18 +-
 .../WEB-INF/velocity/templates/weblog/rsd.vm       |  18 +-
 app/src/main/webapp/WEB-INF/web.xml                |  22 +
 .../roller-ui/errors/{denied.jsp => 413.jsp}       |  24 +-
 app/src/main/webapp/roller-ui/index.jsp            |  17 +
 app/src/main/webapp/roller-ui/logout-redirect.jsp  |  12 +-
 .../webapp/roller-ui/scripts/jquery-2.1.1.min.js   |   4 -
 app/src/main/webapp/theme/scripts/roller.js        |  25 +
 app/src/main/webapp/themes/basic/weblog.vm         |   2 +-
 app/src/main/webapp/themes/basicmobile/weblog.vm   |   2 +-
 app/src/main/webapp/themes/fauxcoly/weblog.vm      |   3 +-
 app/src/main/webapp/themes/frontpage/_header.vm    |   2 +-
 .../main/webapp/themes/gaurav/css/bootstrap.css    |   4 +-
 app/src/main/webapp/themes/gaurav/js/bootstrap.js  | 264 ++++++++--
 app/src/main/webapp/themes/gaurav/js/jquery.js     |   7 +-
 app/src/main/webapp/themes/gaurav/std_head.vm      |   2 +-
 .../planet/config/PlanetRuntimeConfigTest.java     |  74 +++
 .../weblogger/business/PlanetManagerLocalTest.java |  10 +-
 .../roller/weblogger/business/package-info.java    |  18 +
 .../startup/DatabaseInstallerCreationTest.java     |  18 +-
 .../startup/DatabaseInstallerUpgradeTest.java      |  18 +-
 .../business/themes/WeblogCustomThemeTest.java     |  18 +-
 .../business/themes/WeblogTemplateEditorTest.java  | 208 ++++++++
 .../planet/ui/PlanetAvailabilityTest.java          | 156 ++++++
 .../pojos/wrapper/WeblogCategoryWrapperTest.java   |  46 ++
 .../pojos/wrapper/WeblogEntryTagWrapperTest.java   |  80 +++
 .../pojos/wrapper/WrapperPojoConfinementTest.java  | 168 ++++++
 .../weblogger/ui/core/RollerSessionTest.java       |  18 +
 .../ui/core/filters/LoadSaltFilterTest.java        |  18 +
 .../ui/core/filters/ValidateSaltFilterTest.java    |  52 ++
 .../ui/core/security/BootstrapSecurityTest.java    |  18 +
 .../ui/core/security/LogoutRedirectTest.java       | 131 +++++
 .../admin/GlobalConfigAtomPubLimitTest.java        | 113 ++++
 .../ui/struts2/editor/EntryEditEnclosureTest.java  |  18 +-
 .../struts2/editor/EntryEditInlineImagesTest.java  | 318 ++++++++++++
 .../ui/struts2/editor/EntryEditPreviewTest.java    |  18 +-
 .../ui/struts2/editor/FolderEditSaveTest.java      | 114 ++++
 .../util/HTMLSanitizerInlineImageTest.java         |  50 ++
 .../roller/weblogger/util/InlineImageDataTest.java | 182 +++++++
 .../roller/weblogger/util/SafeSAXBuilderTest.java  |  27 +-
 .../weblogger/util/SecureXmlParsersTest.java       | 122 +++++
 .../roller/weblogger/util/TagCharactersTest.java   |  60 +++
 .../webservices/atomprotocol/AtomEntryTest.java    |  55 ++
 .../atomprotocol/AtomExceptionTest.java            |  59 +++
 .../atomprotocol/AtomPubDocExamplesTest.java       | 487 +++++++++++++++++
 .../webservices/atomprotocol/AtomReaderTest.java   | 219 ++++++++
 .../webservices/atomprotocol/AtomRequestTest.java  |  97 ++++
 .../atomprotocol/AtomSchemaValidationTest.java     | 251 +++++++++
 .../webservices/atomprotocol/AtomWriterTest.java   | 276 ++++++++++
 .../atomprotocol/MediaCollectionPathTest.java      | 210 ++++++++
 .../atomprotocol/MediaCollectionTest.java          |  19 +-
 .../webservices/atomprotocol/RelaxNgValidator.java |  72 +++
 .../atomprotocol/RollerAtomHandlerTest.java        |  66 ++-
 .../atomprotocol/RollerAtomManagementTest.java     | 520 +++++++++++++++++++
 .../atomprotocol/RollerAtomProtocolTest.java       | 278 ++++++++++
 .../atomprotocol/RollerAtomServletTest.java        | 506 ++++++++++++++++++
 .../WEB-INF/dbscripts/dummydb/createdb-derby.sql   |  16 +
 .../WEB-INF/dbscripts/dummydb/createdb-mysql.sql   |  16 +
 .../WEB-INF/dbscripts/dummydb/droptables.sql       |  16 +
 app/src/test/resources/atompub/app-service.rnc     | 192 +++++++
 app/src/test/resources/atompub/atom.rnc            | 288 +++++++++++
 .../test/resources/confinement-probe.properties    |  16 +
 app/src/test/resources/roller-custom.properties    |  16 +
 app/src/test/resources/roller-jettyrun.properties  |  16 +
 .../java--comp/env/jdbc/default.properties         |  16 +
 app/src/test/resources/webdefault.xml              |  17 +
 assembly-release/pom.xml                           |   2 +-
 assembly-release/sign-release.sh                   |  17 +
 assembly-release/src/main/assembly/binary.xml      |   4 +
 assembly-release/src/main/assembly/source.xml      |   2 +
 binary-includes/NOTICE.txt                         |   2 +-
 db-utils/pom.xml                                   |  21 +-
 docs/README.md                                     |   2 +
 docs/atompub/examples/README.txt                   |   4 +
 docs/atompub/examples/categories.xml               |   6 +
 docs/atompub/examples/category-entry.xml           |  14 +
 docs/atompub/examples/category-request.xml         |  11 +
 docs/atompub/examples/comment-entry.xml            |  21 +
 docs/atompub/examples/comment-status-request.xml   |  10 +
 docs/atompub/examples/comments-feed.xml            |  27 +
 docs/atompub/examples/entries-feed.xml             |  27 +
 docs/atompub/examples/entry-request.xml            |  15 +
 docs/atompub/examples/entry-response.xml           |  20 +
 docs/atompub/examples/media-link-entry.xml         |  14 +
 docs/atompub/examples/service.xml                  |  34 ++
 docs/atompub/examples/template-entry.xml           |  19 +
 docs/atompub/examples/template-request.xml         |  14 +
 docs/atompub/roller-atompub.rnc                    |  58 +++
 docs/examples/configs/tomcat/mod_jk.conf           |  16 +
 docs/examples/plugins/pluginmodel/build.xml        |  17 +
 .../plugins/pagemodel/AuthenticatedUserModel.java  |  17 +
 docs/examples/rollertask/roller-custom.properties  |  16 +
 docs/examples/scripting/bsf/ant.properties         |  16 +
 docs/examples/scripting/bsf/build.xml              |  17 +
 docs/examples/scripting/groovy/ant.properties      |  16 +
 docs/examples/scripting/groovy/build.xml           |  17 +
 .../groovy/examples/adminprotocol/createuser.gy    |  17 +
 .../groovy/examples/adminprotocol/deleteuser.gy    |  17 +
 .../examples/adminprotocol/listcollections.gy      |  17 +
 .../groovy/examples/adminprotocol/listusers.gy     |  17 +
 .../groovy/examples/atompub/atompost.groovy        |  18 +
 .../groovy/examples/rollerapi/createtestdata.gy    |  17 +
 .../examples/rollerapi/roller-custom.properties    |  16 +
 docs/roller-atompub-guide.adoc                     | 493 ++++++++++++++++++
 docs/roller-user-guide.adoc                        |  36 ++
 docs/security-model.md                             | 360 +++++++++++++
 it-selenium/nbactions.xml                          |  17 +
 it-selenium/pom.xml                                |   4 +-
 .../src/test/resources/roller-jettyrun.properties  |  16 +
 nbactions.xml                                      |  17 +
 pom.xml                                            |  41 +-
 skills/roller-release/SKILL.md                     |   5 +-
 skills/roller-release/references/dist-svn.md       |  13 +-
 .../roller-release/references/vote-and-announce.md |  11 +
 skills/roller-release/references/website.md        |   9 +
 skills/roller-security/SKILL.md                    |  17 +-
 .../assets/item-template/TRACKING.md               |   2 +-
 .../roller-security/references/comms-templates.md  |  28 +
 skills/roller-security/references/cve-portal.md    |  26 +
 testing/roller-junit.properties                    |  16 +
 version-rules.xml                                  |  17 +
 296 files changed, 14243 insertions(+), 1374 deletions(-)
 create mode 100644 SECURITY.md
 create mode 100644 app/src/main/java/org/apache/roller/weblogger/business/themes/TemplateRuleException.java
 create mode 100644 app/src/main/java/org/apache/roller/weblogger/business/themes/WeblogTemplateEditor.java
 create mode 100644 app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/Wrappers.java
 create mode 100644 app/src/main/java/org/apache/roller/weblogger/ui/core/security/LogoutRedirect.java
 create mode 100644 app/src/main/java/org/apache/roller/weblogger/util/InlineImageData.java
 create mode 100644 app/src/main/java/org/apache/roller/weblogger/util/SecureXmlParsers.java
 create mode 100644 app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/AtomCategories.java
 create mode 100644 app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/AtomCategory.java
 create mode 100644 app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/AtomCollection.java
 create mode 100644 app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/AtomConstants.java
 create mode 100644 app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/AtomContent.java
 create mode 100644 app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/AtomEntry.java
 create mode 100644 app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/AtomException.java
 create mode 100644 app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/AtomFeed.java
 copy app/src/main/java/org/apache/roller/weblogger/{ui/core/CmaRollerContext.java => webservices/atomprotocol/AtomLink.java} (50%)
 create mode 100644 app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/AtomMediaResource.java
 copy app/src/main/java/org/apache/roller/weblogger/{ui/core/security/AutoProvision.java => webservices/atomprotocol/AtomNotAuthorizedException.java} (59%)
 copy app/src/main/java/org/apache/roller/weblogger/{ui/core/security/AutoProvision.java => webservices/atomprotocol/AtomNotFoundException.java} (64%)
 copy app/src/main/java/org/apache/roller/weblogger/{ui/core/CmaRollerContext.java => webservices/atomprotocol/AtomPerson.java} (54%)
 create mode 100644 app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/AtomReader.java
 create mode 100644 app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/AtomRequest.java
 copy app/src/main/java/org/apache/roller/weblogger/{ui/core/security/AutoProvision.java => webservices/atomprotocol/AtomServiceDoc.java} (64%)
 copy app/src/main/java/org/apache/roller/weblogger/{ui/core/CmaRollerContext.java => webservices/atomprotocol/AtomWorkspace.java} (57%)
 create mode 100644 app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/AtomWriter.java
 create mode 100644 app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/CategoryCollection.java
 create mode 100644 app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/CollectionSupport.java
 create mode 100644 app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/CommentCollection.java
 delete mode 100644 app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomRequestImpl.java
 create mode 100644 app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/TemplateCollection.java
 delete mode 100644 app/src/main/resources/propono.properties
 copy app/src/main/webapp/roller-ui/errors/{denied.jsp => 413.jsp} (65%)
 delete mode 100644 app/src/main/webapp/roller-ui/scripts/jquery-2.1.1.min.js
 create mode 100644 app/src/test/java/org/apache/roller/planet/config/PlanetRuntimeConfigTest.java
 create mode 100644 app/src/test/java/org/apache/roller/weblogger/business/themes/WeblogTemplateEditorTest.java
 create mode 100644 app/src/test/java/org/apache/roller/weblogger/planet/ui/PlanetAvailabilityTest.java
 create mode 100644 app/src/test/java/org/apache/roller/weblogger/pojos/wrapper/WeblogCategoryWrapperTest.java
 create mode 100644 app/src/test/java/org/apache/roller/weblogger/pojos/wrapper/WeblogEntryTagWrapperTest.java
 create mode 100644 app/src/test/java/org/apache/roller/weblogger/pojos/wrapper/WrapperPojoConfinementTest.java
 create mode 100644 app/src/test/java/org/apache/roller/weblogger/ui/core/security/LogoutRedirectTest.java
 create mode 100644 app/src/test/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalConfigAtomPubLimitTest.java
 create mode 100644 app/src/test/java/org/apache/roller/weblogger/ui/struts2/editor/EntryEditInlineImagesTest.java
 create mode 100644 app/src/test/java/org/apache/roller/weblogger/ui/struts2/editor/FolderEditSaveTest.java
 create mode 100644 app/src/test/java/org/apache/roller/weblogger/util/HTMLSanitizerInlineImageTest.java
 create mode 100644 app/src/test/java/org/apache/roller/weblogger/util/InlineImageDataTest.java
 create mode 100644 app/src/test/java/org/apache/roller/weblogger/util/SecureXmlParsersTest.java
 create mode 100644 app/src/test/java/org/apache/roller/weblogger/util/TagCharactersTest.java
 create mode 100644 app/src/test/java/org/apache/roller/weblogger/webservices/atomprotocol/AtomEntryTest.java
 create mode 100644 app/src/test/java/org/apache/roller/weblogger/webservices/atomprotocol/AtomExceptionTest.java
 create mode 100644 app/src/test/java/org/apache/roller/weblogger/webservices/atomprotocol/AtomPubDocExamplesTest.java
 create mode 100644 app/src/test/java/org/apache/roller/weblogger/webservices/atomprotocol/AtomReaderTest.java
 create mode 100644 app/src/test/java/org/apache/roller/weblogger/webservices/atomprotocol/AtomRequestTest.java
 create mode 100644 app/src/test/java/org/apache/roller/weblogger/webservices/atomprotocol/AtomSchemaValidationTest.java
 create mode 100644 app/src/test/java/org/apache/roller/weblogger/webservices/atomprotocol/AtomWriterTest.java
 create mode 100644 app/src/test/java/org/apache/roller/weblogger/webservices/atomprotocol/MediaCollectionPathTest.java
 create mode 100644 app/src/test/java/org/apache/roller/weblogger/webservices/atomprotocol/RelaxNgValidator.java
 create mode 100644 app/src/test/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomManagementTest.java
 create mode 100644 app/src/test/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomProtocolTest.java
 create mode 100644 app/src/test/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomServletTest.java
 create mode 100644 app/src/test/resources/atompub/app-service.rnc
 create mode 100644 app/src/test/resources/atompub/atom.rnc
 create mode 100644 docs/atompub/examples/README.txt
 create mode 100644 docs/atompub/examples/categories.xml
 create mode 100644 docs/atompub/examples/category-entry.xml
 create mode 100644 docs/atompub/examples/category-request.xml
 create mode 100644 docs/atompub/examples/comment-entry.xml
 create mode 100644 docs/atompub/examples/comment-status-request.xml
 create mode 100644 docs/atompub/examples/comments-feed.xml
 create mode 100644 docs/atompub/examples/entries-feed.xml
 create mode 100644 docs/atompub/examples/entry-request.xml
 create mode 100644 docs/atompub/examples/entry-response.xml
 create mode 100644 docs/atompub/examples/media-link-entry.xml
 create mode 100644 docs/atompub/examples/service.xml
 create mode 100644 docs/atompub/examples/template-entry.xml
 create mode 100644 docs/atompub/examples/template-request.xml
 create mode 100644 docs/atompub/roller-atompub.rnc
 create mode 100644 docs/roller-atompub-guide.adoc
 create mode 100644 docs/security-model.md