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 6929dc2 apply format suggested by intellij
new d5bcff7 move test adaptees to src/test + generate test-jar in order
to not have to exclude coverage metrics from jspwiki-210-test-adaptees (it
doesn't make sense, it's test code)
new bdab6f2 catch rare NPE + provide some tests
new 8742454 WikiPageProvider should extend o.a.w.WikiProvider, not
o.a.w.api.providers.WikiProvider
new 466f2be o.a.w.search classes don't need to extend their counterparts
from o.a.w.api.search
new ced752b added new adapter to convert classes between o.a.w.search and
o.a.w.api.search
new 3338f0c JSPWIKI-303: move back to jspwiki-main o.a.w.search.QueryItem
and o.a.w.search.SearchResult
new b48d88f add back constructors to ensure page/attachment backwards
compatibility
new 9c00c58 add missing Apache License
new 3c3dcea code format
new 5a89dba use constant from AttachmentProvider
new 2bae34f change comment in jspwiki.properties so it aligns with
property's default value
new 0de5b15 added new static methods on TestEngine to ease creation
ofinstances with custom properties
new 1f95c37 complete javadocs
new c92bb4d add missing Apache License to tests
new cd501d2 JSPWIKI-303: provide backwards compatibility with public API
for page/attachment providers not using it
new 6aef232 update dependencies:
new 559f94b update portable launchers to tomcat 9.0.33
new d98d205 mark constructors using WikiEngine as deprecated
new 2f68a41 use Context instead of WikiContext
new a3bacfa extract all commands to its own class in order to break class
cycles
new 1c3c14b use Context instead of WikiContext
new 7c5fb15 mark constructors using WikiEngine as deprecated
new 01b2adf use Page insead of WikiPage
new 445716e apply suggested format by intellij
new 8758178 refactor tests so they only build a TestEngine instance per
class instead of per test
new 4d44357 add missing Apache License
new 084c501 use Context instead of WikiContext
new b7597bf extract isJSPWikiPermission to PermissionChecks class in
order to break some class cycles
new 7377ff9 use Context and Page instead of WikiContext and WikiPage
new 3d99319 use getManager( XYZ.class ) instead of getXYZManager methods
of WikiEngine
new a493a16 reorganized WikiEngine initialization, to ease generalization
of managers' creation and configuration later on
new 3806007 move rss initialization from WikiEngine into RSSGenerator
new eae6861 use Context instead of Wikicontext
new 078122f Extract interface + rename from RSSGenerator
new 1059775 push default methods on GroupManager to implementation on
DefaultGroupManager
new 3404df2 2.11.0-M7-git-14
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 | 22 ++
jspwiki-210-adapters/pom.xml | 5 +-
.../main/java/org/apache/wiki/WikiProvider.java | 14 +-
.../org/apache/wiki/api/plugin/WikiPlugin.java | 3 +-
.../org/apache/wiki/providers/SearchAdapter.java | 58 +++
.../providers/WikiAttachmentAdapterProvider.java | 150 ++++++++
.../wiki/providers/WikiPageAdapterProvider.java | 169 +++++++++
.../apache/wiki/providers/WikiPageProvider.java | 2 +-
.../org/apache/wiki/filters/FilterFrom210Test.java | 19 +-
.../org/apache/wiki/plugin/PluginFrom210Test.java | 18 +
.../apache/wiki/providers/SearchAdapterTest.java | 65 ++++
.../wiki/providers/WikiProviderAdaptersTest.java | 113 ++++++
jspwiki-210-test-adaptees/pom.xml | 25 ++
.../java/com/example/filters/TwoXFilter.java | 18 +
.../java/com/example/filters/TwoXFilterTest.java | 34 --
.../java/com/example/plugins/TwoXPlugin.java | 0
.../java/com/example/plugins/TwoXPluginTest.java | 33 --
.../providers/TwoXWikiAttachmentProvider.java | 198 ++++++++++
.../example/providers/TwoXWikiPageProvider.java | 206 ++++++++++
.../src/main/java/org/apache/wiki/api/Release.java | 2 +-
.../src/main/java/org/apache/wiki/WikiEngine.java | 121 +++---
.../src/main/java/org/apache/wiki/WikiPage.java | 19 +-
.../wiki/ajax/WikiAjaxDispatcherServlet.java | 2 +-
.../org/apache/wiki/attachment/Attachment.java | 14 +
.../apache/wiki/attachment/AttachmentManager.java | 5 +-
.../wiki/attachment/DefaultAttachmentManager.java | 5 +-
.../wiki/attachment/DynamicAttachmentProvider.java | 4 +-
.../org/apache/wiki/auth/AuthorizationManager.java | 10 +-
.../wiki/auth/DefaultAuthorizationManager.java | 2 +-
.../org/apache/wiki/auth/DefaultUserManager.java | 6 +-
.../java/org/apache/wiki/auth/UserManager.java | 6 +-
.../wiki/auth/authorize/DefaultGroupManager.java | 34 ++
.../apache/wiki/auth/authorize/GroupManager.java | 37 +-
.../wiki/auth/permissions/AllPermission.java | 111 +++---
.../auth/permissions/AllPermissionCollection.java | 14 +-
.../wiki/auth/permissions/PermissionChecks.java | 24 +-
.../apache/wiki/content/DefaultPageRenamer.java | 26 +-
.../java/org/apache/wiki/content/PageRenamer.java | 4 +-
.../apache/wiki/plugin/DefaultPluginManager.java | 236 +++---------
.../java/org/apache/wiki/plugin/PluginManager.java | 22 +-
.../org/apache/wiki/preferences/Preferences.java | 151 +++-----
.../wiki/providers/AbstractFileProvider.java | 4 +-
.../wiki/providers/BasicAttachmentProvider.java | 7 +-
.../apache/wiki/providers/FileSystemProvider.java | 4 +-
.../wiki/providers/VersioningFileProvider.java | 10 +-
...{RSSGenerator.java => DefaultRSSGenerator.java} | 210 +++--------
.../java/org/apache/wiki/rss/RSSGenerator.java | 416 ++++-----------------
.../java/org/apache/wiki/search/QueryItem.java | 0
.../java/org/apache/wiki/search/SearchMatcher.java | 21 +-
.../java/org/apache/wiki/search/SearchResult.java | 0
.../java/org/apache/wiki/ui/AbstractCommand.java | 56 +--
.../main/java/org/apache/wiki/ui/AllCommands.java | 67 ++++
.../java/org/apache/wiki/ui/CommandResolver.java | 4 +-
.../org/apache/wiki/ui/DefaultCommandResolver.java | 2 +-
.../org/apache/wiki/ui/DefaultEditorManager.java | 5 +-
.../java/org/apache/wiki/ui/EditorManager.java | 6 +-
.../org/apache/wiki/ui/GenericHTTPHandler.java | 7 +-
.../java/org/apache/wiki/ui/InputValidator.java | 31 +-
.../main/java/org/apache/wiki/ui/Installer.java | 4 +-
.../main/java/org/apache/wiki/ui/PageCommand.java | 12 +-
.../org/apache/wiki/ui/admin/SimpleAdminBean.java | 6 +-
.../apache/wiki/ui/admin/WikiFormAdminBean.java | 35 +-
.../org/apache/wiki/ui/admin/beans/ModuleBean.java | 3 +-
.../wiki/ui/admin/beans/PlainEditorAdminBean.java | 55 ++-
.../wiki/ui/admin/beans/SearchManagerBean.java | 6 +-
.../org/apache/wiki/ui/admin/beans/UserBean.java | 4 +-
.../src/main/resources/ini/classmappings.xml | 4 +
.../src/main/resources/ini/jspwiki.properties | 2 +-
.../src/test/java/org/apache/wiki/TestEngine.java | 80 ++--
.../test/java/org/apache/wiki/WikiEngineTest.java | 26 +-
.../test/java/org/apache/wiki/WikiSessionTest.java | 4 +-
.../wiki/attachment/AttachmentManagerTest.java | 2 +-
.../wiki/auth/AuthenticationManagerTest.java | 6 +-
.../apache/wiki/auth/AuthorizationManagerTest.java | 19 +-
.../java/org/apache/wiki/auth/UserManagerTest.java | 6 +-
.../java/org/apache/wiki/auth/acl/AclImplTest.java | 76 ++--
.../wiki/auth/acl/DefaultAclManagerTest.java | 6 +-
.../auth/login/CookieAssertionLoginModuleTest.java | 63 ++--
.../org/apache/wiki/auth/user/UserProfileTest.java | 53 +--
.../org/apache/wiki/content/PageRenamerTest.java | 58 +--
.../apache/wiki/pages/DefaultPageManagerTest.java | 21 +-
.../wiki/parser/JSPWikiMarkupParserTest.java | 6 +-
.../wiki/plugin/DefaultPluginManagerTest.java | 3 +-
.../java/org/apache/wiki/plugin/GroupsTest.java | 3 +-
.../java/org/apache/wiki/plugin/IfPluginTest.java | 12 +-
.../org/apache/wiki/plugin/PageViewPluginTest.java | 37 +-
.../wiki/plugin/RecentChangesPluginTest.java | 22 +-
.../providers/BasicAttachmentProviderTest.java | 4 +-
.../wiki/providers/FileSystemProviderTest.java | 97 +++--
.../wiki/references/ReferenceManagerTest.java | 2 +-
.../apache/wiki/render/RenderingManagerTest.java | 16 +-
.../java/org/apache/wiki/rss/RSSGeneratorTest.java | 8 +-
.../org/apache/wiki/search/SearchManagerTest.java | 2 +-
.../apache/wiki/stress/MassiveRepositoryTest.java | 3 +-
.../org/apache/wiki/ui/CommandResolverTest.java | 2 +-
.../apache/wiki/workflow/ApprovalWorkflowTest.java | 10 +-
.../apache/wiki/workflow/DecisionQueueTest.java | 6 +-
.../java/org/apache/wiki/workflow/OutcomeTest.java | 91 ++---
.../apache/wiki/workflow/WorkflowManagerTest.java | 22 +-
.../org/apache/wiki/xmlrpc/RPCHandlerTest.java | 5 +-
.../wiki/render/markdown/MarkdownRendererTest.java | 3 +-
.../tomcat/woas.app/Contents/Java/bootstrap.jar | Bin 35071 -> 35071 bytes
.../tomcat/woas.app/Contents/Java/tomcat-juli.jar | Bin 47886 -> 49372 bytes
.../src/overlay/launchers/tomcat/woas.exe | Bin 3564962 -> 3575670
bytes
.../wiki/search/tika/TikaSearchProviderTest.java | 3 +-
.../main/java/org/apache/wiki/util/HttpUtil.java | 13 +-
.../java/org/apache/wiki/util/HttpUtilTest.java | 19 +
pom.xml | 8 +-
108 files changed, 2138 insertions(+), 1667 deletions(-)
create mode 100644
jspwiki-210-adapters/src/main/java/org/apache/wiki/providers/SearchAdapter.java
create mode 100644
jspwiki-210-adapters/src/main/java/org/apache/wiki/providers/WikiAttachmentAdapterProvider.java
create mode 100644
jspwiki-210-adapters/src/main/java/org/apache/wiki/providers/WikiPageAdapterProvider.java
create mode 100644
jspwiki-210-adapters/src/test/java/org/apache/wiki/providers/SearchAdapterTest.java
create mode 100644
jspwiki-210-adapters/src/test/java/org/apache/wiki/providers/WikiProviderAdaptersTest.java
rename jspwiki-210-test-adaptees/src/{main =>
test}/java/com/example/filters/TwoXFilter.java (63%)
delete mode 100644
jspwiki-210-test-adaptees/src/test/java/com/example/filters/TwoXFilterTest.java
rename jspwiki-210-test-adaptees/src/{main =>
test}/java/com/example/plugins/TwoXPlugin.java (100%)
delete mode 100644
jspwiki-210-test-adaptees/src/test/java/com/example/plugins/TwoXPluginTest.java
create mode 100644
jspwiki-210-test-adaptees/src/test/java/com/example/providers/TwoXWikiAttachmentProvider.java
create mode 100644
jspwiki-210-test-adaptees/src/test/java/com/example/providers/TwoXWikiPageProvider.java
copy
jspwiki-api/src/main/java/org/apache/wiki/api/exceptions/FilterException.java
=>
jspwiki-main/src/main/java/org/apache/wiki/auth/permissions/PermissionChecks.java
(58%)
copy jspwiki-main/src/main/java/org/apache/wiki/rss/{RSSGenerator.java =>
DefaultRSSGenerator.java} (64%)
rename {jspwiki-210-adapters =>
jspwiki-main}/src/main/java/org/apache/wiki/search/QueryItem.java (100%)
rename {jspwiki-210-adapters =>
jspwiki-main}/src/main/java/org/apache/wiki/search/SearchResult.java (100%)
create mode 100644
jspwiki-main/src/main/java/org/apache/wiki/ui/AllCommands.java
