Include all nodes in the filter.xml

Remove invalid merge option on include/exclude elements. This closes #2044
Adobe-Consulting-Services · Sep 17, 2019 · c3e3add · c3e3add
1 parent 4903d80
commit c3e3add
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 12 deletions.
diff --git a/ui.content/src/main/content/META-INF/vault/filter.xml b/ui.content/src/main/content/META-INF/vault/filter.xml
@@ -35,16 +35,13 @@
         <include pattern="/etc/acs-commons/exporters/jcr:content"/>
         <include pattern="/etc/acs-commons/qr-code"/>
         <include pattern="/etc/acs-commons/qr-code/jcr:content"/>
-        <include
-            pattern="/etc/acs-commons/qr-code/jcr:content/clientlib-author"
-            mode="merge"/>
-        <exclude
-            pattern="/etc/acs-commons/qr-code/jcr:content/config"
-            mode="merge"/>
+        <include pattern="/etc/acs-commons/qr-code/jcr:content/clientlib-authoring(/.*)?" />
+        <include pattern="/etc/acs-commons/qr-code/jcr:content/qr-code-image.png(/.*)?" />
         <include pattern="/etc/acs-commons/instant-package"/>
         <include pattern="/etc/acs-commons/instant-package/jcr:content"/>
-        <include pattern="/etc/acs-commons/instant-package/jcr:content/instant-package-image.png"/>
+        <include pattern="/etc/acs-commons/instant-package/jcr:content/clientlib-authoring(/.*)?" />
         <include pattern="/etc/acs-commons/instant-package/jcr:content/config"/>
+        <include pattern="/etc/acs-commons/instant-package/jcr:content/instant-package-image.png"/>
 
         <!-- Remove legacy /etc pages from prior version installs -->
         <include pattern="/etc/acs-commons/audit-log-search"/>
@@ -91,11 +88,14 @@
         <include pattern="/var/acs-commons/jcr:content"/>
         <include pattern="/var/acs-commons/reports"/>
         <include pattern="/var/acs-commons/reports/jcr:content"/>
-        <include
-            pattern="/etc/acs-commons/reports(.*)?"
-            mode="merge"/>
+        <include pattern="/var/acs-commons/reports/sample-component-instances(/.*)?"/>
+        <include pattern="/var/acs-commons/reports/sample-components-report(/.*)?"/>
+        <include pattern="/var/acs-commons/reports/sample-page-report(/.*)?"/>
+        <include pattern="/var/acs-commons/reports/sample-references-report(/.*)?"/>
+        <include pattern="/var/acs-commons/on-deploy-scripts-status"/>
+        <include pattern="/var/acs-commons/on-deploy-scripts-status/README.txt"/>
         <include pattern="/var/acs-commons/httpcache"/>
         <include pattern="/var/acs-commons/rep:policy"/>
-        <include pattern="/var/workflow/instances/rep:policy"/>
     </filter>
+    <filter root="/var/workflow/instances/rep:policy"/>
 </workspaceFilter>
diff --git a/...tent/src/main/content/jcr_root/etc/acs-commons/automatic-package-replication/.content.xml b/...tent/src/main/content/jcr_root/etc/acs-commons/automatic-package-replication/.content.xml
@@ -4,5 +4,4 @@
     <jcr:content
         jcr:primaryType="nt:unstructured"
         jcr:title="Automatic Package Replication"/>
-    <sharethis-services/>
 </jcr:root>