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 6078d6d update Dockerfile to use latest Tomcat 9.0 (no version bump)
new 3857b0e Move PropertyReader tests from main module to util + delete
Util test class, use Collection#contains(..) method instead
new df1105d JSPWIKI-303: ease backward compatibility
new e8207ab remove unneeded import
new f3e599d JSPWIKI-303: extract o.a.w.event package to its own module
new 02edfdb JSPWIKI-303: extract o.a.w.event package to its own module
new 49940ae JSPWIKI-303: public API package moved to its own module +
added rest of proposed classes for that package
new c38bbac JSPWIKI-303: WikiContext and WikiPage implement Context and
Page respectively
new 69ee889 adapt to ParserStagePlugin signature
new f67e60a jspwiki-event and jspwiki-api as dependencies of jspwiki-main
new 68630d7 JSPWIKI-303: adapt to new PageFilter signature (backwards
compatibility still needs to be implemented)
new 624b0a7 JSPWIKI-303: added module with extensions not using the
public api
new 37f4f81 JSPWIKI-303: add module with adapters to allow backwards
compatibility with 3rd party extensions not using the public api
new 8c26820 add new modules to main build
new 569e8ce add adapter module to main war
new 1a43072 JSPWIKI-303: rename BasicPageFilter to BasePageFilter
new 66d89ff JSPWIKI-303: PageFilter backwards compatibility while having
a clean, public API
new 52aaa53 update maven-dependency-plugin from 3.1.1 to 3.1.2
new 0d133e0 JSPWIKI-303: tests to ensure PageFilter backwards
compatibility with non-pblic API
new 5b65708 JSPWIKI-303: move o.a.w.WikiProvider to jspwiki-210-adapters
module
new d12dce0 JSPWIKI-303: use o.a.w.api.plugin.Plugin instead of
o.a.w.api.plugin.WikiPlugin
new 63201bf JSPWIKI-303: use o.a.w.api.providers.WikiProvider instead of
o.a.w.WikiProvider
new 65173e4 use new Plugin interface from public api
new 1862b92 add clone methods to Page and Context
new 0383468 JSPWIKI-303: use Context instead of WikiContext, in order to
accomodate the WikiPlugin to Plugin change
new c5f0b07 JSPWIKI-303: remove o.a.w.ui.Command and use
o.a.w.api.core.command
new 92270b3 JSPWIKI-303: use new Command and Context from jspwiki-api
module
new a62b3e5 JSPWIKI-303: use constant from Plugin instead of from
WikiPlugin
new b4853d4 remove casts to WikiContext / WikiPage
new 523cf44 use constant from Context instead of from WikiContext
new 34f6a71 WikiContext#getVariable( String ) returns typed object
instead of plain Object
new 9dab205 make renderers use Context instead of WikiContext
new 9a017f2 use Context instead of WikiContext whenever possible
throughout jspwiki-markdown
new 8667918 Build renderers using Context instead of WikiContext
new 4e6eed4 add suggested fixes and format by IntelliJ
new 60b6bb4 JSPWIKI-303: o.a.w.attachment.Attachment implements
o.a.w.api.core.Attachment
new 489de09 JSPWIKI-303: move WikiAttachmentProvider to
jspwiki-210-adapters
new e523746 JSPWIKI-303: move WikiPageProvider to jspwiki-210-adapters
new bc8e753 mark classes / interfaces from jspwiki-210-adapters as
deprecated
new 42aa81d JSPWIKI-303: add back Context#getCommand()
new 2c9e057 JSPWIKI-303: introduce Page instead of WikiPage (ACL handling
still needs to be done) 1/2
new 633124c JSPWIKI-303: introduce Page instead of WikiPage (ACL handling
still needs to be done) 2/2
new 0d23057 JSPWIKI-303: move o.a.w.search.QueryItem and
o.a.w.search.SearchResult to jspwiki-210-adapters module and use the ones from
o.a.w.api.search instead
new b8b6ded use Context instead of WikiContext
new f0b6510 use Page instead of WikiPage on JSPs whenever possible
new 52bcee3 remove unneeded casts, use constants from Context
new 2ee1b38 use public API classes on TagExtraInfo classes
new be1f831 2.11.0-M7-git-13
The 47 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 | 17 +
.../pom.xml | 46 ++-
.../main/java/org/apache/wiki/WikiProvider.java | 17 +-
.../apache/wiki/api/filters/BasicPageFilter.java | 99 ++++++
.../org/apache/wiki/api/plugin/WikiPlugin.java | 48 +--
.../wiki/providers/WikiAttachmentProvider.java | 3 +
.../apache/wiki/providers/WikiPageProvider.java | 5 +-
.../java/org/apache/wiki/search/QueryItem.java | 18 +-
.../java/org/apache/wiki/search/SearchResult.java | 23 +-
.../org/apache/wiki/filters/FilterFrom210Test.java | 31 ++
.../org/apache/wiki/plugin/PluginFrom210Test.java | 27 ++
.../src/test/resources/filters.xml | 16 +-
.../pom.xml | 34 +-
.../main/java/com/example/filters/TwoXFilter.java | 28 ++
.../main/java/com/example/plugins/TwoXPlugin.java | 27 +-
.../java/com/example/filters/TwoXFilterTest.java | 24 +-
.../java/com/example/plugins/TwoXPluginTest.java | 20 +-
.../pom.xml | 41 +--
.../src/main/java/org/apache/wiki/api/Release.java | 2 +-
.../main/java/org/apache/wiki/api/core}/Acl.java | 77 ++--
.../java/org/apache/wiki/api/core}/AclEntry.java | 79 ++---
.../java/org/apache/wiki/api/core}/Attachment.java | 60 +---
.../java/org/apache/wiki/api/core}/Command.java | 19 +-
.../java/org/apache/wiki/api/core/Context.java | 253 ++++++++++++++
.../main/java/org/apache/wiki/api/core/Engine.java | 0
.../main/java/org/apache/wiki/api/core/Page.java | 186 ++++++++++
.../java/org/apache/wiki/api/core/Session.java | 0
.../java/org/apache/wiki/api/core/package.html | 0
.../wiki/api/exceptions/FilterException.java | 2 +-
.../exceptions/NoRequiredPropertyException.java | 2 +-
.../api/exceptions/NoSuchVariableException.java | 2 +-
.../wiki/api/exceptions/PluginException.java | 4 +-
.../wiki/api/exceptions/ProviderException.java | 2 +-
.../wiki/api/exceptions/RedirectException.java | 2 +-
.../apache/wiki/api/exceptions/WikiException.java | 4 +-
.../wiki/api/exceptions/WikiI18nException.java | 2 +-
.../org/apache/wiki/api/exceptions/package.html | 0
.../apache/wiki/api/filters/BasePageFilter.java | 8 +-
.../wiki/api/filters/FilterSupportOperations.java | 54 +++
.../org/apache/wiki/api/filters/PageFilter.java | 132 +++++++
.../java/org/apache/wiki/api/filters/package.html | 0
.../src/main/java/org/apache/wiki/api/package.html | 0
.../wiki/api/plugin/InitializablePlugin.java | 0
.../apache/wiki/api/plugin/ParserStagePlugin.java | 4 +-
.../java/org/apache/wiki/api/plugin/Plugin.java | 38 +-
.../org/apache/wiki/api/plugin/PluginElement.java | 6 +-
.../java/org/apache/wiki/api/plugin/package.html | 0
.../wiki/api/providers/AttachmentProvider.java | 18 +-
.../apache/wiki/api/providers/PageProvider.java | 23 +-
.../apache/wiki/api/providers}/WikiProvider.java | 2 +-
.../org/apache/wiki/api/providers}/package.html | 6 +-
.../org/apache/wiki/api}/search/QueryItem.java | 2 +-
.../org/apache/wiki/api}/search/SearchResult.java | 6 +-
.../java/org/apache/wiki/api/search}/package.html | 6 +-
{jspwiki-util => jspwiki-event}/pom.xml | 41 +--
.../org/apache/wiki/event/WikiEngineEvent.java | 0
.../main/java/org/apache/wiki/event/WikiEvent.java | 0
.../org/apache/wiki/event/WikiEventListener.java | 0
.../org/apache/wiki/event/WikiEventManager.java | 0
.../java/org/apache/wiki/event/WikiPageEvent.java | 21 +-
.../org/apache/wiki/event/WikiPageRenameEvent.java | 0
.../org/apache/wiki/event/WikiSecurityEvent.java | 0
.../java/org/apache/wiki/event/WorkflowEvent.java | 0
jspwiki-main/pom.xml | 12 +
.../main/java/org/apache/wiki/LinkCollector.java | 4 +-
.../java/org/apache/wiki/StringTransmutator.java | 3 +-
.../src/main/java/org/apache/wiki/WikiContext.java | 110 +++---
.../src/main/java/org/apache/wiki/WikiEngine.java | 3 +-
.../src/main/java/org/apache/wiki/WikiPage.java | 50 ++-
.../org/apache/wiki/api/filters/PageFilter.java | 111 ------
.../org/apache/wiki/attachment/Attachment.java | 64 ++--
.../apache/wiki/attachment/AttachmentManager.java | 20 +-
.../apache/wiki/attachment/AttachmentServlet.java | 5 +-
.../wiki/attachment/DefaultAttachmentManager.java | 19 +-
.../wiki/attachment/DynamicAttachmentProvider.java | 1 +
.../org/apache/wiki/auth/AuthorizationManager.java | 4 +-
.../wiki/auth/DefaultAuthorizationManager.java | 10 +-
.../apache/wiki/auth/acl/DefaultAclManager.java | 5 +-
.../wiki/auth/permissions/PagePermission.java | 59 ++--
.../wiki/auth/permissions/PermissionFactory.java | 13 +-
.../apache/wiki/content/DefaultPageRenamer.java | 20 +-
.../apache/wiki/diff/ContextualDiffProvider.java | 29 +-
.../apache/wiki/diff/DefaultDifferenceManager.java | 10 +-
.../java/org/apache/wiki/diff/DiffProvider.java | 15 +-
.../org/apache/wiki/diff/DifferenceManager.java | 6 +-
.../org/apache/wiki/diff/ExternalDiffProvider.java | 12 +-
.../apache/wiki/diff/TraditionalDiffProvider.java | 32 +-
.../java/org/apache/wiki/filters/CreoleFilter.java | 14 +-
.../apache/wiki/filters/DefaultFilterManager.java | 20 +-
.../org/apache/wiki/filters/FilterManager.java | 18 +-
.../org/apache/wiki/filters/PageEventFilter.java | 27 +-
.../apache/wiki/filters/PingWeblogsComFilter.java | 7 +-
.../org/apache/wiki/filters/ProfanityFilter.java | 13 +-
.../java/org/apache/wiki/filters/SpamFilter.java | 62 ++--
.../main/java/org/apache/wiki/forms/FormClose.java | 39 +--
.../java/org/apache/wiki/forms/FormElement.java | 30 +-
.../java/org/apache/wiki/forms/FormHandler.java | 12 +-
.../main/java/org/apache/wiki/forms/FormInfo.java | 26 +-
.../main/java/org/apache/wiki/forms/FormInput.java | 50 ++-
.../main/java/org/apache/wiki/forms/FormOpen.java | 82 ++---
.../java/org/apache/wiki/forms/FormOutput.java | 12 +-
.../java/org/apache/wiki/forms/FormSelect.java | 71 ++--
.../main/java/org/apache/wiki/forms/FormSet.java | 37 +-
.../java/org/apache/wiki/forms/FormTextarea.java | 66 ++--
.../apache/wiki/htmltowiki/XHtmlToWikiConfig.java | 151 ++++----
.../org/apache/wiki/pages/DefaultPageManager.java | 118 ++++---
.../main/java/org/apache/wiki/pages/PageLock.java | 96 +++--
.../java/org/apache/wiki/pages/PageManager.java | 46 +--
.../org/apache/wiki/pages/PageTimeComparator.java | 22 +-
.../org/apache/wiki/parser/HeadingListener.java | 13 +-
.../apache/wiki/parser/JSPWikiMarkupParser.java | 32 +-
.../apache/wiki/parser/LinkParsingOperations.java | 6 +-
.../java/org/apache/wiki/parser/MarkupParser.java | 16 +-
.../java/org/apache/wiki/parser/PluginContent.java | 22 +-
.../org/apache/wiki/parser/VariableContent.java | 31 +-
.../java/org/apache/wiki/parser/WikiDocument.java | 16 +-
.../apache/wiki/plugin/AbstractReferralPlugin.java | 78 ++---
.../org/apache/wiki/plugin/BugReportHandler.java | 15 +-
.../main/java/org/apache/wiki/plugin/Counter.java | 11 +-
.../org/apache/wiki/plugin/CurrentTimePlugin.java | 49 ++-
.../apache/wiki/plugin/DefaultPluginManager.java | 33 +-
.../main/java/org/apache/wiki/plugin/Denounce.java | 76 ++--
.../main/java/org/apache/wiki/plugin/Groups.java | 7 +-
.../main/java/org/apache/wiki/plugin/IfPlugin.java | 25 +-
.../main/java/org/apache/wiki/plugin/Image.java | 109 +++---
.../java/org/apache/wiki/plugin/IndexPlugin.java | 60 ++--
.../java/org/apache/wiki/plugin/InsertPage.java | 91 ++---
.../org/apache/wiki/plugin/ListLocksPlugin.java | 11 +-
.../src/main/java/org/apache/wiki/plugin/Note.java | 33 +-
.../org/apache/wiki/plugin/PageViewPlugin.java | 13 +-
.../java/org/apache/wiki/plugin/PluginManager.java | 13 +-
.../apache/wiki/plugin/RecentChangesPlugin.java | 17 +-
.../apache/wiki/plugin/ReferredPagesPlugin.java | 16 +-
.../apache/wiki/plugin/ReferringPagesPlugin.java | 56 ++-
.../wiki/plugin/ReferringUndefinedPagesPlugin.java | 48 ++-
.../org/apache/wiki/plugin/SampleAjaxPlugin.java | 39 +--
.../main/java/org/apache/wiki/plugin/Search.java | 59 ++--
.../org/apache/wiki/plugin/SessionsPlugin.java | 8 +-
.../org/apache/wiki/plugin/TableOfContents.java | 76 ++--
.../apache/wiki/plugin/UndefinedPagesPlugin.java | 5 +-
.../org/apache/wiki/plugin/UnusedPagesPlugin.java | 5 +-
.../apache/wiki/plugin/WeblogArchivePlugin.java | 47 ++-
.../org/apache/wiki/plugin/WeblogEntryPlugin.java | 14 +-
.../java/org/apache/wiki/plugin/WeblogPlugin.java | 39 ++-
.../org/apache/wiki/preferences/Preferences.java | 17 +-
.../wiki/providers/AbstractFileProvider.java | 58 ++--
.../wiki/providers/BasicAttachmentProvider.java | 129 ++++---
.../wiki/providers/CachingAttachmentProvider.java | 201 +++++------
.../org/apache/wiki/providers/CachingProvider.java | 386 ++++++++-------------
.../apache/wiki/providers/FileSystemProvider.java | 19 +-
.../wiki/providers/VersioningFileProvider.java | 132 +++----
.../wiki/references/DefaultReferenceManager.java | 50 +--
.../apache/wiki/references/ReferenceManager.java | 10 +-
.../org/apache/wiki/render/CleanTextRenderer.java | 4 +-
.../org/apache/wiki/render/CreoleRenderer.java | 4 +-
.../wiki/render/DefaultRenderingManager.java | 44 +--
.../org/apache/wiki/render/RenderingManager.java | 30 +-
.../java/org/apache/wiki/render/WikiRenderer.java | 6 +-
.../apache/wiki/render/WysiwygEditingRenderer.java | 4 +-
.../java/org/apache/wiki/render/XHTMLRenderer.java | 4 +-
.../org/apache/wiki/rpc/atom/AtomAPIServlet.java | 11 +-
.../main/java/org/apache/wiki/rss/AtomFeed.java | 9 +-
.../src/main/java/org/apache/wiki/rss/Entry.java | 112 +++---
.../src/main/java/org/apache/wiki/rss/Feed.java | 8 +-
.../main/java/org/apache/wiki/rss/RSS10Feed.java | 7 +-
.../main/java/org/apache/wiki/rss/RSS20Feed.java | 58 ++--
.../java/org/apache/wiki/rss/RSSGenerator.java | 36 +-
.../main/java/org/apache/wiki/rss/RSSThread.java | 1 -
.../apache/wiki/search/BasicSearchProvider.java | 26 +-
.../apache/wiki/search/DefaultSearchManager.java | 9 +-
.../apache/wiki/search/LuceneSearchProvider.java | 32 +-
.../java/org/apache/wiki/search/SearchManager.java | 11 +-
.../java/org/apache/wiki/search/SearchMatcher.java | 2 +
.../org/apache/wiki/search/SearchProvider.java | 26 +-
.../apache/wiki/search/SearchResultComparator.java | 2 +
.../apache/wiki/tags/AttachmentsIteratorInfo.java | 8 +-
.../apache/wiki/tags/AttachmentsIteratorTag.java | 11 +-
.../java/org/apache/wiki/tags/CheckVersionTag.java | 14 +-
.../java/org/apache/wiki/tags/DiffLinkTag.java | 17 +-
.../java/org/apache/wiki/tags/EditLinkTag.java | 4 +-
.../org/apache/wiki/tags/HistoryIteratorInfo.java | 8 +-
.../org/apache/wiki/tags/HistoryIteratorTag.java | 9 +-
.../java/org/apache/wiki/tags/InsertPageTag.java | 10 +-
.../java/org/apache/wiki/tags/IteratorTag.java | 92 ++---
.../main/java/org/apache/wiki/tags/LinkTag.java | 13 +-
.../java/org/apache/wiki/tags/NoSuchPageTag.java | 10 +-
.../java/org/apache/wiki/tags/PermissionTag.java | 16 +-
.../apache/wiki/tags/SearchResultIteratorInfo.java | 20 +-
.../apache/wiki/tags/SearchResultIteratorTag.java | 28 +-
.../java/org/apache/wiki/tags/WikiBodyTag.java | 5 +-
.../java/org/apache/wiki/tags/WikiTagBase.java | 3 +-
.../org/apache/wiki/tasks/DefaultTasksManager.java | 4 +-
.../java/org/apache/wiki/tasks/TasksManager.java | 4 +-
.../wiki/tasks/pages/PreSaveWikiPageTask.java | 10 +-
.../java/org/apache/wiki/ui/AbstractCommand.java | 1 +
.../java/org/apache/wiki/ui/CommandResolver.java | 5 +-
.../org/apache/wiki/ui/DefaultCommandResolver.java | 10 +-
.../org/apache/wiki/ui/DefaultTemplateManager.java | 5 +-
.../main/java/org/apache/wiki/ui/GroupCommand.java | 5 +-
.../main/java/org/apache/wiki/ui/PageCommand.java | 5 +-
.../java/org/apache/wiki/ui/RedirectCommand.java | 6 +-
.../java/org/apache/wiki/ui/TemplateManager.java | 25 +-
.../main/java/org/apache/wiki/ui/WikiCommand.java | 5 +-
.../java/org/apache/wiki/ui/WikiServletFilter.java | 3 +-
.../wiki/ui/admin/beans/SearchManagerBean.java | 6 +-
.../org/apache/wiki/url/DefaultURLConstructor.java | 2 +-
.../wiki/variables/DefaultVariableManager.java | 28 +-
.../org/apache/wiki/variables/VariableManager.java | 14 +-
.../org/apache/wiki/xmlrpc/AbstractRPCHandler.java | 15 +-
.../org/apache/wiki/xmlrpc/MetaWeblogHandler.java | 32 +-
.../java/org/apache/wiki/xmlrpc/RPCHandler.java | 16 +-
.../org/apache/wiki/xmlrpc/RPCHandlerUTF8.java | 22 +-
.../org/apache/wiki/xmlrpc/WikiRPCHandler.java | 16 +-
jspwiki-main/src/test/java/SamplePlugin2.java | 24 +-
.../java/org/apache/wiki/PropertyReaderTest.java | 103 ------
.../src/test/java/org/apache/wiki/TestEngine.java | 5 +-
.../src/test/java/org/apache/wiki/Util.java | 45 ---
.../test/java/org/apache/wiki/WikiEngineTest.java | 7 +-
.../wiki/attachment/AttachmentManagerTest.java | 25 +-
.../apache/wiki/auth/AuthorizationManagerTest.java | 6 +-
.../java/org/apache/wiki/auth/UserManagerTest.java | 8 +-
.../wiki/auth/acl/DefaultAclManagerTest.java | 6 +-
.../org/apache/wiki/content/PageRenamerTest.java | 30 +-
.../java/org/apache/wiki/filters/TestFilter.java | 7 +-
.../apache/wiki/pages/DefaultPageManagerTest.java | 21 +-
.../java/org/apache/wiki/plugin/IfPluginTest.java | 13 +-
.../org/apache/wiki/plugin/JavaScriptPlugin.java | 12 +-
.../org/apache/wiki/plugin/PageViewPluginTest.java | 30 +-
.../java/org/apache/wiki/plugin/SamplePlugin.java | 27 +-
.../java/org/apache/wiki/plugin/SamplePlugin3.java | 24 +-
.../providers/BasicAttachmentProviderTest.java | 26 +-
.../apache/wiki/providers/CachingProviderTest.java | 4 +-
.../org/apache/wiki/providers/CounterProvider.java | 69 ++--
.../wiki/providers/VersioningFileProviderTest.java | 48 +--
.../apache/wiki/providers/VerySimpleProvider.java | 74 ++--
.../wiki/references/ReferenceManagerTest.java | 3 +-
.../apache/wiki/render/RenderingManagerTest.java | 6 +-
.../java/org/apache/wiki/rss/RSSGeneratorTest.java | 6 +-
.../org/apache/wiki/search/SearchManagerTest.java | 1 +
.../apache/wiki/stress/MassiveRepositoryTest.java | 2 +-
.../wiki/stress/StressTestVersioningProvider.java | 8 +-
.../org/apache/wiki/ui/CommandResolverTest.java | 4 +-
.../java/org/apache/wiki/ui/GroupCommandTest.java | 9 +-
.../java/org/apache/wiki/ui/PageCommandTest.java | 5 +-
.../org/apache/wiki/ui/RedirectCommandTest.java | 5 +-
.../java/org/apache/wiki/ui/WikiCommandTest.java | 7 +-
.../apache/wiki/workflow/ApprovalWorkflowTest.java | 74 ++--
.../org/apache/wiki/xmlrpc/RPCHandlerTest.java | 7 +-
.../wiki/markdown/MarkdownForJSPWikiExtension.java | 6 +-
.../ExternalLinkAttributeProviderState.java | 6 +-
.../ImageLinkAttributeProviderState.java | 8 +-
.../InterWikiLinkAttributeProviderState.java | 8 +-
.../JSPWikiLinkAttributeProvider.java | 6 +-
.../JSPWikiLinkAttributeProviderFactory.java | 6 +-
.../LocalEditLinkAttributeProviderState.java | 6 +-
.../LocalFootnoteLinkAttributeProviderState.java | 9 +-
...LocalFootnoteRefLinkAttributeProviderState.java | 9 +-
.../LocalLinkAttributeProviderState.java | 5 +-
.../LocalReadLinkAttributeProviderState.java | 9 +-
.../WysiwygEditingAttributeProviderState.java | 8 +-
.../AccessRuleLinkNodePostProcessorState.java | 10 +-
.../ExternalLinkNodePostProcessorState.java | 6 +-
.../ImageLinkNodePostProcessorState.java | 4 +-
.../InterWikiLinkNodePostProcessorState.java | 8 +-
.../JSPWikiLinkNodePostProcessor.java | 6 +-
.../JSPWikiNodePostProcessorFactory.java | 6 +-
.../LocalFootnoteLinkNodePostProcessorState.java | 5 +-
...LocalFootnoteRefLinkNodePostProcessorState.java | 5 +-
.../LocalLinkNodePostProcessorState.java | 5 +-
.../MetadataLinkNodePostProcessorState.java | 8 +-
.../NodePostProcessorStateCommonOperations.java | 5 +-
.../PluginLinkNodePostProcessorState.java | 14 +-
.../VariableLinkNodePostProcessorState.java | 8 +-
.../renderer/JSPWikiNodeRendererFactory.java | 6 +-
.../wiki/parser/markdown/MarkdownDocument.java | 8 +-
.../wiki/parser/markdown/MarkdownParser.java | 4 +-
.../wiki/render/markdown/MarkdownRenderer.java | 4 +-
.../wiki/render/markdown/MarkdownRendererTest.java | 2 +-
.../wiki/search/tika/TikaSearchProvider.java | 3 +-
.../org/apache/wiki/util/PropertyReaderTest.java | 88 ++++-
jspwiki-war/pom.xml | 6 +
jspwiki-war/src/main/webapp/Comment.jsp | 41 ++-
jspwiki-war/src/main/webapp/Delete.jsp | 20 +-
jspwiki-war/src/main/webapp/Edit.jsp | 10 +-
jspwiki-war/src/main/webapp/Search.jsp | 19 +-
jspwiki-war/src/main/webapp/rss.jsp | 8 +-
.../src/main/webapp/templates/210/InfoContent.jsp | 13 +-
.../main/webapp/templates/210/editors/CKeditor.jsp | 19 +-
.../src/main/webapp/templates/210/editors/FCK.jsp | 21 +-
.../main/webapp/templates/210/editors/TinyMCE.jsp | 18 +-
.../main/webapp/templates/210/editors/plain.jsp | 4 +-
.../main/webapp/templates/210/editors/preview.jsp | 3 +-
.../main/webapp/templates/210/editors/wysiwyg.jsp | 4 +-
.../main/webapp/templates/default/AJAXSearch.jsp | 27 +-
.../main/webapp/templates/default/InfoContent.jsp | 11 +-
.../webapp/templates/default/editors/CKeditor.jsp | 28 +-
.../webapp/templates/default/editors/TinyMCE.jsp | 52 ++-
.../webapp/templates/default/editors/plain.jsp | 4 +-
.../webapp/templates/default/editors/preview.jsp | 3 +-
.../webapp/templates/default/editors/wysiwyg.jsp | 21 +-
pom.xml | 6 +-
301 files changed, 3918 insertions(+), 3829 deletions(-)
copy {jspwiki-tika-searchprovider => jspwiki-210-adapters}/pom.xml (83%)
copy {jspwiki-main =>
jspwiki-210-adapters}/src/main/java/org/apache/wiki/WikiProvider.java (77%)
create mode 100644
jspwiki-210-adapters/src/main/java/org/apache/wiki/api/filters/BasicPageFilter.java
copy {jspwiki-main =>
jspwiki-210-adapters}/src/main/java/org/apache/wiki/api/plugin/WikiPlugin.java
(50%)
copy {jspwiki-main =>
jspwiki-210-adapters}/src/main/java/org/apache/wiki/providers/WikiAttachmentProvider.java
(97%)
copy {jspwiki-main =>
jspwiki-210-adapters}/src/main/java/org/apache/wiki/providers/WikiPageProvider.java
(97%)
copy jspwiki-main/src/main/java/org/apache/wiki/providers/FastSearch.java =>
jspwiki-210-adapters/src/main/java/org/apache/wiki/search/QueryItem.java (67%)
copy {jspwiki-main =>
jspwiki-210-adapters}/src/main/java/org/apache/wiki/search/SearchResult.java
(70%)
create mode 100644
jspwiki-210-adapters/src/test/java/org/apache/wiki/filters/FilterFrom210Test.java
create mode 100644
jspwiki-210-adapters/src/test/java/org/apache/wiki/plugin/PluginFrom210Test.java
copy jspwiki-main/src/main/java/org/apache/wiki/tasks/pages/package.html =>
jspwiki-210-adapters/src/test/resources/filters.xml (78%)
copy {jspwiki-tika-searchprovider => jspwiki-210-test-adaptees}/pom.xml (74%)
create mode 100644
jspwiki-210-test-adaptees/src/main/java/com/example/filters/TwoXFilter.java
copy jspwiki-main/src/main/java/org/apache/wiki/xmlrpc/WikiRPCHandler.java =>
jspwiki-210-test-adaptees/src/main/java/com/example/plugins/TwoXPlugin.java
(67%)
copy
jspwiki-main/src/main/java/org/apache/wiki/api/exceptions/FilterException.java
=>
jspwiki-210-test-adaptees/src/test/java/com/example/filters/TwoXFilterTest.java
(67%)
copy
jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Resources/en.lproj/Localizable.strings
=>
jspwiki-210-test-adaptees/src/test/java/com/example/plugins/TwoXPluginTest.java
(71%)
copy {jspwiki-tika-searchprovider => jspwiki-api}/pom.xml (75%)
rename {jspwiki-main =>
jspwiki-api}/src/main/java/org/apache/wiki/api/Release.java (99%)
copy {jspwiki-main/src/main/java/org/apache/wiki/auth/acl =>
jspwiki-api/src/main/java/org/apache/wiki/api/core}/Acl.java (52%)
copy {jspwiki-main/src/main/java/org/apache/wiki/auth/acl =>
jspwiki-api/src/main/java/org/apache/wiki/api/core}/AclEntry.java (56%)
copy {jspwiki-main/src/main/java/org/apache/wiki/attachment =>
jspwiki-api/src/main/java/org/apache/wiki/api/core}/Attachment.java (56%)
rename {jspwiki-main/src/main/java/org/apache/wiki/ui =>
jspwiki-api/src/main/java/org/apache/wiki/api/core}/Command.java (88%)
create mode 100644
jspwiki-api/src/main/java/org/apache/wiki/api/core/Context.java
rename {jspwiki-main =>
jspwiki-api}/src/main/java/org/apache/wiki/api/core/Engine.java (100%)
create mode 100644 jspwiki-api/src/main/java/org/apache/wiki/api/core/Page.java
rename {jspwiki-main =>
jspwiki-api}/src/main/java/org/apache/wiki/api/core/Session.java (100%)
copy {jspwiki-main =>
jspwiki-api}/src/main/java/org/apache/wiki/api/core/package.html (100%)
rename {jspwiki-main =>
jspwiki-api}/src/main/java/org/apache/wiki/api/exceptions/FilterException.java
(96%)
rename {jspwiki-main =>
jspwiki-api}/src/main/java/org/apache/wiki/api/exceptions/NoRequiredPropertyException.java
(94%)
rename {jspwiki-main =>
jspwiki-api}/src/main/java/org/apache/wiki/api/exceptions/NoSuchVariableException.java
(95%)
rename {jspwiki-main =>
jspwiki-api}/src/main/java/org/apache/wiki/api/exceptions/PluginException.java
(92%)
rename {jspwiki-main =>
jspwiki-api}/src/main/java/org/apache/wiki/api/exceptions/ProviderException.java
(96%)
rename {jspwiki-main =>
jspwiki-api}/src/main/java/org/apache/wiki/api/exceptions/RedirectException.java
(95%)
rename {jspwiki-main =>
jspwiki-api}/src/main/java/org/apache/wiki/api/exceptions/WikiException.java
(92%)
rename {jspwiki-main =>
jspwiki-api}/src/main/java/org/apache/wiki/api/exceptions/WikiI18nException.java
(96%)
rename {jspwiki-main =>
jspwiki-api}/src/main/java/org/apache/wiki/api/exceptions/package.html (100%)
rename
jspwiki-main/src/main/java/org/apache/wiki/api/filters/BasicPageFilter.java =>
jspwiki-api/src/main/java/org/apache/wiki/api/filters/BasePageFilter.java (76%)
create mode 100644
jspwiki-api/src/main/java/org/apache/wiki/api/filters/FilterSupportOperations.java
create mode 100644
jspwiki-api/src/main/java/org/apache/wiki/api/filters/PageFilter.java
copy {jspwiki-main =>
jspwiki-api}/src/main/java/org/apache/wiki/api/filters/package.html (100%)
rename {jspwiki-main =>
jspwiki-api}/src/main/java/org/apache/wiki/api/package.html (100%)
rename {jspwiki-main =>
jspwiki-api}/src/main/java/org/apache/wiki/api/plugin/InitializablePlugin.java
(100%)
rename {jspwiki-main =>
jspwiki-api}/src/main/java/org/apache/wiki/api/plugin/ParserStagePlugin.java
(90%)
rename jspwiki-main/src/main/java/org/apache/wiki/api/plugin/WikiPlugin.java
=> jspwiki-api/src/main/java/org/apache/wiki/api/plugin/Plugin.java (61%)
rename {jspwiki-main =>
jspwiki-api}/src/main/java/org/apache/wiki/api/plugin/PluginElement.java (94%)
rename {jspwiki-main =>
jspwiki-api}/src/main/java/org/apache/wiki/api/plugin/package.html (100%)
rename
jspwiki-main/src/main/java/org/apache/wiki/providers/WikiAttachmentProvider.java
=>
jspwiki-api/src/main/java/org/apache/wiki/api/providers/AttachmentProvider.java
(91%)
rename
jspwiki-main/src/main/java/org/apache/wiki/providers/WikiPageProvider.java =>
jspwiki-api/src/main/java/org/apache/wiki/api/providers/PageProvider.java (89%)
rename {jspwiki-main/src/main/java/org/apache/wiki =>
jspwiki-api/src/main/java/org/apache/wiki/api/providers}/WikiProvider.java (97%)
rename {jspwiki-main/src/main/java/org/apache/wiki/api/filters =>
jspwiki-api/src/main/java/org/apache/wiki/api/providers}/package.html (89%)
rename {jspwiki-main/src/main/java/org/apache/wiki =>
jspwiki-api/src/main/java/org/apache/wiki/api}/search/QueryItem.java (97%)
rename {jspwiki-main/src/main/java/org/apache/wiki =>
jspwiki-api/src/main/java/org/apache/wiki/api}/search/SearchResult.java (93%)
rename {jspwiki-main/src/main/java/org/apache/wiki/api/core =>
jspwiki-api/src/main/java/org/apache/wiki/api/search}/package.html (87%)
copy {jspwiki-util => jspwiki-event}/pom.xml (67%)
rename {jspwiki-main =>
jspwiki-event}/src/main/java/org/apache/wiki/event/WikiEngineEvent.java (100%)
rename {jspwiki-main =>
jspwiki-event}/src/main/java/org/apache/wiki/event/WikiEvent.java (100%)
rename {jspwiki-main =>
jspwiki-event}/src/main/java/org/apache/wiki/event/WikiEventListener.java (100%)
rename {jspwiki-main =>
jspwiki-event}/src/main/java/org/apache/wiki/event/WikiEventManager.java (100%)
rename {jspwiki-main =>
jspwiki-event}/src/main/java/org/apache/wiki/event/WikiPageEvent.java (93%)
rename {jspwiki-main =>
jspwiki-event}/src/main/java/org/apache/wiki/event/WikiPageRenameEvent.java
(100%)
rename {jspwiki-main =>
jspwiki-event}/src/main/java/org/apache/wiki/event/WikiSecurityEvent.java (100%)
rename {jspwiki-main =>
jspwiki-event}/src/main/java/org/apache/wiki/event/WorkflowEvent.java (100%)
delete mode 100644
jspwiki-main/src/main/java/org/apache/wiki/api/filters/PageFilter.java
delete mode 100644
jspwiki-main/src/test/java/org/apache/wiki/PropertyReaderTest.java
delete mode 100644 jspwiki-main/src/test/java/org/apache/wiki/Util.java
