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:29 UTC
[sling-org-apache-sling-jcr-contentloader] branch master updated
(48bcf57 -> 3645791)
This is an automated email from the ASF dual-hosted git repository.
dklco pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-contentloader.git.
from 48bcf57 Merge pull request #4 from apache/SLING-9844-import-save-node-issue
add 0298cdf SLING-9841 - Added support for filtering installs based on the target path and renamed the ContentLoaderService since only handles bundles and isn't a service
add 0e29344 Merging from master
new 3645791 Merge pull request #5 from apache/SLING-9841-jcr-contentloader-include-exclude
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:
.../contentloader/hc/BundleContentLoadedCheck.java | 8 +-
.../internal/BundleContentLoader.java | 131 +++++++++++++-----
....java => BundleContentLoaderConfiguration.java} | 18 ++-
...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, 335 insertions(+), 159 deletions(-)
copy src/main/java/org/apache/sling/jcr/contentloader/internal/{ContentHelper.java => BundleContentLoaderConfiguration.java} (57%)
rename src/main/java/org/apache/sling/jcr/contentloader/internal/{ContentLoaderService.java => BundleContentLoaderListener.java} (76%)
create mode 100644 src/main/resources/OSGI-INF/l10n/bundle.properties
rename src/test/java/org/apache/sling/jcr/contentloader/internal/{ContentLoaderServiceTest.java => BundleContentLoaderListenerTest.java} (83%)
[sling-org-apache-sling-jcr-contentloader] 01/01: Merge pull
request #5 from apache/SLING-9841-jcr-contentloader-include-exclude
Posted by dk...@apache.org.
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(-)