You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by kw...@apache.org on 2021/05/18 14:31:49 UTC
[jackrabbit-filevault] branch
bugfix/JCRVLT-255-importmodes-for-docview updated (8f344e8 -> d20d03a)
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a change to branch bugfix/JCRVLT-255-importmodes-for-docview
in repository https://gitbox.apache.org/repos/asf/jackrabbit-filevault.git.
from 8f344e8 more test, clarify constraint violations for import mode != replace
add d20d03a restore backwards compatibility
No new revisions were added by this update.
Summary of changes:
.../vault/fs/impl/io/FileArtifactHandler.java | 46 +++++++++++++---------
.../vault/packaging/integration/ImportModeIT.java | 22 +++++------
.../META-INF/vault/filter.xml | 8 ----
.../jcr_root/intermediate/testroot.xml | 34 ----------------
.../META-INF/vault/filter.xml | 0
.../META-INF/vault/nodetypes.cnd | 0
.../META-INF/vault/properties.xml | 0
.../jcr_root/.content.xml | 0
.../jcr_root/testroot}/.content.xml | 4 +-
.../jcr_root/testroot/merge.xml | 6 +++
.../jcr_root/testroot/merge_properties.xml | 6 +++
.../jcr_root/testroot/replace.xml | 6 +++
.../jcr_root/testroot/update.xml | 6 +++
.../jcr_root/testroot/update_properties.xml | 6 +++
14 files changed, 70 insertions(+), 74 deletions(-)
delete mode 100644 vault-core/src/test/resources/test-packages/import_modes_test_filehandler_docview.zip/META-INF/vault/filter.xml
delete mode 100644 vault-core/src/test/resources/test-packages/import_modes_test_filehandler_docview.zip/jcr_root/intermediate/testroot.xml
copy vault-core/src/test/resources/test-packages/{import_modes_test_generichandler_docview.zip => import_modes_test_generichandler2_docview.zip}/META-INF/vault/filter.xml (100%)
rename vault-core/src/test/resources/test-packages/{import_modes_test_filehandler_docview.zip => import_modes_test_generichandler2_docview.zip}/META-INF/vault/nodetypes.cnd (100%)
rename vault-core/src/test/resources/test-packages/{import_modes_test_filehandler_docview.zip => import_modes_test_generichandler2_docview.zip}/META-INF/vault/properties.xml (100%)
copy vault-core/src/test/resources/test-packages/{import_modes_test_generichandler_docview.zip => import_modes_test_generichandler2_docview.zip}/jcr_root/.content.xml (100%)
copy vault-core/src/test/resources/test-packages/{root_policy.zip/jcr_root => import_modes_test_generichandler2_docview.zip/jcr_root/testroot}/.content.xml (66%)
create mode 100644 vault-core/src/test/resources/test-packages/import_modes_test_generichandler2_docview.zip/jcr_root/testroot/merge.xml
create mode 100644 vault-core/src/test/resources/test-packages/import_modes_test_generichandler2_docview.zip/jcr_root/testroot/merge_properties.xml
create mode 100644 vault-core/src/test/resources/test-packages/import_modes_test_generichandler2_docview.zip/jcr_root/testroot/replace.xml
create mode 100644 vault-core/src/test/resources/test-packages/import_modes_test_generichandler2_docview.zip/jcr_root/testroot/update.xml
create mode 100644 vault-core/src/test/resources/test-packages/import_modes_test_generichandler2_docview.zip/jcr_root/testroot/update_properties.xml