#2589 - Fixes issues with 6.4.8 compat

CHANGELOG.md

@@ -18,6 +18,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com)
 ### Fixed
 - #2581 - Versioned ClientLibs no longer works with proxied clientlibs
 - #2562 - Fixed cache refresh on versioned clientlibs request when enforceMd5 is false (default).
+- #2590- Fixed issue on 6.4.x with Service User mappings not being registered due to unsupported filename format of OSGi config. 
 
 ### Added
 - #2536 - Extended renovator MCP Process to handle audit trail entries of moved assets and pages.

ui.apps/src/main/content/jcr_root/apps/acs-commons/config/org.apache.sling.jcr.repoinit.RepositoryInitializer-aem-cs.config

@@ -5,13 +5,19 @@ create path /content/cq:tags(sling:Folder)
 create path /etc/packages(sling:Folder)
 
 # create default contextual configuration for redirects: /conf/global/settings/redirects
-create path /conf/global(sling:Folder)/settings(sling:Folder)/redirects(nt:unstructured)
-set properties on /conf/global/settings/redirects
-  set sling:resourceType{String} to acs-commons/components/utilities/manage-redirects/redirects
-end
+create path /conf/global(sling:Folder)
+create path /conf/global/settings(sling:Folder)
+create path /conf/global/settings/redirects(nt:unstructured)
+
+# Not supported in 6.4.8
+#set properties on /conf/global/settings/redirects
+#  set sling:resourceType{String} to acs-commons/components/utilities/manage-redirects/redirects
+#end
+
 # user to invalidate cached redirects on change
 create service user acs-commons-manage-redirects-service with path system/acs-aem-commons
 set ACL for acs-commons-manage-redirects-service
+    allow jcr:read on /
     allow jcr:read on /conf
 end
 
@@ -41,12 +47,6 @@ set ACL for acs-commons-remote-assets-service
     # If /etc/tags is used, these ACLs be set manually - if RepoInit defines this structure, it supersedes the use of /content/cq:tags
     # allow jcr:read, jcr:versionManagement, rep:write, crx:replicate on /etc/tags
 end
-
-create service user acs-commons-manage-redirects-service with path system/acs-aem-commons
-set ACL for acs-commons-manage-redirects-service
-    allow jcr:read on /
-end
-
 "
 ]
 

ui.content/src/main/content/META-INF/vault/filter.xml

@@ -3,6 +3,9 @@
     <filter root="/conf/rep:policy"/>
     <filter root="/content/dam/rep:policy"/>
     <filter root="/content/rep:policy"/>
+    <filter root="/conf/global/settings">
+        <include pattern="/conf/global/settings/redirects"/>
+    </filter>
     <filter root="/etc/acs-commons">
         <include pattern="/etc/acs-commons/jcr:content"/>
         <include pattern="/etc/acs-commons/automatic-package-replication"/>

ui.content/src/main/content/jcr_root/conf/global/settings/redirects/.content.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
+          jcr:primaryType="nt:unstructured"
+          sling:resourceType="acs-commons/components/utilities/manage-redirects/redirects"/>