[jackrabbit-filevault] branch bugfix/JCRVLT-683 updated (01f2e25d -> 4b13f118)

[kw...@apache.org]

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

kwin pushed a change to branch bugfix/JCRVLT-683
in repository https://gitbox.apache.org/repos/asf/jackrabbit-filevault.git


 discard 01f2e25d cleanup, fix build
 discard b5c99c7f Fix restoring original principal ACLs
 discard 1abee028 Add method to persist the principal ACLs
 discard 4b540232 JCRVLT-683 expect import of principal-based Authz to obey acHandling rules
     add 21aa90f9 JCRVLT-703 always use original node context when reporting violations in NodeTypeValidator (#289)
     add 52992879 JCRVLT-697: count moves of stashed child nodes towards autosave limit (#288)
     add fcce9df5 JCRVLT-704 expose line and column from NodeContext (#290)
     add 525ec7b7 JCRVLT-706 Use legacy type severity for mixed packages inside containers (#291)
     add a23193e2 JCRVLT-705 export special properties which are not protected (#292)
     add 4b13f118 JCRVLT-683 expect import of principal-based Authz to obey acHandling rules

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (01f2e25d)
            \
             N -- N -- N   refs/heads/bugfix/JCRVLT-683 (4b13f118)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

No new revisions were added by this update.

Summary of changes:
 .../apache/jackrabbit/vault/fs/api/ImportInfo.java | 11 ++-
 .../jackrabbit/vault/fs/api/package-info.java      |  2 +-
 .../vault/fs/impl/io/DocViewImporter.java          |  2 +-
 .../vault/fs/impl/io/DocViewSAXFormatter.java      |  8 +--
 .../vault/fs/impl/io/ImportInfoImpl.java           |  8 ++-
 .../vault/fs/impl/io/JackrabbitACLImporter.java    | 14 ++--
 .../vault/fs/impl/io/JcrSysViewTransformer.java    |  2 +-
 .../jackrabbit/vault/fs/impl/io/NodeStash.java     | 15 +++-
 .../fs/spi/impl/jcr20/JackrabbitACLManagement.java | 84 +++++++++++++++++-----
 .../spi/impl/jcr20/JackrabbitUserManagement.java   |  5 +-
 .../PrincipalBasedAccessControlList.java           |  7 +-
 .../PrincipalSetAccessControlPolicy.java           |  5 +-
 .../ResourceBasedAccessControlList.java            |  7 +-
 .../vault/fs/impl/io/DocViewSaxFormatterIT.java    | 38 +++++++++-
 .../packaging/integration/NodeStashingIT.java      | 24 +++++++
 .../impl/util/ValidatorDocViewParserHandler.java   |  4 +-
 .../vault/validation/spi/NodeContext.java          | 22 +++++-
 .../vault/validation/spi/ValidationMessage.java    |  4 +-
 .../validation/spi/impl/PackageTypeValidator.java  |  4 +-
 .../spi/impl/nodetype/JcrNodeTypeMetaDataImpl.java | 30 ++------
 .../vault/validation/spi/package-info.java         |  2 +-
 .../vault/validation/spi/util/NodeContextImpl.java | 49 ++++++-------
 .../vault/validation/spi/util/package-info.java    |  2 +-
 .../DocumentViewParserValidatorTest.java           | 16 ++---
 .../spi/impl/PackageTypeValidatorTest.java         |  8 ++-
 .../impl/nodetype/JcrNodeTypeMetaDataImplTest.java | 11 +--
 .../spi/impl/nodetype/NodeTypeValidatorTest.java   |  2 +-
 27 files changed, 263 insertions(+), 123 deletions(-)