You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by je...@apache.org on 2019/06/26 15:11:43 UTC
[sling-org-apache-sling-jcr-contentloader] branch master updated
(a68a251 -> 4ef20ca)
This is an automated email from the ASF dual-hosted git repository.
jeb pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-contentloader.git.
from a68a251 SLING-7923 Simplify integration tests
add 5a63920 Added propertyMerge option
add e1509c5 SLING-8243 support added for merging at a property and a node level.
add fdfe668 SLING-8243 Fixing an issue reported by Sonar
add fe8a639 Merge branch 'master' into SLING-8243
add 4beb774 Merge branch 'SLING-8243' of https://github.com/apache/sling-org-apache-sling-jcr-contentloader.git into SLING-8243
new 4ef20ca Merge pull request #1 from apache/SLING-8243
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:
pom.xml | 2 +-
.../sling/jcr/contentloader/ContentCreator.java | 8 +
.../sling/jcr/contentloader/ImportOptions.java | 20 +
.../internal/BundleContentLoader.java | 27 +-
.../internal/ContentLoaderService.java | 40 +-
.../internal/ContentReaderWhiteboard.java | 2 +-
.../internal/DefaultContentCreator.java | 414 +++++++++------
.../internal/DefaultContentImporter.java | 11 +-
.../jcr/contentloader/internal/JcrXmlImporter.java | 7 +-
.../jcr/contentloader/internal/PathEntry.java | 97 +++-
.../contentloader/internal/readers/JsonReader.java | 583 ++++++++++----------
.../contentloader/internal/readers/XmlReader.java | 264 +++++-----
.../contentloader/internal/readers/ZipReader.java | 10 +-
.../sling/jcr/contentloader/package-info.java | 2 +-
.../jcr/contentloader/internal/CreateNodeTest.java | 3 +-
.../internal/DefaultContentCreatorTest.java | 49 +-
.../internal/ImportOptionsFactory.java | 62 +--
.../jcr/contentloader/internal/JsonReaderTest.java | 585 +++++++++++++--------
.../internal/readers/OrderedJsonReaderTest.java | 1 +
.../internal/readers/XmlReaderTest.java | 78 +--
.../it/SLING7268InitialContentIT.java | 1 +
21 files changed, 1306 insertions(+), 960 deletions(-)
[sling-org-apache-sling-jcr-contentloader] 01/01: Merge pull
request #1 from apache/SLING-8243
Posted by je...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jeb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-contentloader.git
commit 4ef20ca1dda3490e320fa8da27946937b93de015
Merge: a68a251 4beb774
Author: Jason E Bailey <je...@apache.org>
AuthorDate: Wed Jun 26 11:11:38 2019 -0400
Merge pull request #1 from apache/SLING-8243
Sling 8243 - support merge options
pom.xml | 2 +-
.../sling/jcr/contentloader/ContentCreator.java | 8 +
.../sling/jcr/contentloader/ImportOptions.java | 20 +
.../internal/BundleContentLoader.java | 27 +-
.../internal/ContentLoaderService.java | 40 +-
.../internal/ContentReaderWhiteboard.java | 2 +-
.../internal/DefaultContentCreator.java | 414 +++++++++------
.../internal/DefaultContentImporter.java | 11 +-
.../jcr/contentloader/internal/JcrXmlImporter.java | 7 +-
.../jcr/contentloader/internal/PathEntry.java | 97 +++-
.../contentloader/internal/readers/JsonReader.java | 583 ++++++++++----------
.../contentloader/internal/readers/XmlReader.java | 264 +++++-----
.../contentloader/internal/readers/ZipReader.java | 10 +-
.../sling/jcr/contentloader/package-info.java | 2 +-
.../jcr/contentloader/internal/CreateNodeTest.java | 3 +-
.../internal/DefaultContentCreatorTest.java | 49 +-
.../internal/ImportOptionsFactory.java | 62 +--
.../jcr/contentloader/internal/JsonReaderTest.java | 585 +++++++++++++--------
.../internal/readers/OrderedJsonReaderTest.java | 1 +
.../internal/readers/XmlReaderTest.java | 78 +--
.../it/SLING7268InitialContentIT.java | 1 +
21 files changed, 1306 insertions(+), 960 deletions(-)