You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by an...@apache.org on 2021/08/31 15:33:40 UTC

[sling-org-apache-sling-feature-cpconverter] branch master updated (ef04e43 -> 7c85113)

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

angela pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-feature-cpconverter.git.


    from ef04e43  Merge pull request #100 from apache/SLING-10755
     add dcefe20  SLING-10754 : Missing entries in filter.xml (test-case illustrating the problem)
     add b5c02fe  SLING-10754 : Missing entries in filter.xml (initial draft)
     add 4abdb85  SLING-10754 : Missing entries in filter.xml (move path utility methods to VaultPackageUtils)
     add 3e400f6  SLING-10754 : Missing entries in filter.xml (additional test-case with sibling nodes not covered by the filter)
     add acd8d06  SLING-10754 : Missing entries in filter.xml (respect extracted paths from .content.xml when evaluating if a given path-filter-set is no longer needed)
     add 3515699  SLING-10754 : Missing entries in filter.xml (unused import)
     add e7bfa45  SLING-10754 : Missing entries in filter.xml (extract logic to build adjusted workspace-filter to separate class)
     add 680ddc1  SLING-10754 : Missing entries in filter.xml (javadoc)
     add 9d9a7a9  SLING-10754 : Missing entries in filter.xml (additional test with policy node, minor fix in sibling test package)
     add d6bb11d  SLING-10754 : Missing entries in filter.xml (comments and jira refs)
     add 420c1bf  SLING-10754 : Missing entries in filter.xml (special case removing filter roots)
     add 7f96ee2  SLING-10754 : Missing entries in filter.xml (special case removing filter roots)
     add 6148189  SLING-10754 : Missing entries in filter.xml (test with one single covered node)
     add 1a6b00a  SLING-10754 : Missing entries in filter.xml (unit test for filter builder)
     add ce2557b  SLING-10754 : Missing entries in filter.xml (improve comment)
     new 7c85113  Merge pull request #99 from apache/SLING-10754

The 1 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:
 .../cpconverter/handlers/DefaultEntryParser.java   |  74 ++++++++
 .../cpconverter/shared/AbstractJcrNodeParser.java  |   5 +-
 .../cpconverter/vltpkg/VaultPackageAssembler.java  | 119 ++----------
 .../cpconverter/vltpkg/VaultPackageUtils.java      |  27 +++
 .../cpconverter/vltpkg/WorkspaceFilterBuilder.java | 183 ++++++++++++++++++
 .../feature/cpconverter/AbstractConverterTest.java |  13 ++
 .../feature/cpconverter/AdjustedFilterTest.java    | 207 +++++++++++++++++++++
 .../ConverterUserAndPermissionTest.java            |  11 --
 .../vltpkg/WorkspaceFilterBuilderTest.java         | 167 +++++++++++++++++
 .../sling/feature/cpconverter/remove_filter.zip    | Bin 0 -> 4243 bytes
 .../feature/cpconverter/subtree_in_contentxml.zip  | Bin 0 -> 4556 bytes
 .../subtree_in_contentxml_nosibling.zip            | Bin 0 -> 4495 bytes
 .../cpconverter/subtree_in_contentxml_policy.zip   | Bin 0 -> 4612 bytes
 .../cpconverter/subtree_in_contentxml_sibling.zip  | Bin 0 -> 4491 bytes
 .../feature/cpconverter/subtree_remove_filter.zip  | Bin 0 -> 4320 bytes
 15 files changed, 691 insertions(+), 115 deletions(-)
 create mode 100644 src/main/java/org/apache/sling/feature/cpconverter/handlers/DefaultEntryParser.java
 create mode 100644 src/main/java/org/apache/sling/feature/cpconverter/vltpkg/WorkspaceFilterBuilder.java
 create mode 100644 src/test/java/org/apache/sling/feature/cpconverter/AdjustedFilterTest.java
 create mode 100644 src/test/java/org/apache/sling/feature/cpconverter/vltpkg/WorkspaceFilterBuilderTest.java
 create mode 100644 src/test/resources/org/apache/sling/feature/cpconverter/remove_filter.zip
 create mode 100644 src/test/resources/org/apache/sling/feature/cpconverter/subtree_in_contentxml.zip
 create mode 100644 src/test/resources/org/apache/sling/feature/cpconverter/subtree_in_contentxml_nosibling.zip
 create mode 100644 src/test/resources/org/apache/sling/feature/cpconverter/subtree_in_contentxml_policy.zip
 create mode 100644 src/test/resources/org/apache/sling/feature/cpconverter/subtree_in_contentxml_sibling.zip
 create mode 100644 src/test/resources/org/apache/sling/feature/cpconverter/subtree_remove_filter.zip

[sling-org-apache-sling-feature-cpconverter] 01/01: Merge pull request #99 from apache/SLING-10754

Posted by an...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

angela pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-feature-cpconverter.git

commit 7c851131feb83b81c28720fa09f373861e001e35
Merge: ef04e43 ce2557b
Author: anchela <an...@adobe.com>
AuthorDate: Tue Aug 31 17:33:34 2021 +0200

    Merge pull request #99 from apache/SLING-10754
    
    SLING-10754 : Missing entries in filter.xml (test-case illustrating the problem)

 .../cpconverter/handlers/DefaultEntryParser.java   |  74 ++++++++
 .../cpconverter/shared/AbstractJcrNodeParser.java  |   5 +-
 .../cpconverter/vltpkg/VaultPackageAssembler.java  | 119 ++----------
 .../cpconverter/vltpkg/VaultPackageUtils.java      |  27 +++
 .../cpconverter/vltpkg/WorkspaceFilterBuilder.java | 183 ++++++++++++++++++
 .../feature/cpconverter/AbstractConverterTest.java |  13 ++
 .../feature/cpconverter/AdjustedFilterTest.java    | 207 +++++++++++++++++++++
 .../ConverterUserAndPermissionTest.java            |  11 --
 .../vltpkg/WorkspaceFilterBuilderTest.java         | 167 +++++++++++++++++
 .../sling/feature/cpconverter/remove_filter.zip    | Bin 0 -> 4243 bytes
 .../feature/cpconverter/subtree_in_contentxml.zip  | Bin 0 -> 4556 bytes
 .../subtree_in_contentxml_nosibling.zip            | Bin 0 -> 4495 bytes
 .../cpconverter/subtree_in_contentxml_policy.zip   | Bin 0 -> 4612 bytes
 .../cpconverter/subtree_in_contentxml_sibling.zip  | Bin 0 -> 4491 bytes
 .../feature/cpconverter/subtree_remove_filter.zip  | Bin 0 -> 4320 bytes
 15 files changed, 691 insertions(+), 115 deletions(-)