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/02/18 21:10:21 UTC
[sling-org-apache-sling-jcr-contentloader] branch SLING-8243
created (now 7bac8da)
This is an automated email from the ASF dual-hosted git repository.
jeb pushed a change to branch SLING-8243
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-contentloader.git.
at 7bac8da added node merge option
This branch includes the following new commits:
new aa928b0 SLING-865 : Move to bundles
new f499f60 SLING-865 : Adjust reactor pom and svn information in each module.
new 40dbaab SLING-865 : Adjust path to parent pom and add profiles for samples and contrib
new 6760eb7 SLING-857 Apply patch by Vidar Ramdal (Thanks alot) to support XSLT for XML imports
new 058363d SLING-857 - test case for XmlReader using an XSLT transform contributed by Vidar S. Ramdal, thanks!
new 0640ce0 Use release parent pom
new b976767 [maven-release-plugin] prepare release org.apache.sling.jcr.contentloader-2.0.4-incubator
new 3056c9a [maven-release-plugin] prepare for next development iteration
new 2e304ef Use next dev version of parent pom
new 8add984 Set parent pom to released version.
new d1e9737 Move Sling to new TLP location
new e0de6a2 Move Sling to new TLP location
new 2e2c66e SLING-1011 : Remove disclaimer file.
new 91c0965 SLING-1011 : Adjust svn location
new d117b6a SLING-1011 : Remove disclaimer from readme's, adjust links to webite, fix versions in poms.
new 862d132 SLING-1033 Upgrade to Sling parent POM 6 (and ensure web app has the leglize stuff, too)
new 3c8b515 SLING-981 Patch from Eric Norman applied, thanks. Issues was first created by myself (ieb), but the patch represented a vast improvement on the orriginal contribution. This commit adds the ability to specify ACE's in the json file that would have previously only modified properties on the node. In addition it allows the creation of new principals to allow the ACE's to be added to the node.
new a63dd1a SLING-981 Corrected trailing white space introduced by previous commit.
new c9817b0 SLING-971 Patch applied (from myself) Corrects the Java doc and readme surrounding the contentloader, especially for the json format.
new 9a6f0a0 Update to latest release.
new 2584171 SLING-1161 implemented. Now supports including external files with nt:file in content loader XML
new d86d275 SLING-1165 Last modifie date reported by the filesystem is now used, instead of current date
new 514a0b5 SLING-1161 - fix code to compile with JDK 1.5
new 30a6c33 Clean up code
new eda1e94 Clean up code
new 3642aaa SLING-1205 Upgrade all projects to parent POM 8 and use OSGi provided OSGi libraries
new f7e091e SLING-694 : Initial Content does not load initial content from a file
new 81fe0d3 SLING-1130 : Content Loader does not parse dates. Apply patch from Josh Kennedy.
new 630cdd8 [maven-release-plugin] prepare release org.apache.sling.jcr.contentloader-2.0.6
new f786172 [maven-release-plugin] prepare for next development iteration
new 19671a0 Going back to 2.0.5
new 0346b06 Use latest sling jcr api.
new a043c78 SLING-1250 : Revert changes and use old jcr api
new e7d0f66 SLING-1236 : Scala Scripting: Make all types of the script arguments visible on the Scala side. Apply patch from Michael Dürig
new c991328 SLING-1251 Applied Patch from Ray Davis (Thanks) fixes acl policies after JR16 upgrade, and fixes a potential NPE.
new d3d01bd SLING-1325 : Bundle deploy fails utterly if any XML files contains an element named "type" - throw exception now instead of an NPE.
new da0cc73 Use latest jcr api to decouple modules from jcr 1.0 (contained in older jcr api releases)
new 0bc29ee SLING-1359 - updating contentloader bundle to use Undefined instead of String as the default property type
new d74da26 Update notice files.
new feddcdd [maven-release-plugin] prepare release org.apache.sling.jcr.contentloader-2.0.6
new 4e571a5 [maven-release-plugin] prepare for next development iteration
new 132bc9f SLING-1212 - upgrading to Jackrabbit 2. Also includes re-revert of SLING-1363 and implementation of SLING-1330. Thanks to Felix for getting this started.
new facea67 SLING-1395 - adding support for multi-valued properties
new 550902d SLING-1409 : ignoreImportProviders doesn't allow multiple values.
new 096210c SLING-1409 : Reverting the change
new 1782989 SLING-1411 Add replaceAccessControlEntry method to AccessControlUtil Thanks to Ray Davis for the contribution.
new 751a601 SLING-1448 - adding support for Sling-Initial-Content-Workspace manifest header
new fffdcfa SLING-1457 SLING-1458 - enable support for specifying the position of an ACE (within the ACL) when it is added/updated
new 7e98279 SLING-1440 : Overwrite rule of bundle initial content cannot be switched back to "false"
new 2ce4484 SLING-1448 - adding support for workspace directive; removing support for separate header
new d7aae88 Remove unused import
new f635347 Use released parent pom.
new e6b9729 SLING-1532 - just overwriting properties for resource nodes
new 9a1471e SLING-1526 Extra property names of security:principals lost when loaded via contentloader. Applied patch from Mike Moulton.
new 23c4d08 SLING-1561 - changing destination of ROOT descriptor if path is specified in manifest entry
new 272ff21 SLING-1172 Allow uploading JSON files to create content structures
new c2c5dc8 SLING-1582 added better information at debug level.
new f9f4cee SLING-1583 Changed name to :name and added to ignore list.
new 4c144f4 SLING-1172 Allow uploading JSON files to create content structures Fixed the import case where no name is provided
new 79b6ad8 SLING-1589 DefaultContentImporter service doesn't have a pretty name/description
new 5bd3eb1 SLING-1448 - removing unused constant
new d0de0d7 SLING-1592 - using the ws:/path notation in the uninstall-paths node property.
new e09bd6c Clean up code
new bf7ddf9 SLING-1613 Fixed and change the test pattern to include arrays.
new b0a5264 SLING-1627 import operation support for overwrite of properties
new 52d4b19 upgrading contentloader to depend upon base release
new ecc7860 [maven-release-plugin] prepare release org.apache.sling.jcr.contentloader-2.1.0
new 0876ce7 [maven-release-plugin] prepare for next development iteration
new 50516d4 Use newer SNAPSHOT references during release vote period
new d0d30e2 updating to released jcr bundles
new 38bbed5 SLING-1779 ensure session is logged out at the end of the bundle activator
new 5a0a28d SLING-1802 Made the ContentLoader look at the lastmodified timestamp of the bundle and failing that the lastmodified timestamp within the OSGi contaier to determine if the content should be updated.
new 3b82667 updating all modules to parent 10-SNAPSHOT in anticipation of emma additions to parent
new 933790c Update to recent snapshots
new db38f44 Use latest releases.
new 1ec16ef Add missing metatype info
new 6297b88 Remove obsolete licence and notice files
new b4413eb [maven-release-plugin] prepare release org.apache.sling.jcr.contentloader-2.1.2
new 4bc1689 [maven-release-plugin] prepare for next development iteration
new b2dd9db SLING-1995 Adjusted loader to update installed bundles if they were installed after the content was last installed. Acts the same as a bundle that was explicity updated.
new 4c84028 SLING-2033 Throw an IOException if the target node name consists of the extension "jcr.xml" only
new e46079f SLING-2034 Handle ImportOptions.isOverwrite() to decide whether to replace the subtree at the import location or not for system view import
new 8993c87 SLING-2114 : Content Loader is not thread safe
new ad97f28 SLING-2123 Use Map<String,...> instead of Map<URL,...>
new c2a6b25 SLING-2150 : Update plugins to use the latest available versions
new d4bb6b8 Update to recent snapshot
new b9d6020 Using latest released parent pom
new 98d1931 SLING-2187 - adding new module to contain our custom notice file; adding remote-resources plugin configuration to parent pom and removing all existing appended-resources NOTICE files
new c018e37 temporarily using snapshots during release vote
new a94db33 using latest releases
new 654944f SLING-2108 PostServlet :import operation does not take autoCheckout into account
new b148658 SLING-2306 Export package with a real version number
new bddf700 SLING-2306 Update to Maven Bundle plugin 2.3.4 for package-info.java annotation support
new 4b136a0 SLING-2308 Remove user password digesting from sling
new 0e1688a SLING-2359 : Don't transform xml if xml location is unknown
new 31d118d [maven-release-plugin] prepare release #
new cb49c92 [maven-release-plugin] prepare for next development iteration
new 1a8e35e [maven-release-plugin] rollback the release of #
new 11562eb [maven-release-plugin] prepare release org.apache.sling.jcr.contentloader-2.1.4
new 83bb2ef [maven-release-plugin] prepare for next development iteration
new a90b5f3 Typo in log message
new 3a1a13a SLING-2480 : Add config for maven-sling-plugin to m2e configuration
new 1d231b8 SLING-2363 - replacing javadoc with real annotations in content loader bundle
new e7f6fd9 SLING-2512 - only support file elements in XML import when location is known. warning otherwise.
new 7533369 Prepare release
new 12aee02 [maven-release-plugin] prepare release org.apache.sling.jcr.contentloader-2.1.6
new ebb079e [maven-release-plugin] prepare for next development iteration
new bba6b1d After release
new e9d4e63 Update to latest parent pom
new f460eaf Use released versions
new 7cfc42a SLING-2672 - DefaultContentImporter should replace nodes with the same UUIDs being imported if overwrite is specified
new 643f0a2 Use latest releases and update to new parent pom
new 3820d46 Update to latest parent pom and use latest releases in launchpad
new 890acc5 Correct reactor pom and update to parent pom 16
new f42d52b Update to latest parent pom
new 92bdc85 Update to parent pom 18
new e0ebb8d SLING-2917 style
new 5a281fd SLING-2917 rename misleading methods, variables and constant
new 5bf2d6c SLING-2917 remove unused param session from method importParentNode(Session, Bundle, String, Node, DefaultContentCreator):URL
new 6e1692d SLING-2917 fix some typos and javadoc
new a8ba84b SLING-2917 style
new c007461 SLING-2917 remove unused param PathEntry from method createNode(Node, String, URL, PathEntry, DefaultContentCreator):Node
new 640f83f SLING-2917 fix some typos and javadoc
new adb4dec SLING-2917 style
new 2f6c74d SLING-2917 rename entry to pathEntry
new 77d4d84 SLING-2917 style
new 1f7137a SLING-2917 fix parent descriptor and improve building path
new 7bd4cea SLING-2917 fix read/write access on processed entries
new b473ba5 SLING-3286 - Remove plugin version overrides from poms
new 0ec3ae4 Update to parent pom v19
new 9072acf remove unused properties
new 2f2c819 update dependencies to earliest non-incubator versions (Sling Commons JSON, Sling Commons MIME and Sling Commons OSGi)
new 6160916 use UTF-8 and new schema location
new b815a0d style
new c0494c9 remove versions from managed dependencies, add missing test scopes
new e3b98ad style
new 37a64cb style
new 0e4bda2 SLING-3114 return from system view import also when resulting node is null
new 82402a8 add bundle categories sling, jcr and jackrabbit
new 4f74d75 [maven-release-plugin] prepare release org.apache.sling.jcr.contentloader-2.1.8
new 425386c [maven-release-plugin] prepare for next development iteration
new b94b596 fix typos
new aa6a093 SLING-3648 - make sure content is installed if a bundle is updated while this module is inactive
new 20e24e8 Clean up usage of SCR annotations
new bbd9e00 Updated to parent version 20
new 68666f6 SLING-3946 : Content loader should use SlingSettingsService from settings api
new 5d8352d [maven-release-plugin] prepare release org.apache.sling.jcr.contentloader-2.1.10
new fc97cd6 [maven-release-plugin] prepare for next development iteration
new b73db89 Update to Sling Parent POM 22 with baselining enabled
new 95d182a fix javadoc (remove wrong note about firing events)
new 5cd8d3a SLING-3535 reduce duplicated code in content loader
new 361a254 SLING-3535 reduce duplicated code in content loader
new a9d5d8e SLING-3535 reduce duplicated code in content loader
new dd8e0bf SLING-3535 reduce duplicated code in content loader
new dde1520 style, fix javadoc
new c10b6f8 rename JcrContentHelper to ContentHelper
new 7d7f289 rename JcrContentHelper to ContentHelper (rename references in comments)
new 67de147 SLING-3535 reduce duplicated code in content loader
new 8b6e3f1 style
new 85e1db2 SLING-3534 separate node name and content type in content loader
new f05418f SLING-4223 make Content Loader extensible to support new import formats
new cc8de78 SLING-4223 make Content Loader extensible to support new import formats
new 3b80e07 SLING-4223 make Content Loader extensible to support new import formats
new 2c62fb1 SLING-4223 make Content Loader extensible to support new import formats
new 5c3fb62 style
new 4e423d6 add missing license
new 57341f6 SLING-4223 make Content Loader extensible to support new import formats
new 42256b1 SLING-4223 Make Content Loader extensible to support new import formats
new f262551 SLING-4538 Content loaders cannot be ignored any more - bugfix
new 4e82662 SLING-4537 Provide a backwards compatible API in o.a.s.jcr.contentloader
new b0be74b SLING-4538 - Content loaders cannot be ignored any more
new 72b2da1 SLING-4539 - Provide a deterministic way of installing initial content
new f51b90b Add missing licence header and excludes for rat
new 0db23fc Don't use scr annotation inheritance
new cda17e0 SLING-4698 - Set parent.relativePath to empty for all modules
new 4c923b8 cleanup (remove unused classes)
new a47565a SLING-4151 - new PathEntryTest, contributed by Petr Shypila, thanks!
new 079e866 SLING-4151 - expand DefaultContentCreatorTest, contributed by Petr Shypila, thanks!
new 28348c4 SLING-4151 - add CreateNodeTest using RepositoryProvider
new 9e1240e SLING-4541 - Provide an extensive test suite for the JCR content loader
new 3ec6e33 SLING-4151 - expand DefaultContentCreatorTest, contributed by Petr Shypila, thanks!
new f3e9508 SLING-4541 - Provide an extensive test suite for the JCR content loader
new e8666fa SLING-4541 - add Apache license
new bd27102 SLING-4151 - new ContentLoaderServiceTest, contributed by Petr Shypila, thanks!
new 8be19ec SLING-4757 - BasicInitialContentIT tests content installation from a test bundle
new f9b0160 Update to Sling Parent 23
new 295667c Remove superflous sling.java.version=6 as it's the default now
new bc6aee6 Update rat exclude rules
new 8a51845 Updated rat exclusions
new 2e69ae8 SLING-4835 - fix maven-failsafe-plugin argLine for jacoco
new b30b0af set parent version to 24 and add empty relativePath where missing
new 696c424 SLING-4917 BasicInitialContentIT fails for the org.apache.sling.jcr.contentloader module
new c8a2ecc give U and P meaningful names
new 0ee9b00 SLING-4917 BasicInitialContentIT fails for the org.apache.sling.jcr.contentloader module
new 5c1c43c Update the main reactor to parent 25
new c2a8496 SLING-5091 JCR Content Loader Unit Tests do not run with latest sling-mock-oak
new 7596178 update to released versions of sling mocks
new f898727 Switch to parent pom 26
new 23dcbfc SLING-5682 special json array import for sling post servlet to post orderered structures (patch provided by Nicolas Peltier)
new 6c54a92 SLING-5682 reverting patch completely - see ticket
new a6b06f1 SLING-5682 - add tests for createPrincipal* methods, contributed by Nicolas Peltier, thanks!
new 729b2bf SLING-5682 - import ordered nodes from JSON array structures, contributed by Nicolas Peltier, thanks!
new 82aaff4 SLING-5682 - additional integration test
new 5ffe719 update to latest depends-maven-plugin which is compatible with m2e
new f2f1c9f SLING-6694: Replace commons.json usage in org.apache.sling.jcr.contentloader
new 73ec101 SLING-6687: Switch to geronimo provider for javax.json api.
new 044ac1c cosmetic: remove unused imports
new dfb975b update to org.apache.sling.commons.johnzon 1.0.0
new 6e83f13 SLING-6825 make sure node descriptors for files are not ignored
new da7e9c5 SLING-6825 add unit tests for folders with descriptors
new 8484316 SLING-6825 add unit tests for file with descriptor
new c1aa0a8 Synchronize the deactivate with the bundleChanged and check if we are still active when an event occurs (SLING-6640)
new 44459b6 fix javadoc errors
new 4d4d32a update dependency
new 31fc8cd [maven-release-plugin] prepare release org.apache.sling.jcr.contentloader-2.2.0
new 98a28da [maven-release-plugin] prepare for next development iteration
new d17a9ed update to next development version until release version is available on maven central
new fe152aa switch to release versions
new 7a2b34a SLING-6871: Allow tick as well as double quotes in imports in the JsonReader.
new 40dfedd [maven-release-plugin] prepare release org.apache.sling.jcr.contentloader-2.2.2
new 5ba485d [maven-release-plugin] prepare for next development iteration
new fda4abd cosmetic: remove unused imports
new a4139ee SLING-6876: Use JsonTicksConverter inlined from JCR Content Parser to improve tick handling.
new 13c4312 update to next development version until release version is available on maven central
new c5d3b10 switch back to released version
new 613c407 update org.apache.sling.jcr.contentparser dependency
new 75b6d93 update dependency
new 06585c6 [maven-release-plugin] prepare release org.apache.sling.jcr.contentloader-2.2.4
new 92b5bc4 [maven-release-plugin] prepare for next development iteration
new a48c67f rollback releases
new 89d82ef [maven-release-plugin] prepare release org.apache.sling.jcr.contentloader-2.2.4
new f1ffccb [maven-release-plugin] prepare for next development iteration
new fc2d1fc update to next development version until release version is available on maven central
new aa08e10 SLING-6888: Remove commons.json and org.json excludes.
new 991058f switch back to released version
new dab60b7 SLING-7040 : Update commons lang 2.x to 3.5
new 445db53 SLING-7167 Adjust READMEs
new bea2360 SLING-7167 Adjust READMEs
new 5f1d62b SLING-7167 Adjust READMEs
new 9e8d239 SLING-7162 - Update SCM information in all POM files to reference Git
new 74d5039 Fix typo in pom.xml : conncetion should be connection
new fc42c69 SLING-7214 - Add the LICENSE file to every module
new 8d3bcb9 SLING-7213 - Add a default .gitignore file to every module
new 646984b SLING-7268 unable to create principals and use principals in ACLs on import
new 4e92f20 SLING-7268 correct indentation
new dd1ff5f SLING-7590 Changed date parser to ISO8601 util
new 666b34b Removed reference to snapshot bundle
new 26055ec Updating badges for org-apache-sling-jcr-contentloader
new 6050f20 [maven-release-plugin] prepare release org.apache.sling.jcr.contentloader-2.2.6
new c551f7b Merge branch 'master' of https://github.com/apache/sling-org-apache-sling-jcr-contentloader.git
new a2605eb [maven-release-plugin] prepare for next development iteration
new f4e4679 SLING-7923 Simplify integration tests
new 17c8df9 SLING-7216 - [nice-to-have] Add a CODE_OF_CONDUCT file to every module
new 96073b0 SLING-7215 - [nice-to-have] Add a CONTRIBUTING file to every module
new 469cf6b trivial: added license header to *.md files
new 2777bd8 SLING-8166 Replace usage of deprecated APIs
new 7587c9c SLING-8118 Add support to set ACE restrictions from contentloader
new 55a4061 [maven-release-plugin] prepare release org.apache.sling.jcr.contentloader-2.3.0
new 46c2d83 [maven-release-plugin] prepare for next development iteration
new 892c1af Attempt to stabilize intermittent test failures that happen due to the bundle content loading not being complete before the assertions happen.
new 5a63920 Added propertyMerge option
new 8a4ac19 SLING-7245 - Validate pull requests using Jenkins
new 201635d Updating badges for org-apache-sling-jcr-contentloader
new 7bac8da added node merge option
The 264 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.