This is an automated email from the ASF dual-hosted git repository.

alexoree pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git


    from 0efa4eb13 Merge pull request #479 from spyhunter99/feature/JSPWIKI-205
     add 206839e6c JSPWIKI-130 addressing part 2 of the reported issues, work 
in progress
     add 579527c3a JSPWIKI-130 addressing part 2 of the reported issues, work 
in progress
     add 565c8526b JSPWIKI-130
     add 8513986e5 Merge remote-tracking branch 'upstream/master' into 
feature/JSPWIKI-130-part2
     add 9fea75f16 JSPWIKI-130 makes the first half of part 2
     add 508922a01 JSPWIKI-130 addresses the final part of this jira, ready for 
peer review
     add 0b69f1f48 Merge branch 'master' into feature/JSPWIKI-130-part2
     add 3f5811c43 adding notes
     add 01fbd7020 Merge pull request #475 from 
spyhunter99/feature/JSPWIKI-130-part2

No new revisions were added by this update.

Summary of changes:
 UPGRADING                                          |  22 ++++-
 .../main/java/org/apache/wiki/api/core/Engine.java |   7 +-
 .../src/main/java/org/apache/wiki/WikiContext.java |   2 +-
 .../src/main/java/org/apache/wiki/WikiPage.java    |   1 +
 .../src/main/java/org/apache/wiki/WikiSession.java |   8 +-
 .../org/apache/wiki/auth/AuthorizationManager.java |   3 +-
 .../wiki/auth/DefaultAuthenticationManager.java    |   3 -
 .../wiki/auth/DefaultAuthorizationManager.java     |  26 +++--
 .../org/apache/wiki/auth/DefaultUserManager.java   | 107 ++++++++++++++++-----
 .../wiki/auth/authorize/DefaultGroupManager.java   |  22 +++++
 .../wiki/auth/user/AbstractUserDatabase.java       |  16 ++-
 .../apache/wiki/auth/user/DefaultUserProfile.java  |   5 +-
 .../apache/wiki/auth/user/DummyUserDatabase.java   |   1 +
 .../apache/wiki/auth/user/JDBCUserDatabase.java    |   1 +
 .../org/apache/wiki/auth/user/UserDatabase.java    |   6 +-
 .../org/apache/wiki/auth/user/XMLUserDatabase.java |   1 +
 .../wiki/auth/AbstractPasswordReuseTest.java       |  12 ---
 .../wiki/auth/AuthenticationManagerTest.java       |   8 +-
 .../apache/wiki/auth/AuthorizationManagerTest.java |   4 +-
 .../wiki/auth/authorize/GroupManagerTest.java      |   2 +-
 .../java/org/apache/wiki/plugin/GroupsTest.java    |  34 +++++--
 .../java/org/apache/wiki/plugin/IfPluginTest.java  |   4 +-
 .../test/resources/jspwiki-testUserPolicy.policy   |   2 +-
 23 files changed, 219 insertions(+), 78 deletions(-)

Reply via email to