This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git.
from 70b6677 2.11.0-M7-git-11 : add rel="noreferrer" to target="_blank"
links
new 8f6d986 fix sonar issue + apply intellij suggested format and fixes
new 781f35e fix sonar issue
new 9b40c19 JSPWIKI-303: move AdminBeanManager to o.a.w.ui.admin package,
as it is not intended for the public api
new dfd502e JSPWIKI-303: move PluginManager back to o.a.w.plugin package
new 6abfe2b JSPWIKI-303: move FilterManager back to o.a.w.filters package
new 5a95f81 remove empty o.a.w.api.engine package
new f0205f6 rename + extract interface on (Base)ModuleManager
new ff5b226 fix compilation problems
new e07c798 DefaultPageManager doesn't need to be a module manager
new 11ee436 decouple DefaultAdminBeanManager from specific module manager
implementations
new 7fc2476 move PrincipalComparator to the util module, with all the
other non-jspwiki specific comparators
new 67b36ce use PrincipalComparator on #compareTo( Principal ) method
new 2190448 replace lambda with method reference while streaming managers
new 127c520 fix jsp compilation issues derived from moving the
AdminBeanManager interface to another package
new dabf3e1 use StandardCharsets.UTF_8 constant instead of hardcoded
'UTF-8'
new a73d747 use Engine instead of WikiEngine on some javadocs
new fdfd05d add missing license
new e688714 move isIPV4Address( String ) method from WikiSession to
HttpUtil
new 442402d JSPWIKI-303: extract o.a.w.api.core.Session from
o.a.w.WikiSession
new f6fe504 JSPWIKI-303: begin to use Session instead of WikiSession (1)
new dc3e9f2 JSPWIKI-303: begin to use Session instead of WikiSession (2)
new 3357041 JSPWIKI-303: begin to use Session instead of WikiSession (3)
new a205250 JSPWIKI-303: begin to use public API (Engine, Session) on JSPs
new 78cee04 throw ProviderException instead of InternalWikiException
new aec837e JSPWIKI-303: use Session instead of WikiSession (1)
new 8487770 JSPWIKI-303: use Session instead of WikiSession (2)
new 8f25151 update cargo plugin to 1.7.10 and bump tomcat version from
8.5.51 to 9.0.31
new b266b55 use repo1.maven.org instead of search.maven.org, as the
latter redirects to the former, to download appbundler
new 875552d update tomcat server files from 8.5 to 9.0
new 91ff2a3 update launchers to be based on tomcat 9.0.31
new 0191302 update README.md to recommend Tomcat 9.x + link to
configuration needed to run JSPWiki on Tomcat 8.x
new 943704d provide boolean isImageInlining and inlineImagePatterns to
LinkParsingOperations#isImageLink(..)
new dc4b44f move test to its testee package
new 0db9623 JSPWIKI-303: promote o.a.w.Release to o.a.w.api package
new c0aa772 2.11.0-M7-git-12
The 35 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:
ChangeLog.md | 13 +
README.md | 7 +-
.../java/org/apache/wiki/TranslationsCheck.java | 46 +-
.../src/main/java/org/apache/wiki/WikiContext.java | 18 +-
.../src/main/java/org/apache/wiki/WikiEngine.java | 20 +-
.../src/main/java/org/apache/wiki/WikiSession.java | 587 +++++++--------------
.../java/org/apache/wiki/{ => api}/Release.java | 8 +-
.../main/java/org/apache/wiki/api/core/Engine.java | 12 +-
.../java/org/apache/wiki/api/core/Session.java | 248 +++++++++
.../java/org/apache/wiki/api/engine/package.html | 36 --
.../apache/wiki/api/plugin/ParserStagePlugin.java | 2 +-
.../apache/wiki/attachment/AttachmentServlet.java | 3 +-
.../apache/wiki/auth/AuthenticationManager.java | 22 +-
.../org/apache/wiki/auth/AuthorizationManager.java | 32 +-
.../main/java/org/apache/wiki/auth/Authorizer.java | 8 +-
.../wiki/auth/DefaultAuthenticationManager.java | 23 +-
.../wiki/auth/DefaultAuthorizationManager.java | 9 +-
.../org/apache/wiki/auth/DefaultUserManager.java | 17 +-
.../org/apache/wiki/auth/SecurityVerifier.java | 6 +-
.../java/org/apache/wiki/auth/SessionMonitor.java | 135 +++--
.../java/org/apache/wiki/auth/UserManager.java | 26 +-
.../java/org/apache/wiki/auth/WikiPrincipal.java | 114 ++--
.../apache/wiki/auth/acl/DefaultAclManager.java | 2 +-
.../wiki/auth/authorize/DefaultGroupManager.java | 8 +-
.../java/org/apache/wiki/auth/authorize/Group.java | 151 +++---
.../apache/wiki/auth/authorize/GroupManager.java | 18 +-
.../auth/authorize/WebContainerAuthorizer.java | 18 +-
.../login/CookieAuthenticationLoginModule.java | 2 +-
.../apache/wiki/auth/user/DefaultUserProfile.java | 3 +-
.../org/apache/wiki/auth/user/UserDatabase.java | 2 +-
.../org/apache/wiki/auth/user/UserProfile.java | 3 +-
.../org/apache/wiki/auth/user/XMLUserDatabase.java | 417 +++++----------
.../java/org/apache/wiki/event/WikiPageEvent.java | 24 +-
.../org/apache/wiki/event/WikiSecurityEvent.java | 4 +-
.../apache/wiki/filters/DefaultFilterManager.java | 29 +-
.../{api/engine => filters}/FilterManager.java | 30 +-
.../java/org/apache/wiki/filters/SpamFilter.java | 42 +-
.../java/org/apache/wiki/forms/FormOutput.java | 2 +-
.../{ModuleManager.java => BaseModuleManager.java} | 30 +-
.../org/apache/wiki/modules/ModuleManager.java | 82 +--
.../org/apache/wiki/modules/WikiModuleInfo.java | 28 +-
.../org/apache/wiki/pages/DefaultPageManager.java | 44 +-
.../apache/wiki/parser/JSPWikiMarkupParser.java | 169 ++----
.../apache/wiki/parser/LinkParsingOperations.java | 23 +-
.../java/org/apache/wiki/parser/PluginContent.java | 2 +-
.../apache/wiki/plugin/AbstractReferralPlugin.java | 3 +-
.../apache/wiki/plugin/DefaultPluginManager.java | 7 +-
.../main/java/org/apache/wiki/plugin/Groups.java | 5 +-
.../java/org/apache/wiki/plugin/InsertPage.java | 11 +-
.../wiki/{api/engine => plugin}/PluginManager.java | 110 ++--
.../org/apache/wiki/plugin/SessionsPlugin.java | 81 ++-
.../org/apache/wiki/plugin/TableOfContents.java | 2 +-
.../wiki/providers/AbstractFileProvider.java | 3 +-
.../wiki/render/DefaultRenderingManager.java | 2 +-
.../org/apache/wiki/render/RenderingManager.java | 6 +-
.../main/java/org/apache/wiki/rss/AtomFeed.java | 16 +-
.../main/java/org/apache/wiki/rss/RSS20Feed.java | 2 +-
.../java/org/apache/wiki/rss/RSSGenerator.java | 3 +-
.../apache/wiki/search/BasicSearchProvider.java | 15 +-
.../java/org/apache/wiki/search/SearchMatcher.java | 11 +-
.../org/apache/wiki/tags/AdminBeanIteratorTag.java | 2 +-
.../java/org/apache/wiki/tags/MessagesTag.java | 77 ++-
.../java/org/apache/wiki/tags/PermissionTag.java | 4 +-
.../main/java/org/apache/wiki/tags/PluginTag.java | 6 +-
.../java/org/apache/wiki/tags/UserCheckTag.java | 49 +-
.../java/org/apache/wiki/tags/UserNameTag.java | 3 +-
.../java/org/apache/wiki/tags/UserProfileTag.java | 46 +-
.../wiki/tasks/pages/PreSaveWikiPageTask.java | 2 +-
.../apache/wiki/tasks/pages/SaveWikiPageTask.java | 2 +-
.../org/apache/wiki/ui/DefaultEditorManager.java | 4 +-
.../org/apache/wiki/ui/DefaultTemplateManager.java | 4 +-
.../java/org/apache/wiki/ui/EditorManager.java | 14 +-
.../java/org/apache/wiki/ui/InputValidator.java | 4 +-
.../main/java/org/apache/wiki/ui/Installer.java | 3 +-
.../java/org/apache/wiki/ui/TemplateManager.java | 14 +-
.../org/apache/wiki/ui/WikiRequestWrapper.java | 25 +-
.../java/org/apache/wiki/ui/WikiServletFilter.java | 19 +-
.../{api/engine => ui/admin}/AdminBeanManager.java | 7 +-
.../wiki/ui/admin/DefaultAdminBeanManager.java | 15 +-
.../org/apache/wiki/ui/admin/beans/CoreBean.java | 31 +-
.../org/apache/wiki/ui/admin/beans/FilterBean.java | 8 +-
.../org/apache/wiki/ui/admin/beans/ModuleBean.java | 2 +-
.../org/apache/wiki/ui/admin/beans/PluginBean.java | 8 +-
.../wiki/ui/admin/beans/SearchManagerBean.java | 46 +-
.../org/apache/wiki/ui/admin/beans/UserBean.java | 110 ++--
.../java/org/apache/wiki/url/URLConstructor.java | 10 +-
.../wiki/variables/DefaultVariableManager.java | 10 +-
.../org/apache/wiki/workflow/DecisionQueue.java | 112 ++--
.../wiki/workflow/DefaultWorkflowManager.java | 4 +-
.../org/apache/wiki/workflow/WorkflowManager.java | 6 +-
.../org/apache/wiki/xmlrpc/MetaWeblogHandler.java | 3 +-
.../src/main/resources/ini/classmappings.xml | 6 +-
.../src/test/java/org/apache/wiki/ReleaseTest.java | 156 ------
.../src/test/java/org/apache/wiki/TestEngine.java | 49 +-
.../test/java/org/apache/wiki/WikiEngineTest.java | 11 +
.../test/java/org/apache/wiki/WikiSessionTest.java | 108 ++--
.../test/java/org/apache/wiki/api/ReleaseTest.java | 133 +++++
.../wiki/auth/AuthenticationManagerTest.java | 21 +-
.../apache/wiki/auth/AuthorizationManagerTest.java | 76 +--
.../java/org/apache/wiki/auth/TestAuthorizer.java | 14 +-
.../java/org/apache/wiki/auth/UserManagerTest.java | 14 +-
.../java/org/apache/wiki/auth/acl/AclImplTest.java | 79 +--
.../wiki/auth/authorize/GroupManagerTest.java | 21 +-
.../wiki/filters/DefaultFilterManagerTest.java | 1 -
.../java/org/apache/wiki/plugin/IfPluginTest.java | 28 +-
.../org/apache/wiki/plugin/PageViewPluginTest.java | 1 -
.../wiki/plugin/RecentChangesPluginTest.java | 14 +-
.../wiki/plugin/ReferringPagesPluginTest.java | 40 +-
.../plugin/ReferringUndefinedPagesPluginTest.java | 14 +-
.../wiki/plugin/UndefinedPagesPluginTest.java | 1 -
.../apache/wiki/workflow/ApprovalWorkflowTest.java | 2 +-
.../apache/wiki/workflow/DecisionQueueTest.java | 35 +-
.../wiki/markdown/MarkdownForJSPWikiExtension.java | 15 +-
.../ExternalLinkAttributeProviderState.java | 15 +-
.../InterWikiLinkAttributeProviderState.java | 14 +-
.../JSPWikiLinkAttributeProvider.java | 24 +-
.../JSPWikiLinkAttributeProviderFactory.java | 16 +-
.../LocalLinkAttributeProviderState.java | 14 +-
.../ExternalLinkNodePostProcessorState.java | 13 +-
.../InterWikiLinkNodePostProcessorState.java | 13 +-
.../JSPWikiLinkNodePostProcessor.java | 20 +-
.../JSPWikiNodePostProcessorFactory.java | 14 +-
.../LocalLinkNodePostProcessorState.java | 13 +-
.../wiki/parser/markdown/MarkdownDocument.java | 6 +-
.../wiki/parser/markdown/MarkdownParser.java | 2 +-
.../wiki/render/markdown/MarkdownRenderer.java | 17 +-
.../{ => markdown}/MarkdownRendererTest.java | 33 +-
jspwiki-portable/build.xml | 2 +-
.../tomcat/woas.app/Contents/Java/bootstrap.jar | Bin 35204 -> 35071 bytes
.../tomcat/woas.app/Contents/Java/tomcat-juli.jar | Bin 49783 -> 47886 bytes
.../src/overlay/launchers/tomcat/woas.exe | Bin 3500245 -> 3564962
bytes
.../src/overlay/tomcat/conf/catalina.properties | 48 +-
.../src/overlay/tomcat/conf/server.xml | 87 ++-
jspwiki-portable/src/overlay/tomcat/conf/web.xml | 50 +-
.../main/java/org/apache/wiki/util/HttpUtil.java | 126 +++--
.../util/comparators}/PrincipalComparator.java | 21 +-
.../java/org/apache/wiki/util/HttpUtilTest.java | 50 ++
.../util/comparators/PrincipalComparatorTest.java | 32 +-
jspwiki-war/src/main/webapp/Captcha.jsp | 7 +-
jspwiki-war/src/main/webapp/Comment.jsp | 3 +-
jspwiki-war/src/main/webapp/CookieError.jsp | 6 +-
jspwiki-war/src/main/webapp/Delete.jsp | 30 +-
jspwiki-war/src/main/webapp/DeleteGroup.jsp | 10 +-
jspwiki-war/src/main/webapp/Diff.jsp | 22 +-
jspwiki-war/src/main/webapp/Edit.jsp | 30 +-
jspwiki-war/src/main/webapp/EditGroup.jsp | 15 +-
jspwiki-war/src/main/webapp/Error.jsp | 3 +-
jspwiki-war/src/main/webapp/Group.jsp | 26 +-
jspwiki-war/src/main/webapp/Install.jsp | 8 +-
jspwiki-war/src/main/webapp/Login.jsp | 14 +-
jspwiki-war/src/main/webapp/LoginForm.jsp | 6 +-
jspwiki-war/src/main/webapp/Logout.jsp | 8 +-
jspwiki-war/src/main/webapp/LostPassword.jsp | 16 +-
jspwiki-war/src/main/webapp/Message.jsp | 6 +-
jspwiki-war/src/main/webapp/NewBlogEntry.jsp | 3 +-
jspwiki-war/src/main/webapp/NewGroup.jsp | 21 +-
jspwiki-war/src/main/webapp/PageInfo.jsp | 11 +-
jspwiki-war/src/main/webapp/PageModified.jsp | 22 +-
jspwiki-war/src/main/webapp/Preview.jsp | 21 +-
jspwiki-war/src/main/webapp/Rename.jsp | 32 +-
jspwiki-war/src/main/webapp/Search.jsp | 31 +-
jspwiki-war/src/main/webapp/SisterSites.jsp | 17 +-
jspwiki-war/src/main/webapp/Upload.jsp | 9 +-
jspwiki-war/src/main/webapp/UserPreferences.jsp | 21 +-
jspwiki-war/src/main/webapp/Wiki.jsp | 13 +-
jspwiki-war/src/main/webapp/Workflow.jsp | 22 +-
jspwiki-war/src/main/webapp/XHRHtml2Markup.jsp | 6 +-
.../src/main/webapp/admin/SecurityConfig.jsp | 16 +-
jspwiki-war/src/main/webapp/rss.jsp | 49 +-
.../main/webapp/templates/210/EditGroupContent.jsp | 4 +-
.../src/main/webapp/templates/210/Favorites.jsp | 3 +-
.../src/main/webapp/templates/210/Footer.jsp | 1 +
.../src/main/webapp/templates/210/GroupContent.jsp | 2 +-
.../src/main/webapp/templates/210/GroupTab.jsp | 4 +-
.../main/webapp/templates/210/NewGroupContent.jsp | 2 +-
.../webapp/templates/210/admin/AdminTemplate.jsp | 3 +-
.../webapp/templates/default/EditGroupContent.jsp | 6 +-
.../src/main/webapp/templates/default/Footer.jsp | 2 +-
.../src/main/webapp/templates/default/GroupTab.jsp | 5 +-
.../templates/default/admin/AdminTemplate.jsp | 3 +-
pom.xml | 10 +-
181 files changed, 2611 insertions(+), 2859 deletions(-)
rename jspwiki-main/src/main/java/org/apache/wiki/{ => api}/Release.java (97%)
create mode 100644
jspwiki-main/src/main/java/org/apache/wiki/api/core/Session.java
delete mode 100644
jspwiki-main/src/main/java/org/apache/wiki/api/engine/package.html
rename jspwiki-main/src/main/java/org/apache/wiki/{api/engine =>
filters}/FilterManager.java (84%)
copy jspwiki-main/src/main/java/org/apache/wiki/modules/{ModuleManager.java =>
BaseModuleManager.java} (67%)
rename jspwiki-main/src/main/java/org/apache/wiki/{api/engine =>
plugin}/PluginManager.java (54%)
rename jspwiki-main/src/main/java/org/apache/wiki/{api/engine =>
ui/admin}/AdminBeanManager.java (95%)
delete mode 100644 jspwiki-main/src/test/java/org/apache/wiki/ReleaseTest.java
create mode 100644
jspwiki-main/src/test/java/org/apache/wiki/api/ReleaseTest.java
rename jspwiki-markdown/src/test/java/org/apache/wiki/render/{ =>
markdown}/MarkdownRendererTest.java (93%)
mode change 100755 => 100644
rename {jspwiki-main/src/main/java/org/apache/wiki/auth =>
jspwiki-util/src/main/java/org/apache/wiki/util/comparators}/PrincipalComparator.java
(77%)
create mode 100644
jspwiki-util/src/test/java/org/apache/wiki/util/HttpUtilTest.java
copy jspwiki-main/src/test/java/org/apache/wiki/parser/MarkupParserTest.java
=>
jspwiki-util/src/test/java/org/apache/wiki/util/comparators/PrincipalComparatorTest.java
(54%)
