From 2723c6eef9d96127fb376aaf98636eb89a3cadd2 Mon Sep 17 00:00:00 2001 From: Burkhard Pauli Date: Wed, 12 Jan 2022 16:57:47 +0100 Subject: [PATCH] JCRVLT-582 - Package import fails for namespaced paths and path mapping - updated test_version.zip package so it contains now a cq:tags structure - changed testInstallWithRegexp test case to demo issue which is described in JCRVLT-582 --- .../packaging/integration/MappedImportIT.java | 10 ++++++---- .../resources/test-packages/test_version.zip | Bin 4229 -> 8300 bytes 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/MappedImportIT.java b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/MappedImportIT.java index 8e6a81f73..2aba53ff7 100644 --- a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/MappedImportIT.java +++ b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/MappedImportIT.java @@ -194,14 +194,16 @@ public void testInstallWithRegexp() throws RepositoryException, IOException, Pa ImportOptions opts = getDefaultOptions(); RegexpPathMapping pathMapping = new RegexpPathMapping(); - pathMapping.addMapping("/testroot/(.*)", "/root/$1"); + pathMapping.addMapping("/testroot/_cq_tags/(.*)", "/root/_cq_tags/$1"); + pathMapping.addMapping("/testroot/cq:tags/(.*)", "/root/cq:tags/$1"); opts.setPathMapping(pathMapping); pack.install(opts); - assertNodeExists("/root/a"); - assertNodeMissing("/testroot/a"); + + assertNodeExists("/root/cq:tags/foo"); + assertNodeMissing("/testroot/cq:tags/foo"); } -} \ No newline at end of file +} diff --git a/vault-core/src/test/resources/test-packages/test_version.zip b/vault-core/src/test/resources/test-packages/test_version.zip index 79d850c972a9a9f0e263d48577093818bb1d8619..f383396d91912ed6da55077820a0959f1e445bb0 100644 GIT binary patch literal 8300 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 delta 1900 zcmaFk(5mPb;LXe;!ob17!EhkS%98;Ja5Atk__~HT>U#RQ>Hj;$z`)E9;LXkfQo#gO z2G=}UkV!a-0inDsu{5VdACCqM+a!TT!fk_SPtMOv%S_j+$j#Y&lhuqxi=CryajldI z3j+fO9|O=WxEwCYFj-bwdh$x1VAG5SyIGuNF<^(Mo1eN84YZ{ih;eHcWnh?W&o4H) zkpB|U!kZIoUtIvI4`RfpM~Go^qMV2xDc%(UYcWV9DU1}rnkI7#@=Z1se5K9K;d9HB z!+G5c$dJP^EXkD?*ZexgwltM{6{QI3hMW%ES~e> z{|c+`n}fH1Uzorw{X?2({)*O?*L#0C{qKvMmwY5BuEke%=?4EDs}<9KDa9R1TQ_Zw z=b|6Ht0Uuovu)~1G?8g=6LWoD2aeCVFI}>Lsgl72ujgffDj?}xI=_P>>mMy(+ z+qN)w95z`vL4qTDvWBnb)h++`P5H!Yy&>k&jq~45d*6ARf9Xhc^U0P;ET+u@l?pQ- zIq7jo_22tr_UgOTT~XtWfv2kY^fp(_jcA&7?UlsiMH)i-VXQ{m%TD zyGegn1LK)i5z&4r>(j1>;zQyxFWc;T<8njQ(Ld(wf$F;%2K9$*r7E1YVg(;>Z_3cW zerQFE@RVu6z+{wF?^>Y4?Ywp0>!S2Zar4zllj}q0+*zZZ`Rd8W2{&K9YrppIaJlQ= zw>z!NCpGL03%g}8eWt19=ADfDny+gMoo5hg7*rKn^v0FCs){~>^-IrDzDnWeDAqFGz}nBCD?fa^NSx4GC05`8io$!Yz@lz2vEbxFgcG&4zFLN5XylpW^PdC$IyVB eoYYV>_;Q1?zF2@aD;r3h2ME1@X-<_F!~+2EGu-0<