prepend jcr_root to install hook config file patterns and rename the package property where they are picked

Author: santiagoGPNC

accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/installhook/impl/AcToolInstallHookServiceImpl.java

@@ -31,7 +31,8 @@
 @Component
 public class AcToolInstallHookServiceImpl implements AcToolInstallHookService {
 
-    public static final String ACL_HOOK_PATHS = "actool.hook.paths.patterns(.*)";
+    public static final String ACL_HOOK_PATHS = "actool.installhook.configFilesPattern(.*)";
+    private static final String JCR_ROOT_PREFIX="/jcr_root";
     @Reference(policyOption = ReferencePolicyOption.GREEDY)
     private AcInstallationServiceInternal acInstallationService;
 
@@ -48,7 +49,8 @@ public PersistableInstallationLogger installYamlFilesFromPackage(VaultPackage va
         Set<Object> propertiesKeys = packageProperties.keySet();
         for (Object property : propertiesKeys) {
             if (property.toString().matches(ACL_HOOK_PATHS)) {
-                configPathPatterns.add(packageProperties.getProperty(property.toString()));
+                configPathPatterns.add(JCR_ROOT_PREFIX + packageProperties.getProperty(property.toString()));
+                
             }
         }
 

accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/configreader/ConfigFilesRetrieverImplTest.java

@@ -97,16 +97,16 @@ public void testIsRelevantConfigurationsFiltered() throws Exception {
         Set<String> currentRunmodes = new HashSet<String>(
                 Arrays.asList("author"));
         slingSettings = new ExtendedSlingSettingsServiceImpl(currentRunmodes);
-        Assert.assertTrue((ConfigFilesRetrieverImpl.isRelevantConfiguration(new StubEntry("/jcr_root/conf", "file.yaml"), "config.author",
+        Assert.assertTrue((ConfigFilesRetrieverImpl.isRelevantConfiguration(new StubEntry("/conf", "file.yaml"), "config.author",
                 slingSettings, ImmutableList.<String> of())));
-        Assert.assertTrue((ConfigFilesRetrieverImpl.isRelevantConfiguration(new StubEntry("/jcr_root/conf", "file.yaml"), "config.author",
-                slingSettings, ImmutableList.<String> of("/noMatch", "/jcr_root/conf/.*"))));
-        Assert.assertFalse((ConfigFilesRetrieverImpl.isRelevantConfiguration(new StubEntry("/jcr_root/conf", "file.yaml"), "config.author",
-                slingSettings, ImmutableList.<String> of("/jcr_root/conf/test.*.yaml"))));
-        Assert.assertTrue((ConfigFilesRetrieverImpl.isRelevantConfiguration(new StubEntry("/jcr_root/conf", "file.yaml"), "config.author",
-                slingSettings, ImmutableList.<String> of("/jcr_root/conf/.*\\.yaml", "/noMatch"))));
-        Assert.assertFalse((ConfigFilesRetrieverImpl.isRelevantConfiguration(new StubEntry("/jcr_root/conf", "file.yaml"), "config.author",
-                slingSettings, ImmutableList.<String> of("/jcr_root/nonconf.*"))));
+        Assert.assertTrue((ConfigFilesRetrieverImpl.isRelevantConfiguration(new StubEntry("/conf", "file.yaml"), "config.author",
+                slingSettings, ImmutableList.<String> of("/noMatch", "/conf/.*"))));
+        Assert.assertFalse((ConfigFilesRetrieverImpl.isRelevantConfiguration(new StubEntry("/conf", "file.yaml"), "config.author",
+                slingSettings, ImmutableList.<String> of("/conf/test.*.yaml"))));
+        Assert.assertTrue((ConfigFilesRetrieverImpl.isRelevantConfiguration(new StubEntry("/conf", "file.yaml"), "config.author",
+                slingSettings, ImmutableList.<String> of("/conf/.*\\.yaml", "/noMatch"))));
+        Assert.assertFalse((ConfigFilesRetrieverImpl.isRelevantConfiguration(new StubEntry("/conf", "file.yaml"), "config.author",
+                slingSettings, ImmutableList.<String> of("/nonconf.*"))));
 
     }
 

docs/ApplyConfig.md

@@ -71,7 +71,7 @@ If you would rather use the filevault-package-maven-plugin for building the pack
 
 The `*.yaml` files are installed directly from the package content and respect the [run mode semantics](Configuration.md). Otherwise there is no limitation, so the YAML files will be picked up from anywhere in the package (as long as the parent node does not contain a `.` followed by one or multiple not matching run modes).
 
-If you wish to limit which YAML files are picked up by the installation hook, you can add one or more regular expressions as package properties that start with the prefix `actool.hook.paths.patterns`. If the path of a file within the package matches any of the provided patterns, it will be picked up by the installation hook:
+If you wish to limit which YAML files are picked up by the installation hook, you can add one or more regular expressions as package properties that start with the prefix `actool.installhook.configFilesPattern`. If the path of a file matches any of the provided patterns, it will be picked up by the installation hook:
 
 ```
 <plugin>
@@ -80,8 +80,8 @@ If you wish to limit which YAML files are picked up by the installation hook, yo
     <configuration>
         <properties>
             <installhook.actool.class>biz.netcentric.cq.tools.actool.installhook.AcToolInstallHook</installhook.actool.class>
-            <actool.hook.paths.patterns.groups>/jcr_content/apps/myapp/acl/groups.*</actool.hook.paths.patterns.groups>
-            <actool.hook.paths.patterns.users>/jcr_content/apps/myapp/acl/users.*</actool.hook.paths.patterns.users>
+            <actool.installhook.configFilesPattern.groups>/apps/myapp/acl/groups.*</actool.installhook.configFilesPattern.groups>
+            <actool.installhook.configFilesPattern.users>/apps/myapp/acl/users.*</actool.installhook.configFilesPattern.users>
         </properties>
     </configuration>
 </plugin>