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 9e05cc5 2.11.0-M7-git-03
new 1ec1151 JSPWIKI-120: move deletePage(..) and deleteVersion(..)
methods from WikiEngine to PageManager
new fcd0f5d JSPWIKI-120: getCurrentProvider() moved from WikiEngine to
PageManager; getCurrentProviderInfo deleted from WikiEngine - use
PageManager.getProviderDescription() instead
new 46b7e97 JSPWIKI-120: removed getPageCount from WikiEngine - use
PageManager.getTotalPageCount instead
new 27d799e apply formats and fixes suggested by IntelliJ
new 1630b75 apply formats and fixes suggested by IntelliJ
new f917189 add missing package.html
new 94d4598 JSPWIKI-120: getPage( String ) and getPage( String, int )
methods from WikiEngine moved to PageManager
new 0280063 include missing jspwiki.basicAttachmentProvider.storageDir,
used on some tests
new 3a4c6a5 Improvements on TestEngine
new 54814dc clean up + simplify tests
new 8081873 JSPWIKI-120: move getPureText methods to PageManager
new 99c5c7d '<init>' is not a valid dir name, so we replace it with 'init'
new 4932569 JSPWIKI-120: use getPureText from PageManager
new d7dd21d take into account executions on Windows boxes can have both /
and \
new f41a539 simplify test a tiny bit
new 686c57a JSPWIKI-120: move getRecentChanges from WikiEngine to
PageManager
new 806fc47 JSPWIKI-120: move getVersionHistory from WikiEngine into same
method in PageManager
new a64c5a5 make casting unnecessary when calling
WikiEngine#getAttribute()
new be8e23f WikiEngine#getPluginManager() and
WikiEngine#getFilterManager() now only return their associated interface
new 4cb064d JSPWIKI-120: move getText(..) methods from WikiEngine to
PageManager
new 7a5fbbd fix JSP compilation error
new 74e8560 JSPWIKI-120: move pageExist(..) methods to PageManager,
renamed as wikiPageExist(..)
new 86778fd rename WorkflowManager as DefaultWorkflowManager and extract
interface (WorkflowManager) from it
new 27f6209 remove getEngine from PageManager, you should already have
access to it if you've grabbed the PageManager
new 2bac2a4 explicit casting on WikiPage#getAttribute() can be removed in
most cases now
new d65ebff revert change on previous commits: PageManager and
WorkflowManager must extend WikiEventListener
new 7a70566 apply format and fixes suggested by IntelliJ to WikiEngine
new bdcfef8 fix test compilation error
new 28c2daf JSPWIKI-120: move saveText from WikiEngine to PageManager
new 5e84989 remove FIXME tag - actually done! :-)
new 2297125 apply format and fixes suggested by IntelliJ
new c9bc3c7 2.11.0-M7-git-04
The 32 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 | 25 +
.../src/main/java/org/apache/wiki/Release.java | 2 +-
.../src/main/java/org/apache/wiki/WikiContext.java | 51 +-
.../src/main/java/org/apache/wiki/WikiEngine.java | 843 ++++-----------------
.../src/main/java/org/apache/wiki/WikiPage.java | 14 +-
.../main/java/org/apache/wiki/WikiProvider.java | 3 +-
.../src/main/java/org/apache/wiki/WikiServlet.java | 24 +-
.../src/main/java/org/apache/wiki/WikiSession.java | 603 ++++++---------
.../apache/wiki/attachment/AttachmentManager.java | 38 +-
.../org/apache/wiki/auth/AuthorizationManager.java | 2 +-
.../apache/wiki/auth/acl/DefaultAclManager.java | 60 +-
.../apache/wiki/content/DefaultPageRenamer.java | 16 +-
.../apache/wiki/diff/DefaultDifferenceManager.java | 4 +-
.../org/apache/wiki/event/WikiEventListener.java | 9 +-
.../java/org/apache/wiki/filters/SpamFilter.java | 60 +-
.../org/apache/wiki/pages/DefaultPageManager.java | 493 ++++++++----
.../main/java/org/apache/wiki/pages/PageLock.java | 19 +-
.../java/org/apache/wiki/pages/PageManager.java | 257 +++++--
.../java/org/apache/wiki/pages/PageSorter.java | 37 +-
.../org/apache/wiki/pages/PageTimeComparator.java | 6 +-
.../main/java/org/apache/wiki/pages}/package.html | 4 +-
.../apache/wiki/parser/JSPWikiMarkupParser.java | 17 +-
.../java/org/apache/wiki/parser/MarkupParser.java | 22 +-
.../apache/wiki/plugin/AbstractReferralPlugin.java | 2 +-
.../org/apache/wiki/plugin/BugReportHandler.java | 224 +++---
.../main/java/org/apache/wiki/plugin/Counter.java | 66 +-
.../main/java/org/apache/wiki/plugin/IfPlugin.java | 133 ++--
.../java/org/apache/wiki/plugin/InsertPage.java | 48 +-
.../apache/wiki/plugin/RecentChangesPlugin.java | 8 +-
.../apache/wiki/plugin/ReferredPagesPlugin.java | 150 ++--
.../apache/wiki/plugin/ReferringPagesPlugin.java | 2 +-
.../org/apache/wiki/plugin/TableOfContents.java | 27 +-
.../org/apache/wiki/plugin/WeblogEntryPlugin.java | 100 +--
.../java/org/apache/wiki/plugin/WeblogPlugin.java | 14 +-
.../wiki/providers/BasicAttachmentProvider.java | 2 +-
.../apache/wiki/providers/FileSystemProvider.java | 12 +-
.../wiki/providers/VersioningFileProvider.java | 2 +-
.../wiki/references/DefaultReferenceManager.java | 10 +-
.../org/apache/wiki/rpc/atom/AtomAPIServlet.java | 63 +-
.../java/org/apache/wiki/rss/RSSGenerator.java | 41 +-
.../apache/wiki/search/LuceneSearchProvider.java | 4 +-
.../java/org/apache/wiki/search/SearchManager.java | 37 +-
.../apache/wiki/tags/AttachmentsIteratorTag.java | 97 +--
.../main/java/org/apache/wiki/tags/AuthorTag.java | 47 +-
.../java/org/apache/wiki/tags/BreadcrumbsTag.java | 8 +-
.../java/org/apache/wiki/tags/CalendarTag.java | 2 +-
.../java/org/apache/wiki/tags/CheckVersionTag.java | 90 +--
.../java/org/apache/wiki/tags/DiffLinkTag.java | 103 +--
.../java/org/apache/wiki/tags/EditLinkTag.java | 8 +-
.../org/apache/wiki/tags/HasAttachmentsTag.java | 28 +-
.../org/apache/wiki/tags/HistoryIteratorTag.java | 81 +-
.../java/org/apache/wiki/tags/InsertDiffTag.java | 2 +-
.../java/org/apache/wiki/tags/InsertPageTag.java | 61 +-
.../main/java/org/apache/wiki/tags/LinkTag.java | 27 +-
.../java/org/apache/wiki/tags/NoSuchPageTag.java | 37 +-
.../java/org/apache/wiki/tags/PageInfoLinkTag.java | 57 +-
.../java/org/apache/wiki/tags/PageSizeTag.java | 33 +-
.../java/org/apache/wiki/tags/PermissionTag.java | 103 +--
.../java/org/apache/wiki/tags/WikiTagBase.java | 68 +-
.../java/org/apache/wiki/tasks/TasksManager.java | 9 +-
.../apache/wiki/tasks/pages/SaveWikiPageTask.java | 2 +-
.../java/org/apache/wiki/ui/CommandResolver.java | 2 +-
.../org/apache/wiki/ui/admin/beans/CoreBean.java | 21 +-
.../wiki/variables/DefaultVariableManager.java | 12 +-
.../wiki/workflow/DefaultWorkflowManager.java | 259 +++++++
.../org/apache/wiki/workflow/WorkflowManager.java | 316 ++------
.../org/apache/wiki/xmlrpc/AbstractRPCHandler.java | 66 +-
.../org/apache/wiki/xmlrpc/MetaWeblogHandler.java | 55 +-
.../java/org/apache/wiki/xmlrpc/RPCHandler.java | 144 ++--
.../org/apache/wiki/xmlrpc/RPCHandlerUTF8.java | 187 ++---
.../src/main/resources/ini/classmappings.xml | 2 +-
.../src/test/java/org/apache/wiki/TestEngine.java | 134 ++--
.../test/java/org/apache/wiki/WikiEngineTest.java | 677 +++--------------
.../wiki/attachment/AttachmentManagerTest.java | 31 +-
.../apache/wiki/auth/AuthorizationManagerTest.java | 18 +-
.../java/org/apache/wiki/auth/UserManagerTest.java | 16 +-
.../wiki/auth/acl/DefaultAclManagerTest.java | 37 +-
.../org/apache/wiki/content/PageRenamerTest.java | 58 +-
.../apache/wiki/pages/DefaultPageManagerTest.java | 299 +++++++-
.../wiki/plugin/DefaultPluginManagerTest.java | 171 ++---
.../java/org/apache/wiki/plugin/GroupsTest.java | 21 +-
.../java/org/apache/wiki/plugin/IfPluginTest.java | 31 +-
.../org/apache/wiki/plugin/PageViewPluginTest.java | 33 +-
.../apache/wiki/plugin/TableOfContentsTest.java | 17 +-
.../org/apache/wiki/plugin/WeblogPluginTest.java | 13 +-
.../apache/wiki/providers/CachingProviderTest.java | 30 +-
.../wiki/providers/FileSystemProviderTest.java | 16 +-
.../wiki/providers/VersioningFileProviderTest.java | 154 ++--
.../wiki/references/ReferenceManagerTest.java | 2 +-
.../apache/wiki/render/RenderingManagerTest.java | 36 +-
.../java/org/apache/wiki/rss/RSSGeneratorTest.java | 29 +-
.../org/apache/wiki/search/SearchManagerTest.java | 8 +-
.../apache/wiki/stress/MassiveRepositoryTest.java | 23 +-
.../wiki/stress/StressTestVersioningProvider.java | 28 +-
.../org/apache/wiki/ui/CommandResolverTest.java | 6 +-
.../java/org/apache/wiki/ui/PageCommandTest.java | 2 +-
.../apache/wiki/workflow/ApprovalWorkflowTest.java | 25 +-
.../org/apache/wiki/workflow/WorkflowTest.java | 10 +-
.../org/apache/wiki/xmlrpc/RPCHandlerTest.java | 19 +-
.../test/resources/jspwiki-vers-custom.properties | 7 +-
.../apache/wiki/render/MarkdownRendererTest.java | 19 +-
jspwiki-war/src/main/webapp/Comment.jsp | 114 +--
jspwiki-war/src/main/webapp/Delete.jsp | 8 +-
jspwiki-war/src/main/webapp/Edit.jsp | 113 +--
jspwiki-war/src/main/webapp/Login.jsp | 3 +-
jspwiki-war/src/main/webapp/PageModified.jsp | 2 +-
jspwiki-war/src/main/webapp/UserPreferences.jsp | 4 +-
jspwiki-war/src/main/webapp/rss.jsp | 9 +-
.../src/main/webapp/templates/210/DiffTab.jsp | 2 +-
.../src/main/webapp/templates/210/InfoContent.jsp | 2 +-
.../src/main/webapp/templates/210/PageTab.jsp | 2 +-
.../main/webapp/templates/210/editors/CKeditor.jsp | 6 +-
.../src/main/webapp/templates/210/editors/FCK.jsp | 6 +-
.../main/webapp/templates/210/editors/TinyMCE.jsp | 6 +-
.../main/webapp/templates/210/editors/plain.jsp | 6 +-
.../main/webapp/templates/210/editors/wysiwyg.jsp | 6 +-
.../src/main/webapp/templates/default/DiffTab.jsp | 2 +-
.../main/webapp/templates/default/InfoContent.jsp | 2 +-
.../src/main/webapp/templates/default/Nav.jsp | 2 +-
.../src/main/webapp/templates/default/PageTab.jsp | 2 +-
.../src/main/webapp/templates/default/Sidebar.jsp | 2 +-
.../webapp/templates/default/editors/CKeditor.jsp | 6 +-
.../webapp/templates/default/editors/TinyMCE.jsp | 6 +-
.../webapp/templates/default/editors/plain.jsp | 6 +-
.../webapp/templates/default/editors/wysiwyg.jsp | 6 +-
125 files changed, 3206 insertions(+), 4568 deletions(-)
copy
{jspwiki-it-tests/jspwiki-selenide-tests/src/main/java/org/apache/wiki/its =>
jspwiki-main/src/main/java/org/apache/wiki/pages}/package.html (91%)
create mode 100644
jspwiki-main/src/main/java/org/apache/wiki/workflow/DefaultWorkflowManager.java
