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 cf23ad6 2.11.0-M7-git-08
new 52d21f1 JSPWIKI-120: add adapt( Class< E > cls ) method to Engine
new 205b397 JSPWIKI-120: rename + extract interface from AttachmentManager
new 6039095 inherit javadoc
new ae99ac7 apply format and fixes suggested by intellij
new 380de2a JSPWIKI-120: rename + extract interface from
AuthenticationManager
new 3e3810d add @SuppressWarnings annotation to E Engine#adapt( Class< E
> )
new 1cceed4 JSPWIKI-120: promote
DefaultAuthenticationManager#findConfigFile( Engine, String ) to
Engine#findConfigFile( String ) as default method
new f14bedc remove old references to AuthenticationManager on Engine
new 2e4934a JSPWIKI-120: remove Engine#getCurrentWatchDog() use
WatchDog.getCurrentWathDog( Engine ) instead
new 1860484 JSPWIKI-120: remove Engine#getCurrentWatchDog() use
WatchDog.getCurrentWathDog( Engine ) instead
new 05eec06 add initialize( Engine, Properties ) to AuthenticationManager
new df5e6db WikiEngine -> Engine
new ae43c07 class javadocs
new f1b62ab JSPWIKI-120: rename + extract interface from
AuthorizationManager
new 11a0ada JSPWIKI-120: rename + extract interface from UserManager
new 79af4e4 use Engine instead of WikiEngine
new dc5168f translate WatchDog changes to JSPs
new dbee4c2 Use Engine instead of WikiEngine in SecurityVerifier +
Extract DummyUserDatabase to its own class
new 4344cfb use Engine instead of WikiEngine on WikiPage
new d03a5c7 promote a couple of methods more from
DefaultAuthorizationManager to AuthorizationManager
new d3710e0 JSPWIKI-120: use Engine instead of WikiEngine on Attachment,
SessionMonitor, WikiContext and WikiSession
new 43bf182 JSPWIKI-120: WikiProvider#initialize receives an Engine
instead of a WikiEngine
new db20d0e JSPWIKI-120: make callback handlers use Engine instead of
WikiEngine
new bbac3d4 JSPWIKI-120: propagate WikiContext#getEngine() now returns
Engine instead of WikiEngine (1)
new 5ea8be0 JSPWIKI-120: propagate WikiContext#getEngine() now returns
Engine instead of WikiEngine (2)
new 25f87fd JSPWIKI-120: propagate WikiContext#getEngine() now returns
Engine instead of WikiEngine (3)
new ab518d9 JSPWIKI-120: propagate WikiContext#getEngine() now returns
Engine instead of WikiEngine (4)
new 1433993 JSPWIKI-120: propagate WikiContext#getEngine() now returns
Engine instead of WikiEngine (5)
new e9f724f JSPWIKI-120: propagate WikiContext#getEngine() now returns
Engine instead of WikiEngine (6)
new 8d2e5ee JSPWIKI-120: propagate WikiContext#getEngine() now returns
Engine instead of WikiEngine (7)
new 25c9ed0 JSPWIKI-120: propagate WikiContext#getEngine() now returns
Engine instead of WikiEngine (8)
new f44500b JSPWIKI-120: propagate WikiContext#getEngine() now returns
Engine instead of WikiEngine (9)
new 2d9a75b JSPWIKI-120: propagate WikiContext#getEngine() now returns
Engine instead of WikiEngine (10)
new de7c770 JSPWIKI-120: propagate WikiContext#getEngine() now returns
Engine instead of WikiEngine (11)
new 6d6b17c JSPWIKI-120: propagate WikiContext#getEngine() now returns
Engine instead of WikiEngine (12)
new 869dc56 JSPWIKI-120: propagate WikiContext#getEngine() now returns
Engine instead of WikiEngine (and 13)
new 999c443 JSPWIKI-120: rename + extract interface from GroupManager
new b03d0b5 2.11.0-M7-git-09
The 38 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 | 19 +-
.../src/main/java/org/apache/wiki/Release.java | 2 +-
.../src/main/java/org/apache/wiki/WatchDog.java | 150 ++---
.../java/org/apache/wiki/WikiBackgroundThread.java | 11 +-
.../src/main/java/org/apache/wiki/WikiContext.java | 62 +-
.../src/main/java/org/apache/wiki/WikiEngine.java | 17 +-
.../src/main/java/org/apache/wiki/WikiPage.java | 93 ++-
.../main/java/org/apache/wiki/WikiProvider.java | 11 +-
.../src/main/java/org/apache/wiki/WikiSession.java | 31 +-
.../main/java/org/apache/wiki/api/core/Engine.java | 103 ++-
.../java/org/apache/wiki/api/engine/package.html | 2 +-
.../org/apache/wiki/attachment/Attachment.java | 9 +-
.../apache/wiki/attachment/AttachmentManager.java | 505 ++-------------
.../apache/wiki/attachment/AttachmentServlet.java | 60 +-
.../wiki/attachment/DefaultAttachmentManager.java | 348 ++++++++++
.../apache/wiki/auth/AuthenticationManager.java | 674 +++----------------
.../org/apache/wiki/auth/AuthorizationManager.java | 660 ++++---------------
.../main/java/org/apache/wiki/auth/Authorizer.java | 54 +-
.../wiki/auth/DefaultAuthenticationManager.java | 428 +++++++++++++
.../wiki/auth/DefaultAuthorizationManager.java | 392 ++++++++++++
.../org/apache/wiki/auth/DefaultUserManager.java | 482 ++++++++++++++
.../org/apache/wiki/auth/SecurityVerifier.java | 403 +++++-------
.../java/org/apache/wiki/auth/SessionMonitor.java | 73 +--
.../java/org/apache/wiki/auth/UserManager.java | 712 ++-------------------
.../apache/wiki/auth/acl/DefaultAclManager.java | 14 +-
.../wiki/auth/authorize/DefaultGroupManager.java | 398 ++++++++++++
.../apache/wiki/auth/authorize/GroupDatabase.java | 4 +-
.../apache/wiki/auth/authorize/GroupManager.java | 678 +++-----------------
.../wiki/auth/authorize/JDBCGroupDatabase.java | 118 ++--
.../apache/wiki/auth/authorize/WebAuthorizer.java | 20 +-
.../auth/authorize/WebContainerAuthorizer.java | 92 ++-
.../wiki/auth/authorize/XMLGroupDatabase.java | 35 +-
.../login/CookieAuthenticationLoginModule.java | 292 ++++-----
.../auth/login/WebContainerCallbackHandler.java | 50 +-
.../wiki/auth/login/WikiCallbackHandler.java | 78 +--
.../apache/wiki/auth/login/WikiEngineCallback.java | 25 +-
.../wiki/auth/user/AbstractUserDatabase.java | 169 ++---
.../apache/wiki/auth/user/DummyUserDatabase.java | 135 ++++
.../apache/wiki/auth/user/JDBCUserDatabase.java | 143 ++---
.../org/apache/wiki/auth/user/UserDatabase.java | 172 ++---
.../org/apache/wiki/auth/user/XMLUserDatabase.java | 287 ++++-----
.../apache/wiki/content/DefaultPageRenamer.java | 64 +-
.../apache/wiki/diff/ContextualDiffProvider.java | 19 +-
.../apache/wiki/diff/DefaultDifferenceManager.java | 9 +-
.../java/org/apache/wiki/diff/DiffProvider.java | 8 +-
.../org/apache/wiki/diff/ExternalDiffProvider.java | 10 +-
.../apache/wiki/diff/TraditionalDiffProvider.java | 18 +-
.../apache/wiki/filters/PingWeblogsComFilter.java | 11 +-
.../java/org/apache/wiki/filters/SpamFilter.java | 211 +++---
.../java/org/apache/wiki/forms/FormOutput.java | 56 +-
.../org/apache/wiki/pages/DefaultPageManager.java | 30 +-
.../apache/wiki/parser/JSPWikiMarkupParser.java | 259 ++++----
.../apache/wiki/parser/LinkParsingOperations.java | 5 +-
.../java/org/apache/wiki/parser/MarkupParser.java | 4 +-
.../java/org/apache/wiki/parser/PluginContent.java | 15 +-
.../org/apache/wiki/parser/VariableContent.java | 9 +-
.../apache/wiki/plugin/AbstractReferralPlugin.java | 91 ++-
.../org/apache/wiki/plugin/BugReportHandler.java | 11 +-
.../main/java/org/apache/wiki/plugin/Groups.java | 12 +-
.../main/java/org/apache/wiki/plugin/IfPlugin.java | 18 +-
.../main/java/org/apache/wiki/plugin/Image.java | 44 +-
.../java/org/apache/wiki/plugin/IndexPlugin.java | 64 +-
.../java/org/apache/wiki/plugin/InsertPage.java | 46 +-
.../org/apache/wiki/plugin/ListLocksPlugin.java | 48 +-
.../src/main/java/org/apache/wiki/plugin/Note.java | 25 +-
.../org/apache/wiki/plugin/PageViewPlugin.java | 109 ++--
.../apache/wiki/plugin/RecentChangesPlugin.java | 14 +-
.../apache/wiki/plugin/ReferredPagesPlugin.java | 15 +-
.../apache/wiki/plugin/ReferringPagesPlugin.java | 13 +-
.../wiki/plugin/ReferringUndefinedPagesPlugin.java | 24 +-
.../main/java/org/apache/wiki/plugin/Search.java | 38 +-
.../org/apache/wiki/plugin/SessionsPlugin.java | 34 +-
.../org/apache/wiki/plugin/TableOfContents.java | 36 +-
.../apache/wiki/plugin/UndefinedPagesPlugin.java | 4 +-
.../org/apache/wiki/plugin/UnusedPagesPlugin.java | 55 +-
.../apache/wiki/plugin/WeblogArchivePlugin.java | 127 ++--
.../org/apache/wiki/plugin/WeblogEntryPlugin.java | 20 +-
.../java/org/apache/wiki/plugin/WeblogPlugin.java | 36 +-
.../org/apache/wiki/preferences/Preferences.java | 70 +-
.../wiki/providers/AbstractFileProvider.java | 412 +++++-------
.../wiki/providers/BasicAttachmentProvider.java | 469 +++++---------
.../wiki/providers/CachingAttachmentProvider.java | 80 ++-
.../org/apache/wiki/providers/CachingProvider.java | 135 ++--
.../apache/wiki/providers/FileSystemProvider.java | 179 ++----
.../wiki/providers/VersioningFileProvider.java | 255 +++-----
.../wiki/providers/WikiAttachmentProvider.java | 107 ++--
.../apache/wiki/providers/WikiPageProvider.java | 61 +-
.../wiki/references/DefaultReferenceManager.java | 39 +-
.../wiki/render/DefaultRenderingManager.java | 6 +-
.../org/apache/wiki/rpc/atom/AtomAPIServlet.java | 87 +--
.../main/java/org/apache/wiki/rss/AtomFeed.java | 11 +-
.../src/main/java/org/apache/wiki/rss/Feed.java | 31 +-
.../main/java/org/apache/wiki/rss/RSS10Feed.java | 36 +-
.../main/java/org/apache/wiki/rss/RSS20Feed.java | 48 +-
.../java/org/apache/wiki/rss/RSSGenerator.java | 8 +-
.../main/java/org/apache/wiki/rss/RSSThread.java | 25 +-
.../apache/wiki/search/BasicSearchProvider.java | 27 +-
.../apache/wiki/search/LuceneSearchProvider.java | 33 +-
.../java/org/apache/wiki/search/SearchManager.java | 7 +-
.../java/org/apache/wiki/search/SearchMatcher.java | 12 +-
.../org/apache/wiki/tags/AdminBeanIteratorTag.java | 20 +-
.../apache/wiki/tags/AttachmentsIteratorTag.java | 9 +-
.../main/java/org/apache/wiki/tags/AuthorTag.java | 9 +-
.../java/org/apache/wiki/tags/BreadcrumbsTag.java | 97 ++-
.../java/org/apache/wiki/tags/CalendarTag.java | 9 +-
.../java/org/apache/wiki/tags/CheckLockTag.java | 70 +-
.../java/org/apache/wiki/tags/CheckVersionTag.java | 12 +-
.../org/apache/wiki/tags/ContentEncodingTag.java | 7 +-
.../main/java/org/apache/wiki/tags/ContentTag.java | 62 +-
.../java/org/apache/wiki/tags/DiffLinkTag.java | 15 +-
.../java/org/apache/wiki/tags/EditLinkTag.java | 78 +--
.../org/apache/wiki/tags/EditorIteratorTag.java | 15 +-
.../main/java/org/apache/wiki/tags/EditorTag.java | 61 +-
.../org/apache/wiki/tags/FeedDiscoveryTag.java | 8 +-
.../org/apache/wiki/tags/HasAttachmentsTag.java | 10 +-
.../org/apache/wiki/tags/HistoryIteratorTag.java | 9 +-
.../main/java/org/apache/wiki/tags/IncludeTag.java | 56 +-
.../java/org/apache/wiki/tags/InsertDiffTag.java | 14 +-
.../java/org/apache/wiki/tags/InsertPageTag.java | 18 +-
.../main/java/org/apache/wiki/tags/LinkTag.java | 34 +-
.../main/java/org/apache/wiki/tags/LinkToTag.java | 31 +-
.../java/org/apache/wiki/tags/NoSuchPageTag.java | 13 +-
.../java/org/apache/wiki/tags/PageInfoLinkTag.java | 9 +-
.../java/org/apache/wiki/tags/PageNameTag.java | 8 +-
.../java/org/apache/wiki/tags/PageSizeTag.java | 10 +-
.../org/apache/wiki/tags/ParentPageNameTag.java | 9 +-
.../java/org/apache/wiki/tags/PermissionTag.java | 5 +-
.../main/java/org/apache/wiki/tags/PluginTag.java | 35 +-
.../java/org/apache/wiki/tags/RSSImageLinkTag.java | 50 +-
.../apache/wiki/tags/SearchResultIteratorTag.java | 48 +-
.../java/org/apache/wiki/tags/TranslateTag.java | 5 +-
.../java/org/apache/wiki/tags/UserCheckTag.java | 2 +-
.../java/org/apache/wiki/tags/UserNameTag.java | 43 +-
.../java/org/apache/wiki/tags/UserProfileTag.java | 181 ++----
.../java/org/apache/wiki/tags/VariableTag.java | 59 +-
.../org/apache/wiki/tasks/DefaultTasksManager.java | 10 +-
.../java/org/apache/wiki/tasks/TasksManager.java | 4 +-
.../wiki/tasks/auth/SaveUserProfileTask.java | 18 +-
.../wiki/tasks/pages/PreSaveWikiPageTask.java | 27 +-
.../apache/wiki/tasks/pages/SaveWikiPageTask.java | 15 +-
.../org/apache/wiki/ui/DefaultCommandResolver.java | 5 +-
.../src/main/java/org/apache/wiki/ui/Editor.java | 2 +-
.../java/org/apache/wiki/ui/WikiJSPFilter.java | 14 +-
.../java/org/apache/wiki/ui/admin/AdminBean.java | 4 +-
.../org/apache/wiki/ui/admin/SimpleAdminBean.java | 22 +-
.../apache/wiki/ui/admin/WikiFormAdminBean.java | 23 +-
.../org/apache/wiki/ui/admin/beans/CoreBean.java | 17 +-
.../org/apache/wiki/ui/admin/beans/FilterBean.java | 24 +-
.../org/apache/wiki/ui/admin/beans/ModuleBean.java | 30 +-
.../wiki/ui/admin/beans/PlainEditorAdminBean.java | 57 +-
.../org/apache/wiki/ui/admin/beans/PluginBean.java | 24 +-
.../wiki/ui/admin/beans/SearchManagerBean.java | 81 +--
.../org/apache/wiki/ui/admin/beans/UserBean.java | 51 +-
.../wiki/variables/DefaultVariableManager.java | 17 +-
.../wiki/workflow/DefaultWorkflowManager.java | 19 +-
.../org/apache/wiki/workflow/WorkflowBuilder.java | 89 +--
.../org/apache/wiki/workflow/WorkflowManager.java | 4 +-
.../org/apache/wiki/xmlrpc/AbstractRPCHandler.java | 13 +-
.../org/apache/wiki/xmlrpc/MetaWeblogHandler.java | 37 +-
.../java/org/apache/wiki/xmlrpc/RPCHandler.java | 34 +-
.../org/apache/wiki/xmlrpc/RPCHandlerUTF8.java | 34 +-
.../src/main/resources/ini/classmappings.xml | 10 +-
.../test/java/org/apache/wiki/WikiEngineTest.java | 22 +-
.../wiki/attachment/AttachmentManagerTest.java | 80 +--
.../wiki/auth/AuthenticationManagerTest.java | 103 ++-
.../apache/wiki/auth/AuthorizationManagerTest.java | 151 ++---
.../java/org/apache/wiki/auth/TestAuthorizer.java | 42 +-
.../java/org/apache/wiki/auth/UserManagerTest.java | 102 +--
.../wiki/auth/acl/DefaultAclManagerTest.java | 16 +-
.../org/apache/wiki/content/PageRenamerTest.java | 110 ++--
.../apache/wiki/pages/DefaultPageManagerTest.java | 78 +--
.../wiki/parser/JSPWikiMarkupParserTest.java | 546 ++++++++--------
.../wiki/plugin/DefaultPluginManagerTest.java | 5 +-
.../java/org/apache/wiki/plugin/GroupsTest.java | 11 +-
.../java/org/apache/wiki/plugin/IfPluginTest.java | 50 +-
.../org/apache/wiki/plugin/InsertPageTest.java | 31 +-
.../org/apache/wiki/plugin/PageViewPluginTest.java | 77 +--
.../apache/wiki/plugin/TableOfContentsTest.java | 43 +-
.../wiki/plugin/UndefinedPagesPluginTest.java | 3 +-
.../org/apache/wiki/plugin/WeblogPluginTest.java | 3 +-
.../apache/wiki/providers/CachingProviderTest.java | 27 +-
.../org/apache/wiki/providers/CounterProvider.java | 56 +-
.../wiki/providers/VersioningFileProviderTest.java | 184 +++---
.../apache/wiki/providers/VerySimpleProvider.java | 42 +-
.../wiki/references/ReferenceManagerTest.java | 4 +-
.../apache/wiki/render/RenderingManagerTest.java | 21 +-
.../java/org/apache/wiki/rss/RSSGeneratorTest.java | 29 +-
.../org/apache/wiki/search/SearchManagerTest.java | 9 +-
.../apache/wiki/stress/MassiveRepositoryTest.java | 50 +-
.../wiki/stress/StressTestVersioningProvider.java | 27 +-
.../org/apache/wiki/ui/CommandResolverTest.java | 7 +-
.../java/org/apache/wiki/ui/PageCommandTest.java | 3 +-
.../apache/wiki/workflow/ApprovalWorkflowTest.java | 85 +--
.../org/apache/wiki/xmlrpc/RPCHandlerTest.java | 47 +-
.../LocalLinkAttributeProviderState.java | 8 +-
.../AccessRuleLinkNodePostProcessorState.java | 6 +-
.../LocalLinkNodePostProcessorState.java | 3 +-
.../MetadataLinkNodePostProcessorState.java | 3 +-
.../VariableLinkNodePostProcessorState.java | 3 +-
.../wiki/parser/markdown/MarkdownParser.java | 35 +-
.../apache/wiki/render/MarkdownRendererTest.java | 5 +-
.../wiki/search/tika/TikaSearchProvider.java | 17 +-
.../wiki/search/tika/TikaSearchProviderTest.java | 15 +-
.../main/java/org/apache/wiki/util/ClassUtil.java | 197 +++---
jspwiki-war/src/main/webapp/Diff.jsp | 2 +-
jspwiki-war/src/main/webapp/PageInfo.jsp | 2 +-
jspwiki-war/src/main/webapp/Wiki.jsp | 2 +-
jspwiki-war/src/main/webapp/rss.jsp | 2 +-
.../main/webapp/templates/210/AttachmentTab.jsp | 2 +-
.../main/webapp/templates/210/CommentContent.jsp | 5 +-
.../src/main/webapp/templates/210/DiffTab.jsp | 12 +-
.../src/main/webapp/templates/210/EditContent.jsp | 5 +-
.../src/main/webapp/templates/210/GroupTab.jsp | 4 +-
.../src/main/webapp/templates/210/InfoContent.jsp | 12 +-
.../src/main/webapp/templates/210/LoginContent.jsp | 2 +-
.../src/main/webapp/templates/210/PageContent.jsp | 4 +-
.../src/main/webapp/templates/210/PageTab.jsp | 3 +-
.../main/webapp/templates/210/PreferencesTab.jsp | 2 +-
.../src/main/webapp/templates/210/ProfileTab.jsp | 2 +-
.../main/webapp/templates/210/UploadTemplate.jsp | 5 +-
.../main/webapp/templates/210/editors/CKeditor.jsp | 18 +-
.../src/main/webapp/templates/210/editors/FCK.jsp | 18 +-
.../main/webapp/templates/210/editors/TinyMCE.jsp | 20 +-
.../main/webapp/templates/210/editors/plain.jsp | 14 +-
.../main/webapp/templates/210/editors/wysiwyg.jsp | 14 +-
.../webapp/templates/default/AttachmentTab.jsp | 2 +-
.../src/main/webapp/templates/default/DiffTab.jsp | 12 +-
.../src/main/webapp/templates/default/GroupTab.jsp | 5 +-
.../main/webapp/templates/default/InfoContent.jsp | 8 +-
.../main/webapp/templates/default/LoginContent.jsp | 9 +-
.../src/main/webapp/templates/default/Nav.jsp | 11 +-
.../src/main/webapp/templates/default/PageTab.jsp | 6 +-
.../webapp/templates/default/PreferencesTab.jsp | 11 +-
.../main/webapp/templates/default/ProfileTab.jsp | 2 +-
.../webapp/templates/default/editors/CKeditor.jsp | 20 +-
.../webapp/templates/default/editors/TinyMCE.jsp | 20 +-
.../webapp/templates/default/editors/plain.jsp | 16 +-
.../webapp/templates/default/editors/wysiwyg.jsp | 20 +-
238 files changed, 7587 insertions(+), 8628 deletions(-)
create mode 100644
jspwiki-main/src/main/java/org/apache/wiki/attachment/DefaultAttachmentManager.java
create mode 100644
jspwiki-main/src/main/java/org/apache/wiki/auth/DefaultAuthenticationManager.java
create mode 100644
jspwiki-main/src/main/java/org/apache/wiki/auth/DefaultAuthorizationManager.java
create mode 100644
jspwiki-main/src/main/java/org/apache/wiki/auth/DefaultUserManager.java
create mode 100644
jspwiki-main/src/main/java/org/apache/wiki/auth/authorize/DefaultGroupManager.java
create mode 100644
jspwiki-main/src/main/java/org/apache/wiki/auth/user/DummyUserDatabase.java
