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 0cd2b29 fix date
add f3b3c69 lower log noise
add 34edc65 Dependency upgrades:
add d89ee20 Tika 2.0.0 upgrade: replace removed properties, as per
TIKA-1974
add 75a5d57 JSPWIKI-795: Replace log4j with log4j2 on
jspwiki-210-adapters module
add 6cde02e JSPWIKI-795: Replace log4j with log4j2 on jspwiki-api module
add 6653fd0 JSPWIKI-795: Replace log4j with log4j2 on jspwiki-event module
add a91e4ca JSPWIKI-795: Replace log4j with log4j2 on
jspwiki-kendra-search-provider module
add 4731396 JSPWIKI-795: Replace log4j with log4j2 on jspwiki-main module
add 3c9639b JSPWIKI-795: Replace log4j with log4j2 on jspwiki-markdown
module
add a4073f2 JSPWIKI-795: Replace log4j with log4j2 on
jspwiki-tika-search-provider module
add bbb3a6f JSPWIKI-795: Replace log4j with log4j2 on jspwiki-util module
add bb91035 JSPWIKI-795: Replace log4j with log4j2 on jspwiki-war module
add b9778b3 JSPWIKI-795: replace log config file with log4j2 equivalent
on Docker image
add d309b0c Take into account System env and Syste props on
PropertyReader.loadWebAppProps( ServletContext )
add 6c42bd7 skipTests skips tests execution, whereas maven.test.skip
skips test execution & compilation, thus, is a little bit faster
add 4e7e9af fix ENV jspwiki_frontPage name
add 576bbb0 2.11.0-git-07
No new revisions were added by this update.
Summary of changes:
ChangeLog.md | 27 +++++++-
Dockerfile | 4 +-
docker-files/log4j.properties | 24 -------
docker-files/log4j2.properties | 39 +++++++++++
.../apache/wiki/api/filters/BasicPageFilter.java | 8 +--
.../org/apache/wiki/api/plugin/WikiPlugin.java | 8 +--
.../providers/WikiAttachmentAdapterProvider.java | 5 +-
.../wiki/providers/WikiPageAdapterProvider.java | 5 +-
.../src/main/java/org/apache/wiki/api/Release.java | 2 +-
.../main/java/org/apache/wiki/api/core/Engine.java | 14 ++--
.../wiki/api/filters/FilterSupportOperations.java | 5 +-
jspwiki-event/pom.xml | 5 --
.../org/apache/wiki/event/WikiEventManager.java | 5 +-
.../org/apache/wiki/event/WikiSecurityEvent.java | 13 ++--
.../wiki/search/kendra/KendraSearchProvider.java | 10 +--
jspwiki-main/pom.xml | 5 --
.../src/main/java/org/apache/wiki/WatchDog.java | 5 +-
.../java/org/apache/wiki/WikiBackgroundThread.java | 5 +-
.../src/main/java/org/apache/wiki/WikiContext.java | 5 +-
.../src/main/java/org/apache/wiki/WikiEngine.java | 5 +-
.../src/main/java/org/apache/wiki/WikiServlet.java | 5 +-
.../src/main/java/org/apache/wiki/WikiSession.java | 19 +++---
.../wiki/ajax/WikiAjaxDispatcherServlet.java | 5 +-
.../apache/wiki/attachment/AttachmentManager.java | 12 ++--
.../apache/wiki/attachment/AttachmentServlet.java | 5 +-
.../wiki/attachment/DefaultAttachmentManager.java | 5 +-
.../wiki/auth/DefaultAuthenticationManager.java | 7 +-
.../wiki/auth/DefaultAuthorizationManager.java | 5 +-
.../org/apache/wiki/auth/DefaultUserManager.java | 5 +-
.../org/apache/wiki/auth/SecurityVerifier.java | 5 +-
.../java/org/apache/wiki/auth/SessionMonitor.java | 5 +-
.../apache/wiki/auth/acl/DefaultAclManager.java | 5 +-
.../wiki/auth/authorize/DefaultGroupManager.java | 5 +-
.../wiki/auth/authorize/JDBCGroupDatabase.java | 5 +-
.../auth/authorize/WebContainerAuthorizer.java | 5 +-
.../wiki/auth/authorize/XMLGroupDatabase.java | 21 +++---
.../wiki/auth/login/AbstractLoginModule.java | 5 +-
.../wiki/auth/login/AnonymousLoginModule.java | 15 ++---
.../auth/login/CookieAssertionLoginModule.java | 5 +-
.../login/CookieAuthenticationLoginModule.java | 5 +-
.../wiki/auth/login/UserDatabaseLoginModule.java | 5 +-
.../wiki/auth/login/WebContainerLoginModule.java | 20 +++---
.../wiki/auth/user/AbstractUserDatabase.java | 5 +-
.../apache/wiki/content/DefaultPageRenamer.java | 5 +-
.../apache/wiki/diff/ContextualDiffProvider.java | 5 +-
.../apache/wiki/diff/DefaultDifferenceManager.java | 5 +-
.../org/apache/wiki/diff/ExternalDiffProvider.java | 5 +-
.../apache/wiki/diff/TraditionalDiffProvider.java | 5 +-
.../java/org/apache/wiki/filters/CreoleFilter.java | 5 +-
.../apache/wiki/filters/DefaultFilterManager.java | 5 +-
.../apache/wiki/filters/PingWeblogsComFilter.java | 5 +-
.../org/apache/wiki/filters/ProfanityFilter.java | 5 +-
.../java/org/apache/wiki/filters/SpamFilter.java | 7 +-
.../main/java/org/apache/wiki/forms/FormOpen.java | 5 +-
.../org/apache/wiki/management/SimpleMBean.java | 75 +++++++---------------
.../org/apache/wiki/pages/DefaultPageManager.java | 5 +-
.../java/org/apache/wiki/pages/PageSorter.java | 5 +-
.../org/apache/wiki/pages/PageTimeComparator.java | 5 +-
.../apache/wiki/parser/JSPWikiMarkupParser.java | 5 +-
.../java/org/apache/wiki/parser/LinkParser.java | 5 +-
.../apache/wiki/parser/LinkParsingOperations.java | 5 +-
.../java/org/apache/wiki/parser/MarkupParser.java | 5 +-
.../java/org/apache/wiki/parser/PluginContent.java | 5 +-
.../apache/wiki/plugin/AbstractReferralPlugin.java | 5 +-
.../org/apache/wiki/plugin/BugReportHandler.java | 5 +-
.../main/java/org/apache/wiki/plugin/Counter.java | 2 +-
.../org/apache/wiki/plugin/CurrentTimePlugin.java | 2 +-
.../apache/wiki/plugin/DefaultPluginManager.java | 5 +-
.../main/java/org/apache/wiki/plugin/Denounce.java | 5 +-
.../java/org/apache/wiki/plugin/IndexPlugin.java | 5 +-
.../org/apache/wiki/plugin/PageViewPlugin.java | 5 +-
.../apache/wiki/plugin/RecentChangesPlugin.java | 5 +-
.../apache/wiki/plugin/ReferredPagesPlugin.java | 5 +-
.../apache/wiki/plugin/ReferringPagesPlugin.java | 5 +-
.../main/java/org/apache/wiki/plugin/Search.java | 5 +-
.../org/apache/wiki/plugin/TableOfContents.java | 5 +-
.../org/apache/wiki/plugin/WeblogEntryPlugin.java | 5 +-
.../java/org/apache/wiki/plugin/WeblogPlugin.java | 5 +-
.../org/apache/wiki/preferences/Preferences.java | 5 +-
.../wiki/providers/AbstractFileProvider.java | 5 +-
.../wiki/providers/BasicAttachmentProvider.java | 5 +-
.../wiki/providers/CachingAttachmentProvider.java | 5 +-
.../org/apache/wiki/providers/CachingProvider.java | 5 +-
.../apache/wiki/providers/FileSystemProvider.java | 5 +-
.../wiki/providers/VersioningFileProvider.java | 15 +++--
.../wiki/references/DefaultReferenceManager.java | 5 +-
.../wiki/render/DefaultRenderingManager.java | 5 +-
.../org/apache/wiki/render/RenderingManager.java | 4 +-
.../org/apache/wiki/rpc/atom/AtomAPIServlet.java | 5 +-
.../org/apache/wiki/rss/DefaultRSSGenerator.java | 5 +-
.../main/java/org/apache/wiki/rss/RSSThread.java | 5 +-
.../apache/wiki/search/BasicSearchProvider.java | 5 +-
.../apache/wiki/search/DefaultSearchManager.java | 5 +-
.../apache/wiki/search/LuceneSearchProvider.java | 5 +-
.../apache/wiki/tags/AttachmentsIteratorTag.java | 5 +-
.../java/org/apache/wiki/tags/BreadcrumbsTag.java | 5 +-
.../java/org/apache/wiki/tags/CalendarTag.java | 5 +-
.../main/java/org/apache/wiki/tags/ContentTag.java | 5 +-
.../main/java/org/apache/wiki/tags/CookieTag.java | 5 +-
.../main/java/org/apache/wiki/tags/EditorTag.java | 5 +-
.../org/apache/wiki/tags/HasAttachmentsTag.java | 5 +-
.../org/apache/wiki/tags/HistoryIteratorTag.java | 5 +-
.../main/java/org/apache/wiki/tags/IncludeTag.java | 5 +-
.../java/org/apache/wiki/tags/InsertDiffTag.java | 5 +-
.../java/org/apache/wiki/tags/InsertPageTag.java | 5 +-
.../java/org/apache/wiki/tags/IteratorTag.java | 5 +-
.../main/java/org/apache/wiki/tags/LinkTag.java | 5 +-
.../java/org/apache/wiki/tags/PageSizeTag.java | 5 +-
.../main/java/org/apache/wiki/tags/PluginTag.java | 5 +-
.../apache/wiki/tags/SearchResultIteratorTag.java | 5 +-
.../java/org/apache/wiki/tags/TranslateTag.java | 5 +-
.../java/org/apache/wiki/tags/WikiBodyTag.java | 5 +-
.../java/org/apache/wiki/tags/WikiTagBase.java | 5 +-
.../wiki/tasks/auth/SaveUserProfileTask.java | 5 +-
.../org/apache/wiki/ui/DefaultCommandResolver.java | 5 +-
.../org/apache/wiki/ui/DefaultEditorManager.java | 5 +-
.../org/apache/wiki/ui/DefaultTemplateManager.java | 5 +-
.../java/org/apache/wiki/ui/TemplateManager.java | 4 +-
.../java/org/apache/wiki/ui/WikiJSPFilter.java | 27 +++-----
.../java/org/apache/wiki/ui/WikiServletFilter.java | 21 +++---
.../wiki/ui/admin/DefaultAdminBeanManager.java | 5 +-
.../wiki/ui/admin/beans/SearchManagerBean.java | 2 +-
.../wiki/ui/progress/DefaultProgressManager.java | 5 +-
.../org/apache/wiki/url/ShortURLConstructor.java | 5 +-
.../wiki/variables/DefaultVariableManager.java | 5 +-
.../wiki/workflow/DefaultWorkflowManager.java | 5 +-
.../org/apache/wiki/xmlrpc/MetaWeblogHandler.java | 5 +-
.../java/org/apache/wiki/xmlrpc/RPCServlet.java | 5 +-
.../src/test/java/org/apache/wiki/HsqlDbUtils.java | 5 +-
.../src/test/java/org/apache/wiki/TestEngine.java | 5 +-
.../java/org/apache/wiki/web/TestContainer.java | 5 +-
jspwiki-markdown/pom.xml | 5 --
.../AccessRuleLinkNodePostProcessorState.java | 5 +-
.../InterWikiLinkNodePostProcessorState.java | 5 +-
.../MetadataLinkNodePostProcessorState.java | 5 +-
.../PluginLinkNodePostProcessorState.java | 5 +-
jspwiki-tika-searchprovider/pom.xml | 2 +-
.../wiki/search/tika/TikaSearchProvider.java | 12 ++--
jspwiki-util/pom.xml | 5 --
.../main/java/org/apache/wiki/util/ClassUtil.java | 5 +-
.../main/java/org/apache/wiki/util/FileUtil.java | 5 +-
.../main/java/org/apache/wiki/util/HttpUtil.java | 5 +-
.../main/java/org/apache/wiki/util/MailUtil.java | 19 ++----
.../java/org/apache/wiki/util/PropertyReader.java | 64 +++++++++++++-----
.../main/java/org/apache/wiki/util/XmlUtil.java | 5 +-
.../org/apache/wiki/util/PropertyReaderTest.java | 14 ++++
jspwiki-war/src/main/webapp/Captcha.jsp | 5 +-
jspwiki-war/src/main/webapp/Comment.jsp | 5 +-
jspwiki-war/src/main/webapp/Delete.jsp | 5 +-
jspwiki-war/src/main/webapp/DeleteGroup.jsp | 5 +-
jspwiki-war/src/main/webapp/Diff.jsp | 5 +-
jspwiki-war/src/main/webapp/Edit.jsp | 5 +-
jspwiki-war/src/main/webapp/EditGroup.jsp | 5 +-
jspwiki-war/src/main/webapp/Error.jsp | 5 +-
jspwiki-war/src/main/webapp/Group.jsp | 5 +-
jspwiki-war/src/main/webapp/Install.jsp | 5 +-
jspwiki-war/src/main/webapp/Login.jsp | 5 +-
jspwiki-war/src/main/webapp/LoginForm.jsp | 5 +-
jspwiki-war/src/main/webapp/LostPassword.jsp | 5 +-
jspwiki-war/src/main/webapp/Message.jsp | 5 +-
jspwiki-war/src/main/webapp/NewBlogEntry.jsp | 5 +-
jspwiki-war/src/main/webapp/NewGroup.jsp | 5 +-
jspwiki-war/src/main/webapp/PageInfo.jsp | 5 +-
jspwiki-war/src/main/webapp/PageModified.jsp | 5 +-
jspwiki-war/src/main/webapp/Preview.jsp | 5 +-
jspwiki-war/src/main/webapp/Rename.jsp | 5 +-
jspwiki-war/src/main/webapp/Search.jsp | 5 +-
jspwiki-war/src/main/webapp/SisterSites.jsp | 5 +-
jspwiki-war/src/main/webapp/Upload.jsp | 5 +-
jspwiki-war/src/main/webapp/UserPreferences.jsp | 5 +-
jspwiki-war/src/main/webapp/Wiki.jsp | 5 +-
jspwiki-war/src/main/webapp/Workflow.jsp | 5 +-
jspwiki-war/src/main/webapp/XHRHtml2Markup.jsp | 5 +-
jspwiki-war/src/main/webapp/admin/Admin.jsp | 5 +-
.../src/main/webapp/admin/SecurityConfig.jsp | 5 +-
jspwiki-war/src/main/webapp/rss.jsp | 5 +-
.../main/webapp/templates/210/EditGroupContent.jsp | 5 +-
.../src/main/webapp/templates/210/GroupContent.jsp | 5 +-
.../src/main/webapp/templates/210/GroupTab.jsp | 3 +-
.../main/webapp/templates/default/AJAXPreview.jsp | 5 +-
.../main/webapp/templates/default/AJAXSearch.jsp | 5 +-
.../webapp/templates/default/EditGroupContent.jsp | 3 +-
.../src/main/webapp/templates/default/GroupTab.jsp | 3 +-
pom.xml | 8 +--
184 files changed, 718 insertions(+), 557 deletions(-)
delete mode 100644 docker-files/log4j.properties
create mode 100644 docker-files/log4j2.properties
