This is an automated email from the ASF dual-hosted git repository.
olli pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-karaf-configs.git
The following commit(s) were added to refs/heads/master by this push:
new a0d41eb SLING-9944 Bundle configurations and reference via classpath
protocol
a0d41eb is described below
commit a0d41eb84d4d32f88dcf2edfcdbbebf67055030a
Author: Oliver Lietz <[email protected]>
AuthorDate: Mon Nov 30 11:42:50 2020 +0100
SLING-9944 Bundle configurations and reference via classpath protocol
externalize repoinit statements
---
pom.xml | 1 +
...pache.sling.jcr.repoinit.RepositoryInitializer~sling.config | 10 ++--------
...ng.jcr.repoinit.RepositoryInitializer~sling_caconfig.config | 4 ++--
....sling.jcr.repoinit.RepositoryInitializer~sling_clam.config | 9 ++-------
...g.jcr.repoinit.RepositoryInitializer~sling_discovery.config | 10 ++--------
...sling.jcr.repoinit.RepositoryInitializer~sling_event.config | 8 ++------
....sling.jcr.repoinit.RepositoryInitializer~sling_i18n.config | 7 ++-----
...r.repoinit.RepositoryInitializer~sling_installer_jcr.config | 9 ++-------
...poinit.RepositoryInitializer~sling_jcr_contentloader.config | 7 ++-----
...ing.jcr.repoinit.RepositoryInitializer~sling_mapping.config | 7 ++-----
...ing.jcr.repoinit.RepositoryInitializer~sling_readall.config | 7 ++-----
...g.jcr.repoinit.RepositoryInitializer~sling_scripting.config | 10 ++--------
....jcr.repoinit.RepositoryInitializer~sling_validation.config | 10 ++--------
...e.sling.jcr.repoinit.RepositoryInitializer~sling_xss.config | 10 ++--------
src/main/resources/sling-caconfig.txt | 1 +
src/main/resources/sling-clam.txt | 8 ++++++++
src/main/resources/sling-discovery.txt | 9 +++++++++
src/main/resources/sling-event.txt | 7 +++++++
src/main/resources/sling-i18n.txt | 5 +++++
src/main/resources/sling-installer-jcr.txt | 8 ++++++++
src/main/resources/sling-jcr-contentloader.txt | 5 +++++
src/main/resources/sling-mapping.txt | 5 +++++
src/main/resources/sling-readall.txt | 5 +++++
src/main/resources/sling-scripting.txt | 9 +++++++++
src/main/resources/sling-validation.txt | 9 +++++++++
src/main/resources/sling-xss.txt | 9 +++++++++
src/main/resources/sling.txt | 8 ++++++++
27 files changed, 115 insertions(+), 82 deletions(-)
diff --git a/pom.xml b/pom.xml
index 7c62970..7b11381 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,6 +48,7 @@
<configuration>
<excludes combine.children="append">
<exclude>**/*.config</exclude>
+ <exclude>**/*.txt</exclude>
</excludes>
</configuration>
</plugin>
diff --git
a/src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling.config
b/src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling.config
index 80b4fbf..092b5bd 100644
---
a/src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling.config
+++
b/src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling.config
@@ -1,9 +1,3 @@
-scripts=[\
- "create path (sling:Folder) /apps\n\
- create path (sling:Folder) /libs\n\
- create path (sling:Folder) /var\n\
- create path (sling:OrderedFolder) /content\n\
- set ACL for everyone\n\
- allow jcr:read on /content\n\
- end"\
+references=[\
+ "classpath:sling.txt"\
]
diff --git
a/src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_caconfig.config
b/src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_caconfig.config
index 3b98ded..9162261 100644
---
a/src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_caconfig.config
+++
b/src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_caconfig.config
@@ -1,3 +1,3 @@
-scripts=[\
- "create path (sling:Folder) /conf"\
+references=[\
+ "classpath:sling-caconfig.txt"\
]
diff --git
a/src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_clam.config
b/src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_clam.config
index 037d61e..ea19890 100644
---
a/src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_clam.config
+++
b/src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_clam.config
@@ -1,8 +1,3 @@
-scripts=[\
- "create service user sling-clam\n\
- create path (sling:Folder) /var/clam/results(sling:OrderedFolder)\n\
- set ACL for sling-clam\n\
- allow jcr:read on /\n\
- allow rep:write on /var/clam\n\
- end"\
+references=[\
+ "classpath:sling-clam.txt"\
]
diff --git
a/src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_discovery.config
b/src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_discovery.config
index 48249d8..05f636a 100644
---
a/src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_discovery.config
+++
b/src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_discovery.config
@@ -1,9 +1,3 @@
-scripts=[\
- "create service user sling-discovery\n\
- create path (sling:Folder) /var/discovery\n\
- create path (sling:Folder) /var/discovery/oak\n\
- set ACL for sling-discovery\n\
- allow jcr:read on /var/discovery\n\
- allow rep:write on /var/discovery\n\
- end"\
+references=[\
+ "classpath:sling-discovery.txt"\
]
diff --git
a/src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_event.config
b/src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_event.config
index c86fb1f..10fa457 100644
---
a/src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_event.config
+++
b/src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_event.config
@@ -1,7 +1,3 @@
-scripts=[\
- "create service user sling-event\n\
- create path (sling:Folder) /var/eventing\n\
- set ACL for sling-event\n\
- allow jcr:all on /var/eventing\n\
- end"\
+references=[\
+ "classpath:sling-event.txt"\
]
diff --git
a/src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_i18n.config
b/src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_i18n.config
index 5030a16..511e55e 100644
---
a/src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_i18n.config
+++
b/src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_i18n.config
@@ -1,6 +1,3 @@
-scripts=[\
- "create service user sling-i18n\n\
- set ACL for sling-i18n\n\
- allow jcr:read on /\n\
- end"\
+references=[\
+ "classpath:sling-i18n.txt"\
]
diff --git
a/src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_installer_jcr.config
b/src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_installer_jcr.config
index fa91cfd..b972ff0 100644
---
a/src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_installer_jcr.config
+++
b/src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_installer_jcr.config
@@ -1,8 +1,3 @@
-scripts=[\
- "create service user sling-jcr-install\n\
- create path (sling:Folder) /apps/sling/install\n\
- set ACL for sling-jcr-install\n\
- allow jcr:read on /\n\
- allow rep:write on /apps/sling/install\n\
- end"\
+references=[\
+ "classpath:sling-installer-jcr.txt"\
]
diff --git
a/src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_jcr_contentloader.config
b/src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_jcr_contentloader.config
index 10fca90..d34c1b1 100644
---
a/src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_jcr_contentloader.config
+++
b/src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_jcr_contentloader.config
@@ -1,6 +1,3 @@
-scripts=[\
- "create service user sling-jcr-contentloader with path system/sling\n\
- set ACL for sling-jcr-contentloader\n\
- allow jcr:all on /\n\
- end"\
+references=[\
+ "classpath:sling-jcr-contentloader.txt"\
]
diff --git
a/src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_mapping.config
b/src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_mapping.config
index b926be5..9952b4b 100644
---
a/src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_mapping.config
+++
b/src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_mapping.config
@@ -1,6 +1,3 @@
-scripts=[\
- "create service user sling-mapping\n\
- set ACL for sling-mapping\n\
- allow jcr:read on /\n\
- end"\
+references=[\
+ "classpath:sling-mapping.txt"\
]
diff --git
a/src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_readall.config
b/src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_readall.config
index c4b36ef..530326a 100644
---
a/src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_readall.config
+++
b/src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_readall.config
@@ -1,6 +1,3 @@
-scripts=[\
- "create service user sling-readall\n\
- set ACL for sling-readall\n\
- allow jcr:read on /\n\
- end"\
+references=[\
+ "classpath:sling-readall.txt"\
]
diff --git
a/src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_scripting.config
b/src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_scripting.config
index 98dd9b5..871561d 100644
---
a/src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_scripting.config
+++
b/src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_scripting.config
@@ -1,9 +1,3 @@
-scripts=[\
- "create service user sling-scripting\n\
- create path (sling:Folder) /apps\n\
- create path (sling:Folder) /libs\n\
- set ACL for sling-scripting\n\
- allow jcr:read on /apps\n\
- allow jcr:read on /libs\n\
- end"\
+references=[\
+ "classpath:sling-scripting.txt"\
]
diff --git
a/src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_validation.config
b/src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_validation.config
index f7f7a34..1be196d 100644
---
a/src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_validation.config
+++
b/src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_validation.config
@@ -1,9 +1,3 @@
-scripts=[\
- "create service user sling-validation\n\
- create path (sling:Folder) /apps\n\
- create path (sling:Folder) /libs\n\
- set ACL for sling-validation\n\
- allow jcr:read on /apps\n\
- allow jcr:read on /libs\n\
- end"\
+references=[\
+ "classpath:sling-validation.txt"\
]
diff --git
a/src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_xss.config
b/src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_xss.config
index 826738e..80992e3 100644
---
a/src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_xss.config
+++
b/src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_xss.config
@@ -1,9 +1,3 @@
-scripts=[\
- "create service user sling-xss\n\
- create path (sling:Folder) /apps/sling/xss\n\
- create path (sling:Folder) /libs/sling/xss\n\
- set ACL for sling-xss\n\
- allow jcr:read on /apps/sling/xss\n\
- allow jcr:read on /libs/sling/xss\n\
- end"\
+references=[\
+ "classpath:sling-xss.txt"\
]
diff --git a/src/main/resources/sling-caconfig.txt
b/src/main/resources/sling-caconfig.txt
new file mode 100644
index 0000000..912c1c2
--- /dev/null
+++ b/src/main/resources/sling-caconfig.txt
@@ -0,0 +1 @@
+create path (sling:Folder) /conf
diff --git a/src/main/resources/sling-clam.txt
b/src/main/resources/sling-clam.txt
new file mode 100644
index 0000000..4561317
--- /dev/null
+++ b/src/main/resources/sling-clam.txt
@@ -0,0 +1,8 @@
+create service user sling-clam
+
+create path (sling:Folder) /var/clam/results(sling:OrderedFolder)
+
+set ACL for sling-clam
+ allow jcr:read on /
+ allow rep:write on /var/clam
+end
diff --git a/src/main/resources/sling-discovery.txt
b/src/main/resources/sling-discovery.txt
new file mode 100644
index 0000000..cf086b4
--- /dev/null
+++ b/src/main/resources/sling-discovery.txt
@@ -0,0 +1,9 @@
+create service user sling-discovery
+
+create path (sling:Folder) /var/discovery
+create path (sling:Folder) /var/discovery/oak
+
+set ACL for sling-discovery
+ allow jcr:read on /var/discovery
+ allow rep:write on /var/discovery
+end
diff --git a/src/main/resources/sling-event.txt
b/src/main/resources/sling-event.txt
new file mode 100644
index 0000000..efe2b30
--- /dev/null
+++ b/src/main/resources/sling-event.txt
@@ -0,0 +1,7 @@
+create service user sling-event
+
+create path (sling:Folder) /var/eventing
+
+set ACL for sling-event
+ allow jcr:all on /var/eventing
+end
diff --git a/src/main/resources/sling-i18n.txt
b/src/main/resources/sling-i18n.txt
new file mode 100644
index 0000000..81112af
--- /dev/null
+++ b/src/main/resources/sling-i18n.txt
@@ -0,0 +1,5 @@
+create service user sling-i18n
+
+set ACL for sling-i18n
+ allow jcr:read on /
+end
diff --git a/src/main/resources/sling-installer-jcr.txt
b/src/main/resources/sling-installer-jcr.txt
new file mode 100644
index 0000000..53f6671
--- /dev/null
+++ b/src/main/resources/sling-installer-jcr.txt
@@ -0,0 +1,8 @@
+create service user sling-jcr-install
+
+create path (sling:Folder) /apps/sling/install
+
+set ACL for sling-jcr-install
+ allow jcr:read on /
+ allow rep:write on /apps/sling/install
+end
diff --git a/src/main/resources/sling-jcr-contentloader.txt
b/src/main/resources/sling-jcr-contentloader.txt
new file mode 100644
index 0000000..ba2dd17
--- /dev/null
+++ b/src/main/resources/sling-jcr-contentloader.txt
@@ -0,0 +1,5 @@
+create service user sling-jcr-contentloader
+
+set ACL for sling-jcr-contentloader
+ allow jcr:all on /
+end
diff --git a/src/main/resources/sling-mapping.txt
b/src/main/resources/sling-mapping.txt
new file mode 100644
index 0000000..d17ca13
--- /dev/null
+++ b/src/main/resources/sling-mapping.txt
@@ -0,0 +1,5 @@
+create service user sling-mapping
+
+set ACL for sling-mapping
+ allow jcr:read on /
+end
diff --git a/src/main/resources/sling-readall.txt
b/src/main/resources/sling-readall.txt
new file mode 100644
index 0000000..13cd474
--- /dev/null
+++ b/src/main/resources/sling-readall.txt
@@ -0,0 +1,5 @@
+create service user sling-readall
+
+set ACL for sling-readall
+ allow jcr:read on /
+end
diff --git a/src/main/resources/sling-scripting.txt
b/src/main/resources/sling-scripting.txt
new file mode 100644
index 0000000..014bdf9
--- /dev/null
+++ b/src/main/resources/sling-scripting.txt
@@ -0,0 +1,9 @@
+create service user sling-scripting
+
+create path (sling:Folder) /apps
+create path (sling:Folder) /libs
+
+set ACL for sling-scripting
+ allow jcr:read on /apps
+ allow jcr:read on /libs
+end
diff --git a/src/main/resources/sling-validation.txt
b/src/main/resources/sling-validation.txt
new file mode 100644
index 0000000..9faa1d6
--- /dev/null
+++ b/src/main/resources/sling-validation.txt
@@ -0,0 +1,9 @@
+create service user sling-validation
+
+create path (sling:Folder) /apps
+create path (sling:Folder) /libs
+
+set ACL for sling-validation
+ allow jcr:read on /apps
+ allow jcr:read on /libs
+end
diff --git a/src/main/resources/sling-xss.txt b/src/main/resources/sling-xss.txt
new file mode 100644
index 0000000..1d79114
--- /dev/null
+++ b/src/main/resources/sling-xss.txt
@@ -0,0 +1,9 @@
+create service user sling-xss
+
+create path (sling:Folder) /apps/sling/xss
+create path (sling:Folder) /libs/sling/xss
+
+set ACL for sling-xss
+ allow jcr:read on /apps/sling/xss
+ allow jcr:read on /libs/sling/xss
+end
diff --git a/src/main/resources/sling.txt b/src/main/resources/sling.txt
new file mode 100644
index 0000000..87f803a
--- /dev/null
+++ b/src/main/resources/sling.txt
@@ -0,0 +1,8 @@
+create path (sling:Folder) /apps
+create path (sling:Folder) /libs
+create path (sling:Folder) /var
+create path (sling:OrderedFolder) /content
+
+set ACL for everyone
+ allow jcr:read on /content
+end
