adobeGH-178 make libs depend on CA Config

- make scripts depend on the still dangling 4.1.0-SNAPSHOT - add plumber configuration, with reference search path, - make traverse using 'pipesConfig' CA config for the app name Signed-off-by: Nicolas Peltier <[email protected]>
auniverseaway · Dec 9, 2020 · 2b47144 · 2b47144
1 parent c1e7a7b
commit 2b47144
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 5 deletions.
diff --git a/...ts/app/jcr_root/apps/dx/scripts/config/org.apache.sling.pipes.internal.PlumberImpl.config b/...ts/app/jcr_root/apps/dx/scripts/config/org.apache.sling.pipes.internal.PlumberImpl.config
@@ -0,0 +1,4 @@
+referencesPaths=["/apps/dx/scripts/libs"]
+authorizedUsers=["admin"]
+sleep=I"0"
+bufferSize=I"1000"
diff --git a/apps/scripts/app/jcr_root/apps/dx/scripts/libs/execute/conf/find/.content.xml b/apps/scripts/app/jcr_root/apps/dx/scripts/libs/execute/conf/find/.content.xml
@@ -2,5 +2,4 @@
 <jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
     jcr:primaryType="sling:OrderedFolder"
     jcr:description="package up incoming resources"
-
     sling:resourceType="slingPipes/pkg"/>
diff --git a/apps/scripts/app/jcr_root/apps/dx/scripts/libs/seek-and-destroy/conf/traverse/.content.xml b/apps/scripts/app/jcr_root/apps/dx/scripts/libs/seek-and-destroy/conf/traverse/.content.xml
@@ -3,4 +3,4 @@
     jcr:primaryType="sling:OrderedFolder"
     jcr:description="traverse all pages"
     sling:resourceType="slingPipes/reference"
-    expr='/apps/dx/scripts/libs/traverse'/>
+    expr='traverse'/>
diff --git a/apps/scripts/app/jcr_root/apps/dx/scripts/libs/traverse/conf/.content.xml b/apps/scripts/app/jcr_root/apps/dx/scripts/libs/traverse/conf/.content.xml
@@ -2,6 +2,7 @@
 <jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
     jcr:primaryType="sling:OrderedFolder"
     sling:resourceType="sling:OrderedFolder">
+    <conf/>
     <root/>
     <country/>
     <language/>

diff --git a/apps/scripts/app/jcr_root/apps/dx/scripts/libs/traverse/conf/conf/.content.xml b/apps/scripts/app/jcr_root/apps/dx/scripts/libs/traverse/conf/conf/.content.xml
@@ -0,0 +1,5 @@
+<?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="sling:OrderedFolder"
+    sling:resourceType="slingPipes/base"
+    path="/content"/>
diff --git a/apps/scripts/app/jcr_root/apps/dx/scripts/libs/traverse/conf/root/.content.xml b/apps/scripts/app/jcr_root/apps/dx/scripts/libs/traverse/conf/root/.content.xml
@@ -3,4 +3,4 @@
     jcr:primaryType="sling:OrderedFolder"
     jcr:description="all roots associated with a given app"
     sling:resourceType="slingPipes/json"
-    expr='\[\"/content/${app}\",\"/content/experience-fragments/${app}\"]'/>
+    expr='\[\"/content/${caconfig.conf.pipesConfig.app}\",\"/content/experience-fragments/${caconfig.conf.pipesConfig.app}\"]'/>
diff --git a/apps/scripts/app/jcr_root/apps/dx/scripts/libs/usage/conf/traverse/.content.xml b/apps/scripts/app/jcr_root/apps/dx/scripts/libs/usage/conf/traverse/.content.xml
@@ -3,4 +3,4 @@
     jcr:primaryType="sling:OrderedFolder"
     jcr:description="traverse all pages"
     sling:resourceType="slingPipes/reference"
-    expr='/apps/dx/scripts/libs/traverse'/>
+    expr='traverse'/>
diff --git a/apps/scripts/app/pom.xml b/apps/scripts/app/pom.xml
@@ -92,7 +92,7 @@
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.pipes</artifactId>
-            <version>4.0.0</version>
+            <version>4.1.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>