You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by dk...@apache.org on 2020/10/28 18:49:30 UTC
[sling-org-apache-sling-jcr-contentloader] 01/01: Merge pull
request #5 from apache/SLING-9841-jcr-contentloader-include-exclude
This is an automated email from the ASF dual-hosted git repository.
dklco pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-contentloader.git
commit 36457911601b915d15053b39b691b9c34a2c5b5e
Merge: 48bcf57 0e29344
Author: Dan Klco <kl...@users.noreply.github.com>
AuthorDate: Wed Oct 28 14:49:20 2020 -0400
Merge pull request #5 from apache/SLING-9841-jcr-contentloader-include-exclude
SLING-9841: JCR ContentLoader Include/Exclude Merging as per https://markmail.org/thread/ts3zeuelhbf6bnne
.../contentloader/hc/BundleContentLoadedCheck.java | 8 +-
.../internal/BundleContentLoader.java | 131 +++++++++++++-----
.../internal/BundleContentLoaderConfiguration.java | 32 +++++
...rvice.java => BundleContentLoaderListener.java} | 148 ++++++++++-----------
src/main/resources/OSGI-INF/l10n/bundle.properties | 33 +++++
...t.java => BundleContentLoaderListenerTest.java} | 32 ++---
.../internal/BundleContentLoaderTest.java | 124 +++++++++++++++--
7 files changed, 359 insertions(+), 149 deletions(-)