This is an automated email from the ASF dual-hosted git repository.
ghenzler pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-starter.git
The following commit(s) were added to refs/heads/master by this push:
new a16fb43 SLING-8418 Using Felic HC service unavailable filter instead
of starter.startup bundle
a16fb43 is described below
commit a16fb43f1d0333f74b066844e0377d93ca1e1e08
Author: georg.henzler <[email protected]>
AuthorDate: Fri Apr 12 00:58:15 2019 +0200
SLING-8418 Using Felic HC service unavailable filter instead of
starter.startup bundle
---
src/main/provisioning/boot.txt | 3 ++
src/main/provisioning/healthcheck.txt | 17 +++++--
src/main/provisioning/sling.txt | 96 +++++++++++++++++------------------
3 files changed, 65 insertions(+), 51 deletions(-)
diff --git a/src/main/provisioning/boot.txt b/src/main/provisioning/boot.txt
index 570e350..f01126e 100644
--- a/src/main/provisioning/boot.txt
+++ b/src/main/provisioning/boot.txt
@@ -59,3 +59,6 @@
org.apache.aries/org.apache.aries.util/1.1.3
# dependency with javax.inject - required for Sling Models (SLING-4710)
org.apache.geronimo.specs/geronimo-atinject_1.0_spec/1.1
+ org.apache.commons/commons-lang3/3.8.1
+ commons-lang/commons-lang/2.6
+
diff --git a/src/main/provisioning/healthcheck.txt
b/src/main/provisioning/healthcheck.txt
index d70fc35..e006906 100644
--- a/src/main/provisioning/healthcheck.txt
+++ b/src/main/provisioning/healthcheck.txt
@@ -20,9 +20,9 @@
# startlevel 5 together with jetty (to allow use during startup)
[artifacts startLevel=5]
- org.apache.felix/org.apache.felix.healthcheck.api/2.0.0
- org.apache.felix/org.apache.felix.healthcheck.core/2.0.2
- org.apache.felix/org.apache.felix.healthcheck.generalchecks/2.0.2
+ org.apache.felix/org.apache.felix.healthcheck.api/2.0.2
+ org.apache.felix/org.apache.felix.healthcheck.core/2.0.6
+ org.apache.felix/org.apache.felix.healthcheck.generalchecks/2.0.4
org.apache.felix/org.apache.felix.healthcheck.webconsoleplugin/2.0.0
# sling health check bundles at startlevel 20
@@ -53,6 +53,7 @@
"javax.script.ScriptEngineManager",
]
+
## bundles
org.apache.felix.hc.generalchecks.BundlesStartedCheck
@@ -81,3 +82,13 @@
user.mapping=[
"org.apache.sling.hc.support\=sling-readall"
]
+
+ ## Service Unavailable Filter for startup-shutdown
+
org.apache.felix.hc.core.impl.filter.ServiceUnavailableFilter-startupandshutdown
+ tags=["systemalive"]
+ service.ranking=I"2147483647"
+
osgi.http.whiteboard.context.select="(osgi.http.whiteboard.context.name\=*)"
+ osgi.http.whiteboard.filter.regex="(?!/system/).*"
+
responseTextFor503="classpath:org.apache.sling.starter.content:content/content/startup/index.html"
+ autoDisableFilter=B"true"
+ avoid404DuringStartup=B"true"
diff --git a/src/main/provisioning/sling.txt b/src/main/provisioning/sling.txt
index bf09848..200d4fa 100644
--- a/src/main/provisioning/sling.txt
+++ b/src/main/provisioning/sling.txt
@@ -22,53 +22,13 @@
[variables]
jackrabbit.version=2.16.3
-[artifacts]
- # Add the Slingshot Sample provisioning model
-
org.apache.sling/org.apache.sling.sample.slingshot/0.9.0/slingfeature/slingfeature
- commons-collections/commons-collections/3.2.2
- org.apache.commons/commons-collections4/4.2
- commons-codec/commons-codec/1.11
- commons-lang/commons-lang/2.6
- org.apache.commons/commons-lang3/3.8.1
- org.apache.commons/commons-math/2.2
- org.apache.httpcomponents/httpcore-osgi/4.4.10
- org.apache.httpcomponents/httpclient-osgi/4.5.6
- org.apache.sling/org.apache.sling.adapter/2.1.10
- org.apache.sling/org.apache.sling.api/2.20.0
- org.apache.sling/org.apache.sling.auth.core/1.4.2
- org.apache.sling/org.apache.sling.auth.form/1.0.12
- org.apache.sling/org.apache.sling.bundleresource.impl/2.3.2
- org.apache.sling/org.apache.sling.commons.classloader/1.4.4
- org.apache.sling/org.apache.sling.commons.compiler/2.3.6
- org.apache.sling/org.apache.sling.commons.fsclassloader/1.0.10
- org.apache.sling/org.apache.sling.commons.mime/2.2.0
- org.apache.sling/org.apache.sling.commons.osgi/2.4.0
- org.apache.sling/org.apache.sling.commons.scheduler/2.7.2
- org.apache.sling/org.apache.sling.commons.threads/3.2.18
- org.apache.sling/org.apache.sling.engine/2.6.18
- org.apache.sling/org.apache.sling.fsresource/2.1.14
- org.apache.sling/org.apache.sling.i18n/2.5.14
- org.apache.sling/org.apache.sling.installer.console/1.0.2
- org.apache.sling/org.apache.sling.installer.provider.jcr/3.1.26
- org.apache.sling/org.apache.sling.installer.hc/2.0.0
- org.apache.sling/org.apache.sling.jcr.contentloader/2.3.0
- org.apache.sling/org.apache.sling.jcr.resource/3.0.18
- org.apache.sling/org.apache.sling.models.api/1.3.8
- org.apache.sling/org.apache.sling.models.impl/1.4.10
- org.apache.sling/org.apache.sling.resourceresolver/1.6.8
- org.apache.sling/org.apache.sling.serviceusermapper/1.4.4
- org.apache.sling/org.apache.sling.serviceuser.webconsole/1.0.0
- org.apache.sling/org.apache.sling.servlets.get/2.1.40
- org.apache.sling/org.apache.sling.servlets.post/2.3.28
- org.apache.sling/org.apache.sling.servlets.resolver/2.5.2
- org.apache.sling/org.apache.sling.xss/2.1.8
- javax.mail/mail/1.5.0-b01
- org.apache.geronimo.bundles/jstl/1.2_1
- org.apache.felix/org.apache.felix.http.whiteboard/4.0.0
+[artifacts startLevel=4]
+ org.apache.felix/org.apache.felix.scr/2.1.16
+ org.apache.felix/org.apache.felix.metatype/1.2.2
[artifacts startLevel=5]
- org.apache.sling/org.apache.sling.starter.content/1.0.2
- org.apache.sling/org.apache.sling.starter.startup/1.0.6
+ org.apache.sling/org.apache.sling.starter.content/1.0.4
+ org.apache.felix/org.apache.felix.http.whiteboard/4.0.0
org.apache.sling/org.apache.sling.extensions.webconsolebranding/1.0.2
org.apache.sling/org.apache.sling.extensions.webconsolesecurityprovider/1.2.0
org.apache.felix/org.apache.felix.inventory/1.0.6
@@ -88,11 +48,11 @@
commons-io/commons-io/2.6
commons-fileupload/commons-fileupload/1.3.3
org.apache.sling/org.apache.sling.commons.log.webconsole/1.0.0
-
+ org.apache.sling/org.apache.sling.api/2.20.0
+ org.apache.sling/org.apache.sling.auth.core/1.4.2
+
[artifacts startLevel=10]
org.apache.felix/org.apache.felix.http.sslfilter/1.2.6
- org.apache.felix/org.apache.felix.scr/2.1.16
- org.apache.felix/org.apache.felix.metatype/1.2.2
org.apache.pdfbox/pdfbox/2.0.12
org.apache.pdfbox/fontbox/2.0.12
org.apache.pdfbox/jempbox/1.8.16
@@ -120,6 +80,45 @@
org.apache.sling/org.apache.sling.commons.metrics/1.2.6
com.google.guava/guava/15.0
+[artifacts]
+ # Add the Slingshot Sample provisioning model
+
org.apache.sling/org.apache.sling.sample.slingshot/0.9.0/slingfeature/slingfeature
+ commons-collections/commons-collections/3.2.2
+ org.apache.commons/commons-collections4/4.2
+ commons-codec/commons-codec/1.11
+ org.apache.commons/commons-math/2.2
+ org.apache.httpcomponents/httpcore-osgi/4.4.10
+ org.apache.httpcomponents/httpclient-osgi/4.5.6
+ org.apache.sling/org.apache.sling.adapter/2.1.10
+ org.apache.sling/org.apache.sling.auth.form/1.0.14
+ org.apache.sling/org.apache.sling.bundleresource.impl/2.3.2
+ org.apache.sling/org.apache.sling.commons.classloader/1.4.4
+ org.apache.sling/org.apache.sling.commons.compiler/2.3.6
+ org.apache.sling/org.apache.sling.commons.fsclassloader/1.0.10
+ org.apache.sling/org.apache.sling.commons.mime/2.2.0
+ org.apache.sling/org.apache.sling.commons.osgi/2.4.0
+ org.apache.sling/org.apache.sling.commons.scheduler/2.7.2
+ org.apache.sling/org.apache.sling.commons.threads/3.2.18
+ org.apache.sling/org.apache.sling.engine/2.6.18
+ org.apache.sling/org.apache.sling.fsresource/2.1.14
+ org.apache.sling/org.apache.sling.i18n/2.5.14
+ org.apache.sling/org.apache.sling.installer.console/1.0.2
+ org.apache.sling/org.apache.sling.installer.provider.jcr/3.1.26
+ org.apache.sling/org.apache.sling.installer.hc/2.0.0
+ org.apache.sling/org.apache.sling.jcr.contentloader/2.3.0
+ org.apache.sling/org.apache.sling.jcr.resource/3.0.18
+ org.apache.sling/org.apache.sling.models.api/1.3.8
+ org.apache.sling/org.apache.sling.models.impl/1.4.10
+ org.apache.sling/org.apache.sling.resourceresolver/1.6.8
+ org.apache.sling/org.apache.sling.serviceusermapper/1.4.4
+ org.apache.sling/org.apache.sling.serviceuser.webconsole/1.0.0
+ org.apache.sling/org.apache.sling.servlets.get/2.1.40
+ org.apache.sling/org.apache.sling.servlets.post/2.3.30
+ org.apache.sling/org.apache.sling.servlets.resolver/2.5.2
+ org.apache.sling/org.apache.sling.xss/2.1.8
+ javax.mail/mail/1.5.0-b01
+ org.apache.geronimo.bundles/jstl/1.2_1
+
[configurations]
org.apache.sling.engine.impl.log.RequestLogger
access.log.enabled=B"true"
@@ -217,3 +216,4 @@
user.mapping=[
"org.apache.sling.jcr.resource:validation\=sling-readall"
]
+
