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 35ed48e revert, again, maven-javadoc-plugin to 3.1.1 as it was
causing build errors at builds.a.o
new 201c48c JSPWIKI-303: SPI to obtain Engine instances
new 245e478 format method
new d8d8df3 Deprecate WikiContext#findContext and move it to Context. Use
the new method from the public api throughout the code
new cd85300 refactor SPI's DSL:
new 08b62cd apply format & fixes suggested by intellij
new b5324b4 JSPWIKI-303: added ContextSPI
new c81e0b3 Deprecate WikiSession#sessions( Engine ) and
WikiSession#userPrincipals( Engine ) in favour of their counterparts at
SessionMonitor
new 40e0021 add format & fixes suggested by IntelliJ
new 9b256b6 rename EngineSPI#getInstance to EngineSPI#find
new dd84c1a JSPWIKI-303: add session spi and use it throughout the code
new e873847 JSPWIKI-303: SPI to create Pages and Attachments + use all
available SPIs throughout the code
new d97ea47 use Page/Attachment SPI
new 8a056d7 JSPWIKI-303: Acl / AclEntry SPI
new 6055ae0 don't use deprecated code
new 13a7e66 extract command list with request context, url pattern and
content template to its own Enum
new 7706acf use ContextEnum.PAGE_VIEW.getRequestContext() instead of
WikiContext.VIEW
new ce80e1a more substitutions of WikiContext constants with ContextEnum
ones
new b051cde more substitutions of WikiContext constants with ContextEnum
ones
new 2992073 add deepClone operation
new df055a1 more substitutions of WikiContext constants with ContextEnum
ones
new e298f5b use public api on admin area
new 460263e use public api on 210 template
new 8ea3185 use public api on reader template
new 45be0f8 reorder alphabetically ContextEnum derived constants so
they're easier to locate
new e8d84a6 use public api on default template
new 9df1965 use constant from ContextEnum
new 91a3f76 fix JSP compilation problems
new 2d2bb51 use public api on top level JSPs
new ef5b052 update doclet version
new d223f2a Honor page ACLs on SisterSites.jsp + proper attachment
detection
new f0a174d fix possible-but-improbable npe
new 187559e Tomcat8 -> Tomcat9
new 98b1bfe remove use of deprecated code
new 6fcb492 update cargo to 1.7.11
new 0844469 JSPWIKI-806: add the possibility of loading custom managers
on WikiEngine (was: EntityManager Proposal)
new 168cd47 2.11.0-M7-git-16
The 36 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 | 34 +++++
jspwiki-api/pom.xml | 12 ++
.../src/main/java/org/apache/wiki/api/Release.java | 2 +-
.../java/org/apache/wiki/api/core/Context.java | 23 ++++
.../java/org/apache/wiki/api/core/ContextEnum.java | 58 +++++++++
.../ProviderException.java => spi/AclsDSL.java} | 35 ++++--
.../main/java/org/apache/wiki/api/spi/AclsSPI.java | 26 ++--
.../java/org/apache/wiki/api/spi/ContentsDSL.java | 57 +++++++++
.../java/org/apache/wiki/api/spi/ContentsSPI.java | 50 ++++++++
.../java/org/apache/wiki/api/spi/ContextDSL.java | 64 ++++++++++
.../java/org/apache/wiki/api/spi/ContextSPI.java | 71 +++++++++++
.../java/org/apache/wiki/api/spi/EngineDSL.java | 68 ++++++++++
.../java/org/apache/wiki/api/spi/EngineSPI.java | 22 ++--
.../java/org/apache/wiki/api/spi/SessionDSL.java | 76 +++++++++++
.../java/org/apache/wiki/api/spi/SessionSPI.java | 64 ++++++++++
.../main/java/org/apache/wiki/api/spi/Wiki.java | 116 +++++++++++++++++
.../api/spi/WikiSPIServletContextListener.java | 20 +++
.../org/apache/wiki/api/{core => spi}/package.html | 7 +-
.../src/main/webapp/WEB-INF/web.xml | 5 +
.../src/main/webapp/WEB-INF/web.xml | 5 +
.../src/main/webapp/WEB-INF/web.xml | 5 +
.../src/main/webapp/WEB-INF/web.xml | 5 +
.../src/main/webapp/WEB-INF/web.xml | 5 +
.../src/main/java/org/apache/wiki/WikiContext.java | 139 +++++++++++----------
.../src/main/java/org/apache/wiki/WikiEngine.java | 38 ++++--
.../src/main/java/org/apache/wiki/WikiPage.java | 2 +-
.../src/main/java/org/apache/wiki/WikiServlet.java | 3 +-
.../src/main/java/org/apache/wiki/WikiSession.java | 6 +
.../wiki/ajax/WikiAjaxDispatcherServlet.java | 9 +-
.../apache/wiki/attachment/AttachmentServlet.java | 22 ++--
.../wiki/attachment/DefaultAttachmentManager.java | 4 +-
.../wiki/auth/DefaultAuthenticationManager.java | 6 +-
.../wiki/auth/DefaultAuthorizationManager.java | 4 +-
.../java/org/apache/wiki/auth/SessionMonitor.java | 6 +-
.../org/apache/wiki/auth/acl/AclEntryImpl.java | 116 ++++++++---------
.../java/org/apache/wiki/auth/acl/AclImpl.java | 4 +-
.../apache/wiki/auth/acl/DefaultAclManager.java | 10 +-
.../auth/login/WebContainerCallbackHandler.java | 2 +-
.../apache/wiki/filters/PingWeblogsComFilter.java | 6 +-
.../java/org/apache/wiki/filters/SpamFilter.java | 12 +-
.../main/java/org/apache/wiki/forms/FormOpen.java | 4 +-
.../java/org/apache/wiki/forms/FormOutput.java | 4 +-
.../htmltowiki/HtmlStringToWikiTranslator.java | 34 ++---
.../apache/wiki/htmltowiki/XHtmlToWikiConfig.java | 10 +-
.../org/apache/wiki/pages/DefaultPageManager.java | 7 +-
.../apache/wiki/parser/JSPWikiMarkupParser.java | 34 +++--
.../java/org/apache/wiki/parser/PluginContent.java | 4 +-
.../org/apache/wiki/plugin/BugReportHandler.java | 5 +-
.../main/java/org/apache/wiki/plugin/Groups.java | 4 +-
.../main/java/org/apache/wiki/plugin/Image.java | 4 +-
.../java/org/apache/wiki/plugin/IndexPlugin.java | 4 +-
.../java/org/apache/wiki/plugin/InsertPage.java | 8 +-
.../src/main/java/org/apache/wiki/plugin/Note.java | 4 +-
.../org/apache/wiki/plugin/PageViewPlugin.java | 4 +-
.../apache/wiki/plugin/RecentChangesPlugin.java | 4 +-
.../apache/wiki/plugin/ReferredPagesPlugin.java | 4 +-
.../apache/wiki/plugin/ReferringPagesPlugin.java | 16 ++-
.../main/java/org/apache/wiki/plugin/Search.java | 4 +-
.../apache/wiki/plugin/WeblogArchivePlugin.java | 4 +-
.../org/apache/wiki/plugin/WeblogEntryPlugin.java | 8 +-
.../java/org/apache/wiki/plugin/WeblogPlugin.java | 10 +-
.../org/apache/wiki/preferences/Preferences.java | 3 +-
.../wiki/providers/AbstractFileProvider.java | 4 +-
.../wiki/providers/BasicAttachmentProvider.java | 9 +-
.../org/apache/wiki/providers/CachingProvider.java | 5 +-
.../wiki/providers/VersioningFileProvider.java | 4 +-
.../wiki/references/DefaultReferenceManager.java | 4 +-
.../wiki/render/DefaultRenderingManager.java | 9 +-
.../org/apache/wiki/rpc/atom/AtomAPIServlet.java | 13 +-
.../main/java/org/apache/wiki/rss/AtomFeed.java | 6 +-
.../org/apache/wiki/rss/DefaultRSSGenerator.java | 29 +++--
.../main/java/org/apache/wiki/rss/RSS10Feed.java | 6 +-
.../main/java/org/apache/wiki/rss/RSS20Feed.java | 4 +-
.../apache/wiki/search/DefaultSearchManager.java | 8 +-
.../apache/wiki/search/LuceneSearchProvider.java | 6 +-
.../java/org/apache/wiki/search/SearchMatcher.java | 10 +-
.../org/apache/wiki/spi/AclsSPIDefaultImpl.java | 26 ++--
.../apache/wiki/spi/ContentsSPIDefaultImpl.java | 32 +++--
.../org/apache/wiki/spi/ContextSPIDefaultImpl.java | 70 +++++++++++
.../org/apache/wiki/spi/EngineSPIDefaultImpl.java} | 26 ++--
.../SessionSPIDefaultImpl.java} | 40 +++---
.../org/apache/wiki/tags/AdminBeanIteratorTag.java | 4 +-
.../apache/wiki/tags/AttachmentsIteratorTag.java | 3 +-
.../main/java/org/apache/wiki/tags/AuthorTag.java | 4 +-
.../java/org/apache/wiki/tags/BreadcrumbsTag.java | 4 +-
.../java/org/apache/wiki/tags/CalendarTag.java | 4 +-
.../java/org/apache/wiki/tags/CommentLinkTag.java | 4 +-
.../main/java/org/apache/wiki/tags/ContentTag.java | 22 ++--
.../java/org/apache/wiki/tags/DiffLinkTag.java | 4 +-
.../java/org/apache/wiki/tags/EditLinkTag.java | 8 +-
.../org/apache/wiki/tags/EditorIteratorTag.java | 8 +-
.../org/apache/wiki/tags/FeedDiscoveryTag.java | 15 +--
.../org/apache/wiki/tags/HistoryIteratorTag.java | 5 +-
.../java/org/apache/wiki/tags/InsertDiffTag.java | 9 +-
.../java/org/apache/wiki/tags/IteratorTag.java | 17 +--
.../main/java/org/apache/wiki/tags/LinkTag.java | 20 +--
.../main/java/org/apache/wiki/tags/LinkToTag.java | 6 +-
.../java/org/apache/wiki/tags/PageInfoLinkTag.java | 4 +-
.../java/org/apache/wiki/tags/PageNameTag.java | 6 +-
.../java/org/apache/wiki/tags/PageSizeTag.java | 4 +-
.../org/apache/wiki/tags/ParentPageNameTag.java | 6 +-
.../java/org/apache/wiki/tags/RSSImageLinkTag.java | 4 +-
.../apache/wiki/tags/SearchResultIteratorTag.java | 14 ++-
.../java/org/apache/wiki/tags/TranslateTag.java | 7 +-
.../java/org/apache/wiki/tags/UploadLinkTag.java | 61 ++++-----
.../java/org/apache/wiki/tags/UserNameTag.java | 11 +-
.../java/org/apache/wiki/tags/UserProfileTag.java | 10 +-
.../java/org/apache/wiki/tags/WikiTagBase.java | 5 +-
.../wiki/tasks/auth/SaveUserProfileTask.java | 4 +-
.../org/apache/wiki/ui/DefaultCommandResolver.java | 4 +-
.../org/apache/wiki/ui/DefaultEditorManager.java | 4 +-
.../org/apache/wiki/ui/DefaultTemplateManager.java | 3 +-
.../src/main/java/org/apache/wiki/ui/Editor.java | 8 +-
.../main/java/org/apache/wiki/ui/GroupCommand.java | 32 ++---
.../main/java/org/apache/wiki/ui/Installer.java | 7 +-
.../main/java/org/apache/wiki/ui/PageCommand.java | 66 ++++------
.../java/org/apache/wiki/ui/RedirectCommand.java | 13 +-
.../main/java/org/apache/wiki/ui/WikiCommand.java | 72 ++++++-----
.../java/org/apache/wiki/ui/WikiServletFilter.java | 4 +-
.../org/apache/wiki/url/DefaultURLConstructor.java | 10 +-
.../org/apache/wiki/url/ShortURLConstructor.java | 44 +++----
.../apache/wiki/url/ShortViewURLConstructor.java | 8 +-
.../org/apache/wiki/xmlrpc/MetaWeblogHandler.java | 18 +--
.../java/org/apache/wiki/xmlrpc/RPCHandler.java | 11 +-
.../org/apache/wiki/xmlrpc/RPCHandlerUTF8.java | 10 +-
.../java/org/apache/wiki/xmlrpc/RPCServlet.java | 36 +++---
.../services/org.apache.wiki.api.spi.AclsSPI | 1 +
.../services/org.apache.wiki.api.spi.ContentsSPI | 1 +
.../services/org.apache.wiki.api.spi.ContextSPI | 1 +
.../services/org.apache.wiki.api.spi.EngineSPI | 1 +
.../services/org.apache.wiki.api.spi.SessionSPI | 1 +
.../src/test/java/org/apache/wiki/TestEngine.java | 40 +++---
.../test/java/org/apache/wiki/WikiEngineTest.java | 24 ++--
.../test/java/org/apache/wiki/WikiSessionTest.java | 21 ++--
.../wiki/attachment/AttachmentManagerTest.java | 42 +++----
.../wiki/auth/AuthenticationManagerTest.java | 4 +-
.../java/org/apache/wiki/auth/UserManagerTest.java | 50 ++++----
.../java/org/apache/wiki/auth/acl/AclImplTest.java | 23 ++--
.../wiki/auth/acl/DefaultAclManagerTest.java | 7 +-
.../org/apache/wiki/content/PageRenamerTest.java | 19 +--
.../wiki/diff/ContextualDiffProviderTest.java | 137 +++++++++-----------
.../apache/wiki/pages/DefaultPageManagerTest.java | 8 +-
.../java/org/apache/wiki/pages/PageLockTest.java | 15 +--
.../apache/wiki/pages/PageTimeComparatorTest.java | 9 +-
.../wiki/parser/JSPWikiMarkupParserTest.java | 56 +++++----
.../org/apache/wiki/plugin/CounterPluginTest.java | 32 +++--
.../wiki/plugin/DefaultPluginManagerTest.java | 4 +-
.../org/apache/wiki/plugin/PageViewPluginTest.java | 30 ++---
.../wiki/plugin/RecentChangesPluginTest.java | 14 +--
.../wiki/plugin/ReferringPagesPluginTest.java | 77 +++++-------
.../plugin/ReferringUndefinedPagesPluginTest.java | 14 ++-
.../wiki/plugin/UndefinedPagesPluginTest.java | 10 +-
.../providers/BasicAttachmentProviderTest.java | 26 ++--
.../org/apache/wiki/providers/CounterProvider.java | 27 ++--
.../wiki/providers/VersioningFileProviderTest.java | 35 +++---
.../apache/wiki/providers/VerySimpleProvider.java | 4 +-
.../wiki/references/ReferenceManagerTest.java | 4 +-
.../org/apache/wiki/render/CreoleRendererTest.java | 57 ++++-----
.../wiki/render/WysiwygEditingRendererTest.java | 9 +-
.../java/org/apache/wiki/rss/RSSGeneratorTest.java | 11 +-
.../org/apache/wiki/search/SearchManagerTest.java | 10 +-
.../org/apache/wiki/ui/CommandResolverTest.java | 45 ++++---
.../org/apache/wiki/ui/InputValidatorTest.java | 14 +--
.../apache/wiki/ui/admin/beans/FilterBeanTest.java | 37 +++---
.../apache/wiki/ui/admin/beans/PluginBeanTest.java | 39 +++---
.../apache/wiki/url/DefaultURLConstructorTest.java | 58 ++++-----
.../apache/wiki/url/ShortURLConstructorTest.java | 58 ++++-----
.../wiki/url/ShortViewURLConstructorTest.java | 58 ++++-----
.../wiki/variables/DefaultVariableManagerTest.java | 8 +-
.../org/apache/wiki/xmlrpc/RPCHandlerTest.java | 12 +-
jspwiki-main/src/test/resources/WEB-INF/web.xml | 5 +
.../ImageLinkAttributeProviderState.java | 4 +-
.../LocalLinkAttributeProviderState.java | 4 +-
.../LocalFootnoteLinkNodePostProcessorState.java | 4 +-
...LocalFootnoteRefLinkNodePostProcessorState.java | 4 +-
.../LocalLinkNodePostProcessorState.java | 16 +--
.../NodePostProcessorStateCommonOperations.java | 4 +-
.../wiki/render/markdown/MarkdownRendererTest.java | 25 ++--
.../main/java/org/apache/wiki/util/ClassUtil.java | 25 ++--
.../java/org/apache/wiki/util/PropertyReader.java | 131 +++++++++----------
jspwiki-war/src/main/webapp/Captcha.jsp | 8 +-
jspwiki-war/src/main/webapp/Comment.jsp | 12 +-
jspwiki-war/src/main/webapp/CookieError.jsp | 6 +-
jspwiki-war/src/main/webapp/Delete.jsp | 10 +-
jspwiki-war/src/main/webapp/DeleteGroup.jsp | 6 +-
jspwiki-war/src/main/webapp/Diff.jsp | 27 ++--
jspwiki-war/src/main/webapp/Edit.jsp | 12 +-
jspwiki-war/src/main/webapp/EditGroup.jsp | 6 +-
jspwiki-war/src/main/webapp/Error.jsp | 9 +-
jspwiki-war/src/main/webapp/Group.jsp | 6 +-
jspwiki-war/src/main/webapp/Install.jsp | 6 +-
jspwiki-war/src/main/webapp/Login.jsp | 10 +-
jspwiki-war/src/main/webapp/LoginForm.jsp | 10 +-
jspwiki-war/src/main/webapp/Logout.jsp | 4 +-
jspwiki-war/src/main/webapp/LostPassword.jsp | 14 ++-
jspwiki-war/src/main/webapp/Message.jsp | 8 +-
jspwiki-war/src/main/webapp/NewBlogEntry.jsp | 14 +--
jspwiki-war/src/main/webapp/NewGroup.jsp | 10 +-
jspwiki-war/src/main/webapp/PageInfo.jsp | 7 +-
jspwiki-war/src/main/webapp/PageModified.jsp | 6 +-
jspwiki-war/src/main/webapp/Preview.jsp | 6 +-
jspwiki-war/src/main/webapp/Rename.jsp | 8 +-
jspwiki-war/src/main/webapp/Search.jsp | 6 +-
jspwiki-war/src/main/webapp/SisterSites.jsp | 38 +++---
jspwiki-war/src/main/webapp/Upload.jsp | 6 +-
jspwiki-war/src/main/webapp/UserPreferences.jsp | 13 +-
jspwiki-war/src/main/webapp/WEB-INF/web.xml | 5 +
jspwiki-war/src/main/webapp/Wiki.jsp | 7 +-
jspwiki-war/src/main/webapp/Workflow.jsp | 9 +-
jspwiki-war/src/main/webapp/XHRHtml2Markup.jsp | 6 +-
jspwiki-war/src/main/webapp/admin/Admin.jsp | 6 +-
.../src/main/webapp/admin/SecurityConfig.jsp | 6 +-
jspwiki-war/src/main/webapp/rss.jsp | 7 +-
.../main/webapp/templates/210/AttachmentTab.jsp | 8 +-
.../main/webapp/templates/210/CommentContent.jsp | 6 +-
.../src/main/webapp/templates/210/DiffTab.jsp | 4 +-
.../src/main/webapp/templates/210/EditContent.jsp | 6 +-
.../main/webapp/templates/210/EditGroupContent.jsp | 6 +-
.../src/main/webapp/templates/210/Favorites.jsp | 2 +-
.../src/main/webapp/templates/210/FindContent.jsp | 2 +-
.../src/main/webapp/templates/210/Footer.jsp | 4 +-
.../src/main/webapp/templates/210/GroupContent.jsp | 10 +-
.../src/main/webapp/templates/210/GroupTab.jsp | 8 +-
.../src/main/webapp/templates/210/Header.jsp | 4 +-
.../src/main/webapp/templates/210/InfoContent.jsp | 15 ++-
.../src/main/webapp/templates/210/LoginContent.jsp | 7 +-
.../main/webapp/templates/210/NewGroupContent.jsp | 2 +-
.../webapp/templates/210/PageActionsBottom.jsp | 6 +-
.../main/webapp/templates/210/PageActionsTop.jsp | 2 +-
.../src/main/webapp/templates/210/PageContent.jsp | 6 +-
.../src/main/webapp/templates/210/PageTab.jsp | 7 +-
.../webapp/templates/210/PreferencesContent.jsp | 4 +-
.../main/webapp/templates/210/PreferencesTab.jsp | 10 +-
.../src/main/webapp/templates/210/ProfileTab.jsp | 4 +-
.../main/webapp/templates/210/UploadTemplate.jsp | 8 +-
.../src/main/webapp/templates/210/UserBox.jsp | 4 +-
.../src/main/webapp/templates/210/ViewTemplate.jsp | 2 +-
.../main/webapp/templates/210/WorkflowContent.jsp | 2 +-
.../webapp/templates/210/admin/AdminTemplate.jsp | 7 +-
.../webapp/templates/210/admin/UserManagement.jsp | 2 +-
.../src/main/webapp/templates/210/commonheader.jsp | 6 +-
.../main/webapp/templates/210/editors/CKeditor.jsp | 10 +-
.../src/main/webapp/templates/210/editors/FCK.jsp | 5 +-
.../main/webapp/templates/210/editors/TinyMCE.jsp | 8 +-
.../main/webapp/templates/210/editors/plain.jsp | 5 +-
.../main/webapp/templates/210/editors/preview.jsp | 7 +-
.../main/webapp/templates/210/editors/wysiwyg.jsp | 5 +-
.../webapp/templates/default/AJAXCategories.jsp | 12 +-
.../main/webapp/templates/default/AJAXPreview.jsp | 11 +-
.../main/webapp/templates/default/AJAXSearch.jsp | 8 +-
.../webapp/templates/default/AttachmentTab.jsp | 8 +-
.../src/main/webapp/templates/default/DiffTab.jsp | 4 +-
.../main/webapp/templates/default/EditContent.jsp | 4 +-
.../webapp/templates/default/EditGroupContent.jsp | 6 +-
.../main/webapp/templates/default/FindContent.jsp | 2 +-
.../src/main/webapp/templates/default/GroupTab.jsp | 4 +-
.../src/main/webapp/templates/default/Header.jsp | 2 +-
.../main/webapp/templates/default/InfoContent.jsp | 11 +-
.../main/webapp/templates/default/LoginContent.jsp | 7 +-
.../src/main/webapp/templates/default/Nav.jsp | 4 +-
.../main/webapp/templates/default/PageContent.jsp | 6 +-
.../src/main/webapp/templates/default/PageTab.jsp | 7 +-
.../templates/default/PreferencesContent.jsp | 2 +-
.../webapp/templates/default/PreferencesTab.jsp | 4 +-
.../main/webapp/templates/default/ProfileTab.jsp | 4 +-
.../src/main/webapp/templates/default/Sidebar.jsp | 4 +-
.../webapp/templates/default/UploadTemplate.jsp | 2 +-
.../src/main/webapp/templates/default/UserBox.jsp | 4 +-
.../webapp/templates/default/WorkflowContent.jsp | 2 +-
.../templates/default/admin/AdminTemplate.jsp | 7 +-
.../templates/default/admin/UserManagement.jsp | 2 +-
.../main/webapp/templates/default/commonheader.jsp | 4 +-
.../webapp/templates/default/editors/CKeditor.jsp | 8 +-
.../webapp/templates/default/editors/TinyMCE.jsp | 3 +-
.../webapp/templates/default/editors/plain.jsp | 3 +-
.../webapp/templates/default/editors/preview.jsp | 7 +-
.../webapp/templates/default/editors/wysiwyg.jsp | 3 +-
.../main/webapp/templates/reader/ViewTemplate.jsp | 4 +-
mvn_cheat-sheet.md | 4 +-
pom.xml | 2 +-
280 files changed, 2607 insertions(+), 1777 deletions(-)
create mode 100644
jspwiki-api/src/main/java/org/apache/wiki/api/core/ContextEnum.java
copy
jspwiki-api/src/main/java/org/apache/wiki/api/{exceptions/ProviderException.java
=> spi/AclsDSL.java} (59%)
copy jspwiki-main/src/main/java/org/apache/wiki/parser/ParseException.java =>
jspwiki-api/src/main/java/org/apache/wiki/api/spi/AclsSPI.java (65%)
create mode 100644
jspwiki-api/src/main/java/org/apache/wiki/api/spi/ContentsDSL.java
create mode 100644
jspwiki-api/src/main/java/org/apache/wiki/api/spi/ContentsSPI.java
create mode 100644
jspwiki-api/src/main/java/org/apache/wiki/api/spi/ContextDSL.java
create mode 100644
jspwiki-api/src/main/java/org/apache/wiki/api/spi/ContextSPI.java
create mode 100644
jspwiki-api/src/main/java/org/apache/wiki/api/spi/EngineDSL.java
copy
jspwiki-main/src/main/java/org/apache/wiki/i18n/DefaultInternationalizationManager.java
=> jspwiki-api/src/main/java/org/apache/wiki/api/spi/EngineSPI.java (62%)
create mode 100644
jspwiki-api/src/main/java/org/apache/wiki/api/spi/SessionDSL.java
create mode 100644
jspwiki-api/src/main/java/org/apache/wiki/api/spi/SessionSPI.java
create mode 100644 jspwiki-api/src/main/java/org/apache/wiki/api/spi/Wiki.java
create mode 100644
jspwiki-api/src/main/java/org/apache/wiki/api/spi/WikiSPIServletContextListener.java
copy jspwiki-api/src/main/java/org/apache/wiki/api/{core => spi}/package.html
(82%)
copy
jspwiki-it-tests/jspwiki-selenide-tests/src/main/java/org/apache/wiki/pages/haddock/HaddockPage.java
=> jspwiki-main/src/main/java/org/apache/wiki/spi/AclsSPIDefaultImpl.java (68%)
copy
jspwiki-it-tests/jspwiki-selenide-tests/src/main/java/org/apache/wiki/pages/haddock/HaddockPage.java
=> jspwiki-main/src/main/java/org/apache/wiki/spi/ContentsSPIDefaultImpl.java
(56%)
create mode 100644
jspwiki-main/src/main/java/org/apache/wiki/spi/ContextSPIDefaultImpl.java
copy jspwiki-main/src/{test/java/org/apache/wiki/filters/TestFilter.java =>
main/java/org/apache/wiki/spi/EngineSPIDefaultImpl.java} (65%)
copy
jspwiki-main/src/main/java/org/apache/wiki/{tasks/DefaultTasksManager.java =>
spi/SessionSPIDefaultImpl.java} (55%)
create mode 100644
jspwiki-main/src/main/resources/META-INF/services/org.apache.wiki.api.spi.AclsSPI
create mode 100644
jspwiki-main/src/main/resources/META-INF/services/org.apache.wiki.api.spi.ContentsSPI
create mode 100644
jspwiki-main/src/main/resources/META-INF/services/org.apache.wiki.api.spi.ContextSPI
create mode 100644
jspwiki-main/src/main/resources/META-INF/services/org.apache.wiki.api.spi.EngineSPI
create mode 100644
jspwiki-main/src/main/resources/META-INF/services/org.apache.wiki.api.spi.SessionSPI
