From ccb65b837f89c60496f6d3765107447e5ff8a15e Mon Sep 17 00:00:00 2001
From: Dominik Przybyl <przybyl.dominik@gmail.com>
Date: Tue, 17 Oct 2023 13:13:54 +0200
Subject: [PATCH 1/8] added cron support

---
 .../cognifide/apm/api/scripts/LaunchMode.java |   5 +
 .../com/cognifide/apm/api/scripts/Script.java |   5 +
 .../apm/api/scripts/TransientScript.java      |   5 +
 .../apm/core/launchers/ApmInstallService.java |  67 ++++++++++
 .../apm/core/scripts/LaunchMetadata.java      |   8 +-
 .../apm/core/scripts/ScriptFilters.java       |   7 +
 .../apm/core/scripts/ScriptModel.java         |  38 ++++++
 .../apm/core/scripts/ScriptNode.java          |   2 +
 .../apm/core/scripts/ScriptStorageImpl.java   |   1 +
 .../ScriptsResourceChangeListener.java        | 125 ++++++++++++++++++
 .../apm/core/endpoints/ScriptUploadForm.kt    |   5 +-
 .../apm/core/grammar/ReferenceFinder.kt       |   2 +
 .../install/launchers/ApmInstallService.java  |   6 +-
 .../clientlibs/views/editor/js/apm-editor.js  |   1 +
 .../views/editorGrid/js/apm-editor-grid.js    |   6 +
 .../apm/fragments/scriptLauncher/.content.xml |   5 +
 ...itoryInitializer~apm-script-mixin.cfg.json |   2 +-
 .../main/content/META-INF/vault/nodetypes.cnd |   1 +
 docs/launchers.md                             |   1 +
 19 files changed, 286 insertions(+), 6 deletions(-)
 create mode 100644 app/aem/core/src/main/java/com/cognifide/apm/core/launchers/ApmInstallService.java
 create mode 100644 app/aem/core/src/main/java/com/cognifide/apm/core/services/ScriptsResourceChangeListener.java

diff --git a/app/aem/api/src/main/java/com/cognifide/apm/api/scripts/LaunchMode.java b/app/aem/api/src/main/java/com/cognifide/apm/api/scripts/LaunchMode.java
index 1a9f90b4a..88eafaf37 100644
--- a/app/aem/api/src/main/java/com/cognifide/apm/api/scripts/LaunchMode.java
+++ b/app/aem/api/src/main/java/com/cognifide/apm/api/scripts/LaunchMode.java
@@ -35,6 +35,11 @@ public enum LaunchMode {
    */
   ON_SCHEDULE,
 
+  /**
+   * Executed on CRON expression
+   */
+  ON_CRON_EXPRESSION,
+
   /**
    * Executed always on bundle start
    */
diff --git a/app/aem/api/src/main/java/com/cognifide/apm/api/scripts/Script.java b/app/aem/api/src/main/java/com/cognifide/apm/api/scripts/Script.java
index fac23ca13..68e0ecb84 100644
--- a/app/aem/api/src/main/java/com/cognifide/apm/api/scripts/Script.java
+++ b/app/aem/api/src/main/java/com/cognifide/apm/api/scripts/Script.java
@@ -50,6 +50,11 @@ public interface Script {
    */
   Date getLaunchSchedule();
 
+  /**
+   * Get CRON expression
+   */
+  String getCronExpression();
+
   /**
    * Get last execution date
    */
diff --git a/app/aem/api/src/main/java/com/cognifide/apm/api/scripts/TransientScript.java b/app/aem/api/src/main/java/com/cognifide/apm/api/scripts/TransientScript.java
index 9da0b72bf..cfd84bd77 100644
--- a/app/aem/api/src/main/java/com/cognifide/apm/api/scripts/TransientScript.java
+++ b/app/aem/api/src/main/java/com/cognifide/apm/api/scripts/TransientScript.java
@@ -82,6 +82,11 @@ public Date getLaunchSchedule() {
     return null;
   }
 
+  @Override
+  public String getCronExpression() {
+    return null;
+  }
+
   @Override
   public Date getLastExecuted() {
     return null;
diff --git a/app/aem/core/src/main/java/com/cognifide/apm/core/launchers/ApmInstallService.java b/app/aem/core/src/main/java/com/cognifide/apm/core/launchers/ApmInstallService.java
new file mode 100644
index 000000000..c04c90a2f
--- /dev/null
+++ b/app/aem/core/src/main/java/com/cognifide/apm/core/launchers/ApmInstallService.java
@@ -0,0 +1,67 @@
+/*-
+ * ========================LICENSE_START=================================
+ * AEM Permission Management
+ * %%
+ * Copyright (C) 2013 Wunderman Thompson Technology
+ * %%
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * =========================LICENSE_END==================================
+ */
+package com.cognifide.apm.core.launchers;
+
+import com.cognifide.apm.api.scripts.Script;
+import com.cognifide.apm.api.services.ScriptFinder;
+import com.cognifide.apm.api.services.ScriptManager;
+import com.cognifide.apm.core.services.ResourceResolverProvider;
+import com.cognifide.apm.core.utils.RuntimeUtils;
+import com.cognifide.apm.core.utils.sling.SlingHelper;
+import java.lang.management.ManagementFactory;
+import java.util.Collections;
+import org.apache.commons.lang3.StringUtils;
+
+public class ApmInstallService extends AbstractLauncher implements Runnable {
+
+  private static final String AEM_MUTABLE_CONTENT_INSTANCE = "aem-install-mutable-content";
+
+  private final String scriptPath;
+
+  private final ResourceResolverProvider resolverProvider;
+
+  private final ScriptManager scriptManager;
+
+  private final ScriptFinder scriptFinder;
+
+  public ApmInstallService(String scriptPath, ResourceResolverProvider resolverProvider, ScriptManager scriptManager, ScriptFinder scriptFinder) {
+    this.scriptPath = scriptPath;
+    this.resolverProvider = resolverProvider;
+    this.scriptManager = scriptManager;
+    this.scriptFinder = scriptFinder;
+  }
+
+  @Override
+  public void run() {
+    SlingHelper.operateTraced(resolverProvider, resolver -> {
+      boolean compositeNodeStore = RuntimeUtils.determineCompositeNodeStore(resolver);
+      String instanceName = ManagementFactory.getRuntimeMXBean().getName();
+      if (!compositeNodeStore || StringUtils.contains(instanceName, AEM_MUTABLE_CONTENT_INSTANCE)) {
+        Script script = scriptFinder.find(scriptPath, resolver);
+        processScripts(Collections.singletonList(script), resolver);
+      }
+    });
+  }
+
+  @Override
+  protected ScriptManager getScriptManager() {
+    return scriptManager;
+  }
+}
diff --git a/app/aem/core/src/main/java/com/cognifide/apm/core/scripts/LaunchMetadata.java b/app/aem/core/src/main/java/com/cognifide/apm/core/scripts/LaunchMetadata.java
index 7e6c7d892..d7afcd69e 100644
--- a/app/aem/core/src/main/java/com/cognifide/apm/core/scripts/LaunchMetadata.java
+++ b/app/aem/core/src/main/java/com/cognifide/apm/core/scripts/LaunchMetadata.java
@@ -36,15 +36,17 @@ public class LaunchMetadata {
   private final String[] launchRunModes;
   private final String executionHook;
   private final LocalDateTime executionSchedule;
+  private final String cronExpression;
 
   public LaunchMetadata(boolean executionEnabled, LaunchMode launchMode, LaunchEnvironment launchEnvironment,
-      String[] launchRunModes, String executionHook, LocalDateTime executionSchedule) {
+      String[] launchRunModes, String executionHook, LocalDateTime executionSchedule, String cronExpression) {
     this.executionEnabled = executionEnabled;
     this.launchMode = launchMode;
     this.launchEnvironment = launchEnvironment;
     this.launchRunModes = launchRunModes;
     this.executionHook = executionHook;
     this.executionSchedule = executionSchedule;
+    this.cronExpression  = cronExpression;
   }
 
   public boolean isExecutionEnabled() {
@@ -75,4 +77,8 @@ public String getExecutionHook() {
   public LocalDateTime getExecutionSchedule() {
     return executionSchedule;
   }
+
+  public String  getCronExpression() {
+    return cronExpression;
+  }
 }
diff --git a/app/aem/core/src/main/java/com/cognifide/apm/core/scripts/ScriptFilters.java b/app/aem/core/src/main/java/com/cognifide/apm/core/scripts/ScriptFilters.java
index 7334b3084..ebed1fca3 100644
--- a/app/aem/core/src/main/java/com/cognifide/apm/core/scripts/ScriptFilters.java
+++ b/app/aem/core/src/main/java/com/cognifide/apm/core/scripts/ScriptFilters.java
@@ -58,6 +58,13 @@ public static Predicate<Script> onSchedule(LaunchEnvironment environment, RunMod
         .and(script -> script.getLastExecuted() == null && script.getLaunchSchedule().before(date));
   }
 
+  public static Predicate<Script> onCronExpression(LaunchEnvironment environment, RunModesProvider runModesProvider) {
+    return enabled()
+        .and(withLaunchMode(LaunchMode.ON_CRON_EXPRESSION))
+        .and(withLaunchEnvironment(environment))
+        .and(withLaunchRunModes(runModesProvider.getRunModes()));
+  }
+
   public static Predicate<Script> onStartup(LaunchEnvironment environment, RunModesProvider runModesProvider) {
     return enabled()
         .and(withLaunchMode(LaunchMode.ON_STARTUP))
diff --git a/app/aem/core/src/main/java/com/cognifide/apm/core/scripts/ScriptModel.java b/app/aem/core/src/main/java/com/cognifide/apm/core/scripts/ScriptModel.java
index 558a5c8d9..8f31f56a6 100644
--- a/app/aem/core/src/main/java/com/cognifide/apm/core/scripts/ScriptModel.java
+++ b/app/aem/core/src/main/java/com/cognifide/apm/core/scripts/ScriptModel.java
@@ -31,10 +31,12 @@
 import com.day.cq.commons.jcr.JcrConstants;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
+import java.util.Arrays;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.GregorianCalendar;
 import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
 import javax.annotation.PostConstruct;
@@ -42,6 +44,7 @@
 import javax.inject.Named;
 import javax.jcr.RepositoryException;
 import org.apache.commons.lang3.BooleanUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.sling.api.resource.ModifiableValueMap;
 import org.apache.sling.api.resource.PersistenceException;
 import org.apache.sling.api.resource.Resource;
@@ -91,6 +94,10 @@ public class ScriptModel implements MutableScript {
   @Named(ScriptNode.APM_LAUNCH_SCHEDULE)
   private Date launchSchedule;
 
+  @Inject
+  @Named(ScriptNode.APM_LAUNCH_CRON_EXPRESSION)
+  private String cronExpression;
+
   @Inject
   @Named(ScriptNode.APM_LAST_EXECUTED)
   private Date lastExecuted;
@@ -166,6 +173,11 @@ public Date getLaunchSchedule() {
     return launchSchedule;
   }
 
+  @Override
+  public String getCronExpression() {
+    return StringUtils.defaultString(cronExpression);
+  }
+
   @Override
   public boolean isLaunchEnabled() {
     return BooleanUtils.isNotFalse(launchEnabled);
@@ -260,4 +272,30 @@ public static boolean isScript(Resource resource) {
   private static List<String> getArrayProperty(Resource resource, String name) {
     return Lists.newArrayList(resource.getValueMap().get(name, new String[]{}));
   }
+
+  @Override
+  public boolean equals(Object obj) {
+    if (this == obj) {
+      return true;
+    }
+    if (obj instanceof ScriptModel) {
+      ScriptModel that = (ScriptModel) obj;
+      return Objects.equals(path, that.path)
+          && Objects.equals(launchEnabled, that.launchEnabled)
+          && Objects.equals(launchMode, that.launchMode)
+          && Objects.equals(launchEnvironment, that.launchEnvironment)
+          && Arrays.equals(launchRunModes, that.launchRunModes)
+          && Objects.equals(launchHook, that.launchHook)
+          && Objects.equals(launchSchedule, that.launchSchedule)
+          && Objects.equals(cronExpression, that.cronExpression)
+          && Objects.equals(checksum, that.checksum)
+          && Objects.equals(verified, that.verified);
+    }
+    return false;
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hashCode(path);
+  }
 }
diff --git a/app/aem/core/src/main/java/com/cognifide/apm/core/scripts/ScriptNode.java b/app/aem/core/src/main/java/com/cognifide/apm/core/scripts/ScriptNode.java
index b46a16477..a0be4e874 100644
--- a/app/aem/core/src/main/java/com/cognifide/apm/core/scripts/ScriptNode.java
+++ b/app/aem/core/src/main/java/com/cognifide/apm/core/scripts/ScriptNode.java
@@ -37,6 +37,8 @@ public final class ScriptNode {
 
   public static final String APM_LAUNCH_SCHEDULE = "apm:launchSchedule";
 
+  public static final String APM_LAUNCH_CRON_EXPRESSION = "apm:launchCronExpression";
+
   public static final String APM_LAST_EXECUTED = "apm:lastExecuted";
 
   public static final String APM_CHECKSUM = "apm:checksum";
diff --git a/app/aem/core/src/main/java/com/cognifide/apm/core/scripts/ScriptStorageImpl.java b/app/aem/core/src/main/java/com/cognifide/apm/core/scripts/ScriptStorageImpl.java
index 4ce682fbe..3cc5ace4f 100644
--- a/app/aem/core/src/main/java/com/cognifide/apm/core/scripts/ScriptStorageImpl.java
+++ b/app/aem/core/src/main/java/com/cognifide/apm/core/scripts/ScriptStorageImpl.java
@@ -114,6 +114,7 @@ private Script saveScript(FileDescriptor descriptor, LaunchMetadata launchMetada
       setOrRemoveProperty(fileNode, ScriptNode.APM_LAUNCH_RUN_MODES, launchMetadata.getLaunchRunModes());
       setOrRemoveProperty(fileNode, ScriptNode.APM_LAUNCH_HOOK, launchMetadata.getExecutionHook());
       setOrRemoveProperty(fileNode, ScriptNode.APM_LAUNCH_SCHEDULE, launchMetadata.getExecutionSchedule());
+      setOrRemoveProperty(fileNode, ScriptNode.APM_LAUNCH_CRON_EXPRESSION, launchMetadata.getCronExpression());
       removeProperty(fileNode, ScriptNode.APM_LAST_EXECUTED);
       JcrUtils.setLastModified(fileNode, Calendar.getInstance());
       session.save();
diff --git a/app/aem/core/src/main/java/com/cognifide/apm/core/services/ScriptsResourceChangeListener.java b/app/aem/core/src/main/java/com/cognifide/apm/core/services/ScriptsResourceChangeListener.java
new file mode 100644
index 000000000..90e845599
--- /dev/null
+++ b/app/aem/core/src/main/java/com/cognifide/apm/core/services/ScriptsResourceChangeListener.java
@@ -0,0 +1,125 @@
+package com.cognifide.apm.core.services;
+
+import com.cognifide.apm.api.scripts.LaunchMode;
+import com.cognifide.apm.api.scripts.Script;
+import com.cognifide.apm.api.services.ScriptFinder;
+import com.cognifide.apm.api.services.ScriptManager;
+import com.cognifide.apm.core.Apm;
+import com.cognifide.apm.core.Property;
+import com.cognifide.apm.core.launchers.ApmInstallService;
+import com.cognifide.apm.core.utils.sling.SlingHelper;
+import java.text.SimpleDateFormat;
+import java.util.Dictionary;
+import java.util.HashMap;
+import java.util.Hashtable;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.sling.api.resource.observation.ResourceChange;
+import org.apache.sling.api.resource.observation.ResourceChangeListener;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.FrameworkUtil;
+import org.osgi.framework.ServiceRegistration;
+import org.osgi.service.component.annotations.Activate;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Reference;
+
+@Component(
+    immediate = true,
+    property = {
+        Property.RESOURCE_PATH + "/conf/apm/scripts",
+        Property.CHANGE_TYPE + "ADDED",
+        Property.CHANGE_TYPE + "CHANGED",
+        Property.CHANGE_TYPE + "REMOVED",
+        Property.VENDOR
+    }
+)
+public class ScriptsResourceChangeListener implements ResourceChangeListener {
+
+  @Reference
+  private ResourceResolverProvider resolverProvider;
+
+  @Reference
+  private ScriptFinder scriptFinder;
+
+  @Reference
+  private ScriptManager scriptManager;
+
+  private Map<String, RegisterScript> registeredScripts;
+
+  @Activate
+  public void activate() {
+    registeredScripts = new HashMap<>();
+    Bundle currentBundle = FrameworkUtil.getBundle(ScriptsResourceChangeListener.class);
+    BundleContext bundleContext = currentBundle.getBundleContext();
+
+    SlingHelper.operateTraced(resolverProvider, resolver ->
+        scriptFinder.findAll(script -> {
+              LaunchMode launchMode = script.getLaunchMode();
+              return launchMode == LaunchMode.ON_SCHEDULE && script.getLaunchSchedule() != null
+                  || launchMode == LaunchMode.ON_CRON_EXPRESSION && StringUtils.isNotEmpty(script.getCronExpression());
+            }, resolver)
+            .forEach(script -> registerService(script, bundleContext))
+    );
+  }
+
+  @Override
+  public void onChange(List<ResourceChange> list) {
+    Bundle currentBundle = FrameworkUtil.getBundle(ScriptsResourceChangeListener.class);
+    BundleContext bundleContext = currentBundle.getBundleContext();
+
+    SlingHelper.operateTraced(resolverProvider, resolver ->
+        list.stream()
+            .filter(resourceChange -> StringUtils.endsWith(resourceChange.getPath(), Apm.FILE_EXT))
+            .forEach(resourceChange -> {
+              if (resourceChange.getType() == ResourceChange.ChangeType.ADDED) {
+                Script script = scriptFinder.find(resourceChange.getPath(), resolver);
+                if (script != null) {
+                  registerService(script, bundleContext);
+                }
+              } else if (resourceChange.getType() == ResourceChange.ChangeType.REMOVED) {
+                RegisterScript registeredScript = registeredScripts.get(resourceChange.getPath());
+                if (registeredScript != null) {
+                  registeredScript.registration.unregister();
+                  registeredScripts.remove(resourceChange.getPath());
+                }
+              } else if (resourceChange.getType() == ResourceChange.ChangeType.CHANGED) {
+                Script script = scriptFinder.find(resourceChange.getPath(), resolver);
+                RegisterScript registeredScript = registeredScripts.get(resourceChange.getPath());
+                if (script != null && !Objects.equals(script, registeredScript.script)) {
+                  registeredScript.registration.unregister();
+                  registeredScripts.remove(resourceChange.getPath());
+                  registerService(script, bundleContext);
+                }
+              }
+            })
+    );
+  }
+
+  private void registerService(Script script, BundleContext bundleContext) {
+    Dictionary<String, Object> dictionary = new Hashtable<>();
+    if (script.getLaunchMode() == LaunchMode.ON_SCHEDULE) {
+      SimpleDateFormat cronExpressionFormat = new SimpleDateFormat("s m H d M ? y");
+      dictionary.put("scheduler.expression", cronExpressionFormat.format(script.getLaunchSchedule()));
+    } else if (script.getLaunchMode() == LaunchMode.ON_CRON_EXPRESSION) {
+      dictionary.put("scheduler.expression", script.getCronExpression());
+    }
+    ApmInstallService service = new ApmInstallService(script.getPath(), resolverProvider, scriptManager, scriptFinder);
+    ServiceRegistration<Runnable> registration = bundleContext.registerService(Runnable.class, service, dictionary);
+    registeredScripts.put(script.getPath(), new RegisterScript(script, registration));
+  }
+
+  private class RegisterScript {
+
+    private Script script;
+
+    private ServiceRegistration<Runnable> registration;
+
+    public RegisterScript(Script script, ServiceRegistration<Runnable> registration) {
+      this.script = script;
+      this.registration = registration;
+    }
+  }
+}
diff --git a/app/aem/core/src/main/kotlin/com/cognifide/apm/core/endpoints/ScriptUploadForm.kt b/app/aem/core/src/main/kotlin/com/cognifide/apm/core/endpoints/ScriptUploadForm.kt
index d9fcd0771..bc5f50bd7 100644
--- a/app/aem/core/src/main/kotlin/com/cognifide/apm/core/endpoints/ScriptUploadForm.kt
+++ b/app/aem/core/src/main/kotlin/com/cognifide/apm/core/endpoints/ScriptUploadForm.kt
@@ -44,9 +44,10 @@ class ScriptUploadForm @Inject constructor(
     @param:RequestParameter(ScriptNode.APM_LAUNCH_ENVIRONMENT) val launchEnvironment: LaunchEnvironment?,
     @param:RequestParameter(ScriptNode.APM_LAUNCH_RUN_MODES) val launchRunModes: Array<String>?,
     @param:RequestParameter(ScriptNode.APM_LAUNCH_HOOK) val launchHook: String?,
-    @param:RequestParameter(ScriptNode.APM_LAUNCH_SCHEDULE) @param:DateFormat("yyyy-MM-dd'T'HH:mm:ss") val launchSchedule: LocalDateTime?
+    @param:RequestParameter(ScriptNode.APM_LAUNCH_SCHEDULE) @param:DateFormat("yyyy-MM-dd'T'HH:mm:ss") val launchSchedule: LocalDateTime?,
+    @param:RequestParameter(ScriptNode.APM_LAUNCH_CRON_EXPRESSION) val cronExpression: String?
 ) {
     fun toLaunchMetadata(): LaunchMetadata {
-        return LaunchMetadata(launchEnabled, launchMode, launchEnvironment, launchRunModes, launchHook, launchSchedule)
+        return LaunchMetadata(launchEnabled, launchMode, launchEnvironment, launchRunModes, launchHook, launchSchedule, cronExpression)
     }
 }
\ No newline at end of file
diff --git a/app/aem/core/src/main/kotlin/com/cognifide/apm/core/grammar/ReferenceFinder.kt b/app/aem/core/src/main/kotlin/com/cognifide/apm/core/grammar/ReferenceFinder.kt
index fe1995608..7df890448 100644
--- a/app/aem/core/src/main/kotlin/com/cognifide/apm/core/grammar/ReferenceFinder.kt
+++ b/app/aem/core/src/main/kotlin/com/cognifide/apm/core/grammar/ReferenceFinder.kt
@@ -158,6 +158,8 @@ class ReferenceFinder(private val scriptFinder: ScriptFinder, private val resour
 
         override fun getLaunchSchedule(): Date? = null
 
+        override fun getCronExpression(): String? = null
+
         override fun getLastExecuted(): Date? = null
 
         override fun getChecksum(): String? = null
diff --git a/app/aem/install/src/main/java/com/cognifide/apm/install/launchers/ApmInstallService.java b/app/aem/install/src/main/java/com/cognifide/apm/install/launchers/ApmInstallService.java
index d0f9e9481..2814511fb 100644
--- a/app/aem/install/src/main/java/com/cognifide/apm/install/launchers/ApmInstallService.java
+++ b/app/aem/install/src/main/java/com/cognifide/apm/install/launchers/ApmInstallService.java
@@ -48,7 +48,7 @@
 import org.osgi.service.metatype.annotations.ObjectClassDefinition;
 
 @Component(
-    service = {ApmInstallService.class, Runnable.class},
+    service = Runnable.class,
     immediate = true,
     property = {
         Property.DESCRIPTION + "APM Launches configured scripts",
@@ -80,7 +80,9 @@ public class ApmInstallService extends AbstractLauncher implements Runnable {
   @Activate
   public void activate(Configuration config) {
     this.config = config;
-    process();
+    if (StringUtils.isNotEmpty(config.scheduler_expression())) {
+      process();
+    }
   }
 
   @Override
diff --git a/app/aem/ui.apps.base/src/main/content/jcr_root/apps/apm/clientlibs/views/editor/js/apm-editor.js b/app/aem/ui.apps.base/src/main/content/jcr_root/apps/apm/clientlibs/views/editor/js/apm-editor.js
index 31af9c8c4..c77f52904 100644
--- a/app/aem/ui.apps.base/src/main/content/jcr_root/apps/apm/clientlibs/views/editor/js/apm-editor.js
+++ b/app/aem/ui.apps.base/src/main/content/jcr_root/apps/apm/clientlibs/views/editor/js/apm-editor.js
@@ -41,6 +41,7 @@
       'apm:launchRunModes',
       'apm:launchHook',
       'apm:launchSchedule',
+      'apm:launchCronExpression',
     ];
 
     function Console($el) {
diff --git a/app/aem/ui.apps.base/src/main/content/jcr_root/apps/apm/clientlibs/views/editorGrid/js/apm-editor-grid.js b/app/aem/ui.apps.base/src/main/content/jcr_root/apps/apm/clientlibs/views/editorGrid/js/apm-editor-grid.js
index d321bba18..54af97215 100644
--- a/app/aem/ui.apps.base/src/main/content/jcr_root/apps/apm/clientlibs/views/editorGrid/js/apm-editor-grid.js
+++ b/app/aem/ui.apps.base/src/main/content/jcr_root/apps/apm/clientlibs/views/editorGrid/js/apm-editor-grid.js
@@ -31,6 +31,7 @@
     launchRunModes: 'apm:launchRunModes',
     launchHook: 'apm:launchHook',
     launchSchedule: 'apm:launchSchedule',
+    launchCronExpression: 'apm:launchCronExpression',
   };
 
   const LaunchModes = {
@@ -38,6 +39,7 @@
     onInstall: 'ON_INSTALL',
     onInstallIfModified: 'ON_INSTALL_IF_MODIFIED',
     onSchedule: 'ON_SCHEDULE',
+    onCronExpression: 'ON_CRON_EXPRESSION',
   };
 
   class EditorGrid {
@@ -52,6 +54,7 @@
         launchRunModes: fields[FieldNames.launchRunModes],
         launchHook: fields[FieldNames.launchHook],
         launchSchedule: fields[FieldNames.launchSchedule],
+        launchCronExpression: fields[FieldNames.launchCronExpression],
       };
 
       this.init();
@@ -99,6 +102,9 @@
         if (launchMode === LaunchModes.onSchedule) {
           showFields.push(this.fields.launchSchedule);
         }
+        if (launchMode === LaunchModes.onCronExpression) {
+          showFields.push(this.fields.launchCronExpression);
+        }
         if (launchMode !== LaunchModes.onDemand) {
           showFields.push(this.fields.launchEnvironment);
           showFields.push(this.fields.launchRunModes);
diff --git a/app/aem/ui.apps.base/src/main/content/jcr_root/apps/apm/fragments/scriptLauncher/.content.xml b/app/aem/ui.apps.base/src/main/content/jcr_root/apps/apm/fragments/scriptLauncher/.content.xml
index d26f468e7..2b145c57d 100644
--- a/app/aem/ui.apps.base/src/main/content/jcr_root/apps/apm/fragments/scriptLauncher/.content.xml
+++ b/app/aem/ui.apps.base/src/main/content/jcr_root/apps/apm/fragments/scriptLauncher/.content.xml
@@ -54,5 +54,10 @@
                 name="apm:launchSchedule"
                 type="datetime"
                 valueFormat="YYYY-MM-DD[T]HH:mm:ss"/>
+        <cronExpression
+                jcr:primaryType="nt:unstructured"
+                sling:resourceType="granite/ui/components/coral/foundation/form/textfield"
+                fieldLabel="CRON expression"
+                name="apm:launchCronExpression"/>
     </items>
 </jcr:root>
diff --git a/app/aem/ui.apps.cloud/src/main/content/jcr_root/apps/apm/config/org.apache.sling.jcr.repoinit.RepositoryInitializer~apm-script-mixin.cfg.json b/app/aem/ui.apps.cloud/src/main/content/jcr_root/apps/apm/config/org.apache.sling.jcr.repoinit.RepositoryInitializer~apm-script-mixin.cfg.json
index 71c73f46d..c5c17947d 100644
--- a/app/aem/ui.apps.cloud/src/main/content/jcr_root/apps/apm/config/org.apache.sling.jcr.repoinit.RepositoryInitializer~apm-script-mixin.cfg.json
+++ b/app/aem/ui.apps.cloud/src/main/content/jcr_root/apps/apm/config/org.apache.sling.jcr.repoinit.RepositoryInitializer~apm-script-mixin.cfg.json
@@ -1,5 +1,5 @@
 {
   "scripts":[
-    "register nodetypes\n<<===\n<apm='http://www.cognifide.com/apm/1.1'>\n\n[apm:Script]\nmixin\n- apm:launchEnabled (boolean)\n- apm:launchMode (string)\n- apm:launchEnvironment (string)\n- apm:launchRunModes (string) multiple\n- apm:launchHook (string)\n- apm:launchSchedule (date)\n- apm:lastExecuted (date)\n- apm:checksum (string)\n- apm:verified (string)\n===>>"
+    "register nodetypes\n<<===\n<apm='http://www.cognifide.com/apm/1.1'>\n\n[apm:Script]\nmixin\n- apm:launchEnabled (boolean)\n- apm:launchMode (string)\n- apm:launchEnvironment (string)\n- apm:launchRunModes (string) multiple\n- apm:launchHook (string)\n- apm:launchSchedule (date)\n- apm:launchCronExpression (string)\n- apm:lastExecuted (date)\n- apm:checksum (string)\n- apm:verified (string)\n===>>"
   ]
 }
\ No newline at end of file
diff --git a/app/aem/ui.apps/src/main/content/META-INF/vault/nodetypes.cnd b/app/aem/ui.apps/src/main/content/META-INF/vault/nodetypes.cnd
index 454eb15d7..f9cf81c87 100644
--- a/app/aem/ui.apps/src/main/content/META-INF/vault/nodetypes.cnd
+++ b/app/aem/ui.apps/src/main/content/META-INF/vault/nodetypes.cnd
@@ -8,6 +8,7 @@
   - apm:launchRunModes (string) multiple
   - apm:launchHook (string)
   - apm:launchSchedule (date)
+  - apm:launchCronExpression (string)
   - apm:lastExecuted (date)
   - apm:checksum (string)
   - apm:verified (string)
diff --git a/docs/launchers.md b/docs/launchers.md
index fdda3dbb3..3cbd4717a 100644
--- a/docs/launchers.md
+++ b/docs/launchers.md
@@ -12,6 +12,7 @@ To launch script automatically, the script needs to be placed under `/conf/apm/s
 * `ON_STARTUP` - to launch the script on every bundle activation without any other conditions,
 * `ON_STARTUP_IF_MODIFIED` - to launch the script on bundle activation if the file's changed,
 * `ON_SCHEDULE` - to launch the script on specific date, which needs to be set in property `apm:launchSchedule`,
+* `ON_CRON_EXPRESSION` - to launch the script on specific CRON expression, which needs to be set in property `apm:launchCronExpression`,
 * `ON_INSTALL` - to launch the script after package installation (additional configuration required, see [Install hook](#install-hook)),
 * `ON_INSTALL_IF_MODIFIED` - to launch the script after package installation if the file's changed (additional configuration required, see [Install hook](#install-hook)).
 

From 632607dafc77a31b6698dff74a40bd813ec8c581 Mon Sep 17 00:00:00 2001
From: Dominik Przybyl <przybyl.dominik@gmail.com>
Date: Wed, 18 Oct 2023 15:58:06 +0200
Subject: [PATCH 2/8] added cron support

---
 .../launchers/ScheduledScriptLauncher.java    | 100 ------------------
 .../apm/core/scripts/ScriptFilters.java       |  35 +++---
 .../ScriptsResourceChangeListener.java        |  30 ++++--
 3 files changed, 40 insertions(+), 125 deletions(-)
 delete mode 100644 app/aem/core/src/main/java/com/cognifide/apm/core/launchers/ScheduledScriptLauncher.java

diff --git a/app/aem/core/src/main/java/com/cognifide/apm/core/launchers/ScheduledScriptLauncher.java b/app/aem/core/src/main/java/com/cognifide/apm/core/launchers/ScheduledScriptLauncher.java
deleted file mode 100644
index 85b213ffc..000000000
--- a/app/aem/core/src/main/java/com/cognifide/apm/core/launchers/ScheduledScriptLauncher.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * AEM Permission Management
- * %%
- * Copyright (C) 2013 Wunderman Thompson Technology
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package com.cognifide.apm.core.launchers;
-
-import static com.cognifide.apm.core.scripts.ScriptFilters.onSchedule;
-
-import com.cognifide.apm.api.scripts.LaunchEnvironment;
-import com.cognifide.apm.api.scripts.Script;
-import com.cognifide.apm.api.services.RunModesProvider;
-import com.cognifide.apm.api.services.ScriptFinder;
-import com.cognifide.apm.api.services.ScriptManager;
-import com.cognifide.apm.core.Property;
-import com.cognifide.apm.core.launchers.ScheduledScriptLauncher.ScheduleExecutorConfiguration;
-import com.cognifide.apm.core.services.ResourceResolverProvider;
-import com.cognifide.apm.core.utils.sling.SlingHelper;
-import java.util.Date;
-import java.util.List;
-import org.apache.sling.api.resource.PersistenceException;
-import org.apache.sling.api.resource.ResourceResolver;
-import org.osgi.service.component.annotations.Activate;
-import org.osgi.service.component.annotations.Component;
-import org.osgi.service.component.annotations.Modified;
-import org.osgi.service.component.annotations.Reference;
-import org.osgi.service.metatype.annotations.AttributeDefinition;
-import org.osgi.service.metatype.annotations.Designate;
-import org.osgi.service.metatype.annotations.ObjectClassDefinition;
-
-@Component(
-    property = {
-        Property.DESCRIPTION + "APM Launches scheduled scripts",
-        Property.VENDOR,
-        Property.SCHEDULER + "0 * * * * ?"
-    }
-)
-@Designate(ocd = ScheduleExecutorConfiguration.class)
-public class ScheduledScriptLauncher extends AbstractLauncher implements Runnable {
-
-  @Reference
-  private ScriptManager scriptManager;
-
-  @Reference
-  private ScriptFinder scriptFinder;
-
-  @Reference
-  private RunModesProvider runModesProvider;
-
-  @Reference
-  private ResourceResolverProvider resolverProvider;
-
-  private boolean enabled = true;
-
-  @Activate
-  @Modified
-  public void activate(ScheduleExecutorConfiguration config) {
-    enabled = !config.disableScheduleExecutor();
-  }
-
-  @Override
-  public void run() {
-    if (enabled) {
-      SlingHelper.operateTraced(resolverProvider, this::runScheduled);
-    }
-  }
-
-  private void runScheduled(ResourceResolver resolver) throws PersistenceException {
-    LaunchEnvironment environment = LaunchEnvironment.of(runModesProvider);
-    List<Script> scripts = scriptFinder.findAll(onSchedule(environment, runModesProvider, new Date()), resolver);
-    processScripts(scripts, resolver);
-  }
-
-  @Override
-  public ScriptManager getScriptManager() {
-    return scriptManager;
-  }
-
-  @ObjectClassDefinition(name = "AEM Permission Management - Schedule Launcher Configuration")
-  public @interface ScheduleExecutorConfiguration {
-
-    @AttributeDefinition(name = "Disable Schedule Launcher", defaultValue = "false")
-    boolean disableScheduleExecutor();
-  }
-
-}
\ No newline at end of file
diff --git a/app/aem/core/src/main/java/com/cognifide/apm/core/scripts/ScriptFilters.java b/app/aem/core/src/main/java/com/cognifide/apm/core/scripts/ScriptFilters.java
index ebed1fca3..c5326ce85 100644
--- a/app/aem/core/src/main/java/com/cognifide/apm/core/scripts/ScriptFilters.java
+++ b/app/aem/core/src/main/java/com/cognifide/apm/core/scripts/ScriptFilters.java
@@ -23,7 +23,6 @@
 import com.cognifide.apm.api.scripts.LaunchMode;
 import com.cognifide.apm.api.scripts.Script;
 import com.cognifide.apm.api.services.RunModesProvider;
-import java.util.Date;
 import java.util.Set;
 import java.util.function.Predicate;
 import org.apache.commons.lang3.StringUtils;
@@ -50,18 +49,10 @@ public static Predicate<Script> onInstallIfModified(LaunchEnvironment environmen
         .and(withLaunchHook(currentHook));
   }
 
-  public static Predicate<Script> onSchedule(LaunchEnvironment environment, RunModesProvider runModesProvider, Date date) {
+  public static Predicate<Script> onScheduleOrCronExpression(RunModesProvider runModesProvider) {
     return enabled()
-        .and(withLaunchMode(LaunchMode.ON_SCHEDULE))
-        .and(withLaunchEnvironment(environment))
-        .and(withLaunchRunModes(runModesProvider.getRunModes()))
-        .and(script -> script.getLastExecuted() == null && script.getLaunchSchedule().before(date));
-  }
-
-  public static Predicate<Script> onCronExpression(LaunchEnvironment environment, RunModesProvider runModesProvider) {
-    return enabled()
-        .and(withLaunchMode(LaunchMode.ON_CRON_EXPRESSION))
-        .and(withLaunchEnvironment(environment))
+        .and(withSchedule().or(withCronExpression()))
+        .and(withLaunchEnvironment(runModesProvider))
         .and(withLaunchRunModes(runModesProvider.getRunModes()));
   }
 
@@ -88,16 +79,30 @@ private static Predicate<Script> withLaunchEnvironment(LaunchEnvironment environ
         || environment == script.getLaunchEnvironment();
   }
 
-  private static Predicate<? super Script> withLaunchRunModes(Set<String> runModes) {
+  private static Predicate<Script> withLaunchEnvironment(RunModesProvider runModesProvider) {
+    LaunchEnvironment environment = LaunchEnvironment.of(runModesProvider);
+    return script -> script.getLaunchEnvironment() == LaunchEnvironment.ALL
+        || environment == script.getLaunchEnvironment();
+  }
+
+  private static Predicate<Script> withLaunchRunModes(Set<String> runModes) {
     return script -> script.getLaunchRunModes() == null
         || runModes.containsAll(script.getLaunchRunModes());
   }
 
-  private static Predicate<Script> withLaunchMode(final LaunchMode mode) {
+  private static Predicate<Script> withLaunchMode(LaunchMode mode) {
     return script -> script.getLaunchMode() == mode;
   }
 
+  private static Predicate<Script> withSchedule() {
+    return script -> script.getLaunchMode() == LaunchMode.ON_SCHEDULE && script.getLaunchSchedule() != null;
+  }
+
+  private static Predicate<Script> withCronExpression() {
+    return script -> script.getLaunchMode() == LaunchMode.ON_CRON_EXPRESSION && StringUtils.isNotEmpty(script.getCronExpression());
+  }
+
   private static Predicate<Script> enabled() {
-    return script -> script.isLaunchEnabled();
+    return Script::isLaunchEnabled;
   }
 }
diff --git a/app/aem/core/src/main/java/com/cognifide/apm/core/services/ScriptsResourceChangeListener.java b/app/aem/core/src/main/java/com/cognifide/apm/core/services/ScriptsResourceChangeListener.java
index 90e845599..8efc34cff 100644
--- a/app/aem/core/src/main/java/com/cognifide/apm/core/services/ScriptsResourceChangeListener.java
+++ b/app/aem/core/src/main/java/com/cognifide/apm/core/services/ScriptsResourceChangeListener.java
@@ -1,7 +1,10 @@
 package com.cognifide.apm.core.services;
 
+import static com.cognifide.apm.core.scripts.ScriptFilters.onScheduleOrCronExpression;
+
 import com.cognifide.apm.api.scripts.LaunchMode;
 import com.cognifide.apm.api.scripts.Script;
+import com.cognifide.apm.api.services.RunModesProvider;
 import com.cognifide.apm.api.services.ScriptFinder;
 import com.cognifide.apm.api.services.ScriptManager;
 import com.cognifide.apm.core.Apm;
@@ -24,6 +27,7 @@
 import org.osgi.framework.ServiceRegistration;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Deactivate;
 import org.osgi.service.component.annotations.Reference;
 
 @Component(
@@ -47,6 +51,9 @@ public class ScriptsResourceChangeListener implements ResourceChangeListener {
   @Reference
   private ScriptManager scriptManager;
 
+  @Reference
+  private RunModesProvider runModesProvider;
+
   private Map<String, RegisterScript> registeredScripts;
 
   @Activate
@@ -56,15 +63,18 @@ public void activate() {
     BundleContext bundleContext = currentBundle.getBundleContext();
 
     SlingHelper.operateTraced(resolverProvider, resolver ->
-        scriptFinder.findAll(script -> {
-              LaunchMode launchMode = script.getLaunchMode();
-              return launchMode == LaunchMode.ON_SCHEDULE && script.getLaunchSchedule() != null
-                  || launchMode == LaunchMode.ON_CRON_EXPRESSION && StringUtils.isNotEmpty(script.getCronExpression());
-            }, resolver)
+        scriptFinder.findAll(onScheduleOrCronExpression(runModesProvider), resolver)
             .forEach(script -> registerService(script, bundleContext))
     );
   }
 
+  @Deactivate
+  public void deactivate() {
+    registeredScripts.values()
+        .forEach(registeredScript -> registeredScript.registration.unregister());
+    registeredScripts.clear();
+  }
+
   @Override
   public void onChange(List<ResourceChange> list) {
     Bundle currentBundle = FrameworkUtil.getBundle(ScriptsResourceChangeListener.class);
@@ -76,7 +86,7 @@ public void onChange(List<ResourceChange> list) {
             .forEach(resourceChange -> {
               if (resourceChange.getType() == ResourceChange.ChangeType.ADDED) {
                 Script script = scriptFinder.find(resourceChange.getPath(), resolver);
-                if (script != null) {
+                if (onScheduleOrCronExpression(runModesProvider).test(script)) {
                   registerService(script, bundleContext);
                 }
               } else if (resourceChange.getType() == ResourceChange.ChangeType.REMOVED) {
@@ -88,7 +98,7 @@ public void onChange(List<ResourceChange> list) {
               } else if (resourceChange.getType() == ResourceChange.ChangeType.CHANGED) {
                 Script script = scriptFinder.find(resourceChange.getPath(), resolver);
                 RegisterScript registeredScript = registeredScripts.get(resourceChange.getPath());
-                if (script != null && !Objects.equals(script, registeredScript.script)) {
+                if (onScheduleOrCronExpression(runModesProvider).test(script) && !Objects.equals(script, registeredScript.script)) {
                   registeredScript.registration.unregister();
                   registeredScripts.remove(resourceChange.getPath());
                   registerService(script, bundleContext);
@@ -111,11 +121,11 @@ private void registerService(Script script, BundleContext bundleContext) {
     registeredScripts.put(script.getPath(), new RegisterScript(script, registration));
   }
 
-  private class RegisterScript {
+  private static class RegisterScript {
 
-    private Script script;
+    private final Script script;
 
-    private ServiceRegistration<Runnable> registration;
+    private final ServiceRegistration<Runnable> registration;
 
     public RegisterScript(Script script, ServiceRegistration<Runnable> registration) {
       this.script = script;

From 2a826ebd3e615aa82ecc53d0e278bfa614597fb5 Mon Sep 17 00:00:00 2001
From: Dominik Przybyl <przybyl.dominik@gmail.com>
Date: Wed, 18 Oct 2023 15:58:06 +0200
Subject: [PATCH 3/8] added cron support

---
 .../launchers/ScheduledScriptLauncher.java    | 100 ------------------
 .../apm/core/scripts/ScriptFilters.java       |  35 +++---
 .../ScriptsResourceChangeListener.java        |  42 +++++---
 3 files changed, 45 insertions(+), 132 deletions(-)
 delete mode 100644 app/aem/core/src/main/java/com/cognifide/apm/core/launchers/ScheduledScriptLauncher.java

diff --git a/app/aem/core/src/main/java/com/cognifide/apm/core/launchers/ScheduledScriptLauncher.java b/app/aem/core/src/main/java/com/cognifide/apm/core/launchers/ScheduledScriptLauncher.java
deleted file mode 100644
index 85b213ffc..000000000
--- a/app/aem/core/src/main/java/com/cognifide/apm/core/launchers/ScheduledScriptLauncher.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * AEM Permission Management
- * %%
- * Copyright (C) 2013 Wunderman Thompson Technology
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package com.cognifide.apm.core.launchers;
-
-import static com.cognifide.apm.core.scripts.ScriptFilters.onSchedule;
-
-import com.cognifide.apm.api.scripts.LaunchEnvironment;
-import com.cognifide.apm.api.scripts.Script;
-import com.cognifide.apm.api.services.RunModesProvider;
-import com.cognifide.apm.api.services.ScriptFinder;
-import com.cognifide.apm.api.services.ScriptManager;
-import com.cognifide.apm.core.Property;
-import com.cognifide.apm.core.launchers.ScheduledScriptLauncher.ScheduleExecutorConfiguration;
-import com.cognifide.apm.core.services.ResourceResolverProvider;
-import com.cognifide.apm.core.utils.sling.SlingHelper;
-import java.util.Date;
-import java.util.List;
-import org.apache.sling.api.resource.PersistenceException;
-import org.apache.sling.api.resource.ResourceResolver;
-import org.osgi.service.component.annotations.Activate;
-import org.osgi.service.component.annotations.Component;
-import org.osgi.service.component.annotations.Modified;
-import org.osgi.service.component.annotations.Reference;
-import org.osgi.service.metatype.annotations.AttributeDefinition;
-import org.osgi.service.metatype.annotations.Designate;
-import org.osgi.service.metatype.annotations.ObjectClassDefinition;
-
-@Component(
-    property = {
-        Property.DESCRIPTION + "APM Launches scheduled scripts",
-        Property.VENDOR,
-        Property.SCHEDULER + "0 * * * * ?"
-    }
-)
-@Designate(ocd = ScheduleExecutorConfiguration.class)
-public class ScheduledScriptLauncher extends AbstractLauncher implements Runnable {
-
-  @Reference
-  private ScriptManager scriptManager;
-
-  @Reference
-  private ScriptFinder scriptFinder;
-
-  @Reference
-  private RunModesProvider runModesProvider;
-
-  @Reference
-  private ResourceResolverProvider resolverProvider;
-
-  private boolean enabled = true;
-
-  @Activate
-  @Modified
-  public void activate(ScheduleExecutorConfiguration config) {
-    enabled = !config.disableScheduleExecutor();
-  }
-
-  @Override
-  public void run() {
-    if (enabled) {
-      SlingHelper.operateTraced(resolverProvider, this::runScheduled);
-    }
-  }
-
-  private void runScheduled(ResourceResolver resolver) throws PersistenceException {
-    LaunchEnvironment environment = LaunchEnvironment.of(runModesProvider);
-    List<Script> scripts = scriptFinder.findAll(onSchedule(environment, runModesProvider, new Date()), resolver);
-    processScripts(scripts, resolver);
-  }
-
-  @Override
-  public ScriptManager getScriptManager() {
-    return scriptManager;
-  }
-
-  @ObjectClassDefinition(name = "AEM Permission Management - Schedule Launcher Configuration")
-  public @interface ScheduleExecutorConfiguration {
-
-    @AttributeDefinition(name = "Disable Schedule Launcher", defaultValue = "false")
-    boolean disableScheduleExecutor();
-  }
-
-}
\ No newline at end of file
diff --git a/app/aem/core/src/main/java/com/cognifide/apm/core/scripts/ScriptFilters.java b/app/aem/core/src/main/java/com/cognifide/apm/core/scripts/ScriptFilters.java
index ebed1fca3..c5326ce85 100644
--- a/app/aem/core/src/main/java/com/cognifide/apm/core/scripts/ScriptFilters.java
+++ b/app/aem/core/src/main/java/com/cognifide/apm/core/scripts/ScriptFilters.java
@@ -23,7 +23,6 @@
 import com.cognifide.apm.api.scripts.LaunchMode;
 import com.cognifide.apm.api.scripts.Script;
 import com.cognifide.apm.api.services.RunModesProvider;
-import java.util.Date;
 import java.util.Set;
 import java.util.function.Predicate;
 import org.apache.commons.lang3.StringUtils;
@@ -50,18 +49,10 @@ public static Predicate<Script> onInstallIfModified(LaunchEnvironment environmen
         .and(withLaunchHook(currentHook));
   }
 
-  public static Predicate<Script> onSchedule(LaunchEnvironment environment, RunModesProvider runModesProvider, Date date) {
+  public static Predicate<Script> onScheduleOrCronExpression(RunModesProvider runModesProvider) {
     return enabled()
-        .and(withLaunchMode(LaunchMode.ON_SCHEDULE))
-        .and(withLaunchEnvironment(environment))
-        .and(withLaunchRunModes(runModesProvider.getRunModes()))
-        .and(script -> script.getLastExecuted() == null && script.getLaunchSchedule().before(date));
-  }
-
-  public static Predicate<Script> onCronExpression(LaunchEnvironment environment, RunModesProvider runModesProvider) {
-    return enabled()
-        .and(withLaunchMode(LaunchMode.ON_CRON_EXPRESSION))
-        .and(withLaunchEnvironment(environment))
+        .and(withSchedule().or(withCronExpression()))
+        .and(withLaunchEnvironment(runModesProvider))
         .and(withLaunchRunModes(runModesProvider.getRunModes()));
   }
 
@@ -88,16 +79,30 @@ private static Predicate<Script> withLaunchEnvironment(LaunchEnvironment environ
         || environment == script.getLaunchEnvironment();
   }
 
-  private static Predicate<? super Script> withLaunchRunModes(Set<String> runModes) {
+  private static Predicate<Script> withLaunchEnvironment(RunModesProvider runModesProvider) {
+    LaunchEnvironment environment = LaunchEnvironment.of(runModesProvider);
+    return script -> script.getLaunchEnvironment() == LaunchEnvironment.ALL
+        || environment == script.getLaunchEnvironment();
+  }
+
+  private static Predicate<Script> withLaunchRunModes(Set<String> runModes) {
     return script -> script.getLaunchRunModes() == null
         || runModes.containsAll(script.getLaunchRunModes());
   }
 
-  private static Predicate<Script> withLaunchMode(final LaunchMode mode) {
+  private static Predicate<Script> withLaunchMode(LaunchMode mode) {
     return script -> script.getLaunchMode() == mode;
   }
 
+  private static Predicate<Script> withSchedule() {
+    return script -> script.getLaunchMode() == LaunchMode.ON_SCHEDULE && script.getLaunchSchedule() != null;
+  }
+
+  private static Predicate<Script> withCronExpression() {
+    return script -> script.getLaunchMode() == LaunchMode.ON_CRON_EXPRESSION && StringUtils.isNotEmpty(script.getCronExpression());
+  }
+
   private static Predicate<Script> enabled() {
-    return script -> script.isLaunchEnabled();
+    return Script::isLaunchEnabled;
   }
 }
diff --git a/app/aem/core/src/main/java/com/cognifide/apm/core/services/ScriptsResourceChangeListener.java b/app/aem/core/src/main/java/com/cognifide/apm/core/services/ScriptsResourceChangeListener.java
index 90e845599..2ad6d7a96 100644
--- a/app/aem/core/src/main/java/com/cognifide/apm/core/services/ScriptsResourceChangeListener.java
+++ b/app/aem/core/src/main/java/com/cognifide/apm/core/services/ScriptsResourceChangeListener.java
@@ -1,7 +1,10 @@
 package com.cognifide.apm.core.services;
 
+import static com.cognifide.apm.core.scripts.ScriptFilters.onScheduleOrCronExpression;
+
 import com.cognifide.apm.api.scripts.LaunchMode;
 import com.cognifide.apm.api.scripts.Script;
+import com.cognifide.apm.api.services.RunModesProvider;
 import com.cognifide.apm.api.services.ScriptFinder;
 import com.cognifide.apm.api.services.ScriptManager;
 import com.cognifide.apm.core.Apm;
@@ -24,6 +27,7 @@
 import org.osgi.framework.ServiceRegistration;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Deactivate;
 import org.osgi.service.component.annotations.Reference;
 
 @Component(
@@ -47,24 +51,28 @@ public class ScriptsResourceChangeListener implements ResourceChangeListener {
   @Reference
   private ScriptManager scriptManager;
 
+  @Reference
+  private RunModesProvider runModesProvider;
+
   private Map<String, RegisterScript> registeredScripts;
 
   @Activate
-  public void activate() {
+  public void activate(BundleContext bundleContext) {
     registeredScripts = new HashMap<>();
-    Bundle currentBundle = FrameworkUtil.getBundle(ScriptsResourceChangeListener.class);
-    BundleContext bundleContext = currentBundle.getBundleContext();
 
     SlingHelper.operateTraced(resolverProvider, resolver ->
-        scriptFinder.findAll(script -> {
-              LaunchMode launchMode = script.getLaunchMode();
-              return launchMode == LaunchMode.ON_SCHEDULE && script.getLaunchSchedule() != null
-                  || launchMode == LaunchMode.ON_CRON_EXPRESSION && StringUtils.isNotEmpty(script.getCronExpression());
-            }, resolver)
-            .forEach(script -> registerService(script, bundleContext))
+        scriptFinder.findAll(onScheduleOrCronExpression(runModesProvider), resolver)
+            .forEach(script -> registerScript(script, bundleContext))
     );
   }
 
+  @Deactivate
+  public void deactivate() {
+    registeredScripts.values()
+        .forEach(registeredScript -> registeredScript.registration.unregister());
+    registeredScripts.clear();
+  }
+
   @Override
   public void onChange(List<ResourceChange> list) {
     Bundle currentBundle = FrameworkUtil.getBundle(ScriptsResourceChangeListener.class);
@@ -76,8 +84,8 @@ public void onChange(List<ResourceChange> list) {
             .forEach(resourceChange -> {
               if (resourceChange.getType() == ResourceChange.ChangeType.ADDED) {
                 Script script = scriptFinder.find(resourceChange.getPath(), resolver);
-                if (script != null) {
-                  registerService(script, bundleContext);
+                if (onScheduleOrCronExpression(runModesProvider).test(script)) {
+                  registerScript(script, bundleContext);
                 }
               } else if (resourceChange.getType() == ResourceChange.ChangeType.REMOVED) {
                 RegisterScript registeredScript = registeredScripts.get(resourceChange.getPath());
@@ -88,17 +96,17 @@ public void onChange(List<ResourceChange> list) {
               } else if (resourceChange.getType() == ResourceChange.ChangeType.CHANGED) {
                 Script script = scriptFinder.find(resourceChange.getPath(), resolver);
                 RegisterScript registeredScript = registeredScripts.get(resourceChange.getPath());
-                if (script != null && !Objects.equals(script, registeredScript.script)) {
+                if (onScheduleOrCronExpression(runModesProvider).test(script) && !Objects.equals(script, registeredScript.script)) {
                   registeredScript.registration.unregister();
                   registeredScripts.remove(resourceChange.getPath());
-                  registerService(script, bundleContext);
+                  registerScript(script, bundleContext);
                 }
               }
             })
     );
   }
 
-  private void registerService(Script script, BundleContext bundleContext) {
+  private void registerScript(Script script, BundleContext bundleContext) {
     Dictionary<String, Object> dictionary = new Hashtable<>();
     if (script.getLaunchMode() == LaunchMode.ON_SCHEDULE) {
       SimpleDateFormat cronExpressionFormat = new SimpleDateFormat("s m H d M ? y");
@@ -111,11 +119,11 @@ private void registerService(Script script, BundleContext bundleContext) {
     registeredScripts.put(script.getPath(), new RegisterScript(script, registration));
   }
 
-  private class RegisterScript {
+  private static class RegisterScript {
 
-    private Script script;
+    private final Script script;
 
-    private ServiceRegistration<Runnable> registration;
+    private final ServiceRegistration<Runnable> registration;
 
     public RegisterScript(Script script, ServiceRegistration<Runnable> registration) {
       this.script = script;

From aafd21a26aa8ae3bfc440eee34115461807d8974 Mon Sep 17 00:00:00 2001
From: Dominik Przybyl <przybyl.dominik@gmail.com>
Date: Thu, 19 Oct 2023 01:25:59 +0200
Subject: [PATCH 4/8] added cron support

---
 .../apm/core/services/ScriptsResourceChangeListener.java      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/aem/core/src/main/java/com/cognifide/apm/core/services/ScriptsResourceChangeListener.java b/app/aem/core/src/main/java/com/cognifide/apm/core/services/ScriptsResourceChangeListener.java
index 2ad6d7a96..64282fdbb 100644
--- a/app/aem/core/src/main/java/com/cognifide/apm/core/services/ScriptsResourceChangeListener.java
+++ b/app/aem/core/src/main/java/com/cognifide/apm/core/services/ScriptsResourceChangeListener.java
@@ -74,12 +74,12 @@ public void deactivate() {
   }
 
   @Override
-  public void onChange(List<ResourceChange> list) {
+  public void onChange(List<ResourceChange> changes) {
     Bundle currentBundle = FrameworkUtil.getBundle(ScriptsResourceChangeListener.class);
     BundleContext bundleContext = currentBundle.getBundleContext();
 
     SlingHelper.operateTraced(resolverProvider, resolver ->
-        list.stream()
+        changes.stream()
             .filter(resourceChange -> StringUtils.endsWith(resourceChange.getPath(), Apm.FILE_EXT))
             .forEach(resourceChange -> {
               if (resourceChange.getType() == ResourceChange.ChangeType.ADDED) {

From 5d3258c528bb1479455c7f802f938cc745925795 Mon Sep 17 00:00:00 2001
From: Dominik Przybyl <przybyl.dominik@gmail.com>
Date: Thu, 19 Oct 2023 15:00:46 +0200
Subject: [PATCH 5/8] added cron support

---
 .../ScriptsResourceChangeListener.java        | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/app/aem/core/src/main/java/com/cognifide/apm/core/services/ScriptsResourceChangeListener.java b/app/aem/core/src/main/java/com/cognifide/apm/core/services/ScriptsResourceChangeListener.java
index 64282fdbb..94cf24d4b 100644
--- a/app/aem/core/src/main/java/com/cognifide/apm/core/services/ScriptsResourceChangeListener.java
+++ b/app/aem/core/src/main/java/com/cognifide/apm/core/services/ScriptsResourceChangeListener.java
@@ -1,3 +1,22 @@
+/*
+ * ========================LICENSE_START=================================
+ * AEM Permission Management
+ * %%
+ * Copyright (C) 2013 Wunderman Thompson Technology
+ * %%
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * =========================LICENSE_END==================================
+ */
 package com.cognifide.apm.core.services;
 
 import static com.cognifide.apm.core.scripts.ScriptFilters.onScheduleOrCronExpression;

From 3c951b6ed398d241ea6ea97874123cf8bf65972f Mon Sep 17 00:00:00 2001
From: Dominik Przybyl <przybyl.dominik@gmail.com>
Date: Thu, 19 Oct 2023 17:06:55 +0200
Subject: [PATCH 6/8] added CRON expression support

---
 .../apm/install/launchers/ApmInstallService.java      | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/aem/install/src/main/java/com/cognifide/apm/install/launchers/ApmInstallService.java b/app/aem/install/src/main/java/com/cognifide/apm/install/launchers/ApmInstallService.java
index 167973836..0e4aa2bd7 100644
--- a/app/aem/install/src/main/java/com/cognifide/apm/install/launchers/ApmInstallService.java
+++ b/app/aem/install/src/main/java/com/cognifide/apm/install/launchers/ApmInstallService.java
@@ -41,6 +41,7 @@
 import java.util.Objects;
 import java.util.Set;
 import java.util.stream.Collectors;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.sling.api.resource.ResourceResolver;
 import org.apache.sling.api.resource.observation.ResourceChange;
 import org.apache.sling.api.resource.observation.ResourceChangeListener;
@@ -89,8 +90,12 @@ public class ApmInstallService extends AbstractLauncher implements Runnable {
   public void activate(Configuration config, BundleContext bundleContext) {
     scriptPaths = Arrays.asList(config.scriptPaths());
     ifModified = config.ifModified();
-    processAllScripts();
-    registerScripts(bundleContext);
+    if (StringUtils.isEmpty(config.scheduler_expression())) {
+      processAllScripts();
+    }
+    if (ifModified) {
+      registerScripts(bundleContext);
+    }
   }
 
   @Deactivate
@@ -134,7 +139,7 @@ private List<Script> determineScripts(List<String> scriptPaths, ResourceResolver
   private void registerScripts(BundleContext bundleContext) {
     registrations = new HashSet<>();
     SlingHelper.operateTraced(resolverProvider, resolver -> {
-      if (ifModified && RuntimeUtils.isMutableContentInstance(resolver)) {
+      if (RuntimeUtils.isMutableContentInstance(resolver)) {
         scriptPaths.forEach(scriptPath -> registerScript(scriptPath, resolver, bundleContext));
       }
     });

From 4362c6012a7dbc6411a1aca17050205948ead369 Mon Sep 17 00:00:00 2001
From: Dominik Przybyl <przybyl.dominik@gmail.com>
Date: Thu, 19 Oct 2023 17:16:53 +0200
Subject: [PATCH 7/8] added CRON expression support

---
 .../cognifide/apm/core/launchers/ApmInstallService.java   | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/app/aem/core/src/main/java/com/cognifide/apm/core/launchers/ApmInstallService.java b/app/aem/core/src/main/java/com/cognifide/apm/core/launchers/ApmInstallService.java
index c04c90a2f..b94b85330 100644
--- a/app/aem/core/src/main/java/com/cognifide/apm/core/launchers/ApmInstallService.java
+++ b/app/aem/core/src/main/java/com/cognifide/apm/core/launchers/ApmInstallService.java
@@ -25,14 +25,10 @@
 import com.cognifide.apm.core.services.ResourceResolverProvider;
 import com.cognifide.apm.core.utils.RuntimeUtils;
 import com.cognifide.apm.core.utils.sling.SlingHelper;
-import java.lang.management.ManagementFactory;
 import java.util.Collections;
-import org.apache.commons.lang3.StringUtils;
 
 public class ApmInstallService extends AbstractLauncher implements Runnable {
 
-  private static final String AEM_MUTABLE_CONTENT_INSTANCE = "aem-install-mutable-content";
-
   private final String scriptPath;
 
   private final ResourceResolverProvider resolverProvider;
@@ -51,9 +47,7 @@ public ApmInstallService(String scriptPath, ResourceResolverProvider resolverPro
   @Override
   public void run() {
     SlingHelper.operateTraced(resolverProvider, resolver -> {
-      boolean compositeNodeStore = RuntimeUtils.determineCompositeNodeStore(resolver);
-      String instanceName = ManagementFactory.getRuntimeMXBean().getName();
-      if (!compositeNodeStore || StringUtils.contains(instanceName, AEM_MUTABLE_CONTENT_INSTANCE)) {
+      if (RuntimeUtils.isMutableContentInstance(resolver)) {
         Script script = scriptFinder.find(scriptPath, resolver);
         processScripts(Collections.singletonList(script), resolver);
       }

From 75e87c82db5f9a651075f3a6ce9942ca055d05e2 Mon Sep 17 00:00:00 2001
From: Dominik Przybyl <przybyl.dominik@gmail.com>
Date: Thu, 19 Oct 2023 17:32:25 +0200
Subject: [PATCH 8/8] added CRON expression support

---
 .../com/cognifide/apm/core/scripts/ScriptFilters.java |  3 +--
 .../core/services/ScriptsResourceChangeListener.java  |  2 +-
 .../apm/install/launchers/ApmInstallService.java      | 11 +++++------
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/app/aem/core/src/main/java/com/cognifide/apm/core/scripts/ScriptFilters.java b/app/aem/core/src/main/java/com/cognifide/apm/core/scripts/ScriptFilters.java
index c5326ce85..0b45bd2d2 100644
--- a/app/aem/core/src/main/java/com/cognifide/apm/core/scripts/ScriptFilters.java
+++ b/app/aem/core/src/main/java/com/cognifide/apm/core/scripts/ScriptFilters.java
@@ -81,8 +81,7 @@ private static Predicate<Script> withLaunchEnvironment(LaunchEnvironment environ
 
   private static Predicate<Script> withLaunchEnvironment(RunModesProvider runModesProvider) {
     LaunchEnvironment environment = LaunchEnvironment.of(runModesProvider);
-    return script -> script.getLaunchEnvironment() == LaunchEnvironment.ALL
-        || environment == script.getLaunchEnvironment();
+    return withLaunchEnvironment(environment);
   }
 
   private static Predicate<Script> withLaunchRunModes(Set<String> runModes) {
diff --git a/app/aem/core/src/main/java/com/cognifide/apm/core/services/ScriptsResourceChangeListener.java b/app/aem/core/src/main/java/com/cognifide/apm/core/services/ScriptsResourceChangeListener.java
index 94cf24d4b..18474ba9d 100644
--- a/app/aem/core/src/main/java/com/cognifide/apm/core/services/ScriptsResourceChangeListener.java
+++ b/app/aem/core/src/main/java/com/cognifide/apm/core/services/ScriptsResourceChangeListener.java
@@ -126,6 +126,7 @@ public void onChange(List<ResourceChange> changes) {
   }
 
   private void registerScript(Script script, BundleContext bundleContext) {
+    ApmInstallService service = new ApmInstallService(script.getPath(), resolverProvider, scriptManager, scriptFinder);
     Dictionary<String, Object> dictionary = new Hashtable<>();
     if (script.getLaunchMode() == LaunchMode.ON_SCHEDULE) {
       SimpleDateFormat cronExpressionFormat = new SimpleDateFormat("s m H d M ? y");
@@ -133,7 +134,6 @@ private void registerScript(Script script, BundleContext bundleContext) {
     } else if (script.getLaunchMode() == LaunchMode.ON_CRON_EXPRESSION) {
       dictionary.put("scheduler.expression", script.getCronExpression());
     }
-    ApmInstallService service = new ApmInstallService(script.getPath(), resolverProvider, scriptManager, scriptFinder);
     ServiceRegistration<Runnable> registration = bundleContext.registerService(Runnable.class, service, dictionary);
     registeredScripts.put(script.getPath(), new RegisterScript(script, registration));
   }
diff --git a/app/aem/install/src/main/java/com/cognifide/apm/install/launchers/ApmInstallService.java b/app/aem/install/src/main/java/com/cognifide/apm/install/launchers/ApmInstallService.java
index 0e4aa2bd7..b9e6ba418 100644
--- a/app/aem/install/src/main/java/com/cognifide/apm/install/launchers/ApmInstallService.java
+++ b/app/aem/install/src/main/java/com/cognifide/apm/install/launchers/ApmInstallService.java
@@ -162,22 +162,21 @@ protected ScriptManager getScriptManager() {
 
   private class ScriptResourceChangeListener implements ResourceChangeListener {
 
-    private Script script;
+    private Script prevScript;
 
     private final String scriptPath;
 
     public ScriptResourceChangeListener(Script script, String scriptPath) {
-      this.script = script;
+      this.prevScript = script;
       this.scriptPath = scriptPath;
     }
 
     @Override
     public void onChange(List<ResourceChange> changes) {
       SlingHelper.operateTraced(resolverProvider, resolver -> {
-        Script newScript = scriptFinder.find(scriptPath, resolver);
-        if (!Objects.equals(script, newScript)) {
-          script = newScript;
-          List<Script> scripts = determineScripts(Collections.singletonList(scriptPath), resolver);
+        List<Script> scripts = determineScripts(Collections.singletonList(scriptPath), resolver);
+        if (!scripts.isEmpty() && !Objects.equals(prevScript, scripts.get(0))) {
+          prevScript = scripts.get(0);
           processScripts(scripts, resolver);
         }
       });