Merge pull request #260 from apache/SLING-12117

SLING-12117 - Moving ServiceUnavailableFilter~startupandshutdown to app/starter feature
apache · Oct 24, 2023 · d2db799 · d2db799
2 parents cea42bd + 22809de
commit d2db799
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 13 deletions.
diff --git a/src/main/features/app/starter.json b/src/main/features/app/starter.json
@@ -4,5 +4,19 @@
             "id":"org.apache.sling:org.apache.sling.starter.content:1.0.14",
             "start-order":"20"
         }
-    ]
+    ],
+    "configurations": {
+        "org.apache.felix.hc.core.impl.filter.ServiceUnavailableFilter~startupandshutdown":{
+            "osgi.http.whiteboard.filter.regex":"(?!/system/).*",
+            "avoid404DuringStartup":true,
+            "service.ranking:Integer":"2147483647",
+            "includeExecutionResult":false,
+            "osgi.http.whiteboard.context.select":"(osgi.http.whiteboard.context.name=*)",
+            "tags":[
+                "systemalive"
+            ],
+            "autoDisableFilter":true,
+            "responseTextFor503":"classpath:org.apache.sling.starter.content:startup/index.html"
+        }
+    }
 }
diff --git a/src/main/features/healthcheck.json b/src/main/features/healthcheck.json
@@ -83,18 +83,6 @@
                 "system-resources"
             ]
         },
-        "org.apache.felix.hc.core.impl.filter.ServiceUnavailableFilter~startupandshutdown":{
-            "osgi.http.whiteboard.filter.regex":"(?!/system/).*",
-            "avoid404DuringStartup":true,
-            "service.ranking:Integer":"2147483647",
-            "includeExecutionResult":false,
-            "osgi.http.whiteboard.context.select":"(osgi.http.whiteboard.context.name=*)",
-            "tags":[
-                "systemalive"
-            ],
-            "autoDisableFilter":true,
-            "responseTextFor503":"classpath:org.apache.sling.starter.content:startup/index.html"
-        },
         "org.apache.felix.hc.core.impl.servlet.HealthCheckExecutorServlet~default":{
             "servletPath":"/system/health",
 	    "servletContextName":"org.osgi.service.http"