[sling-org-apache-sling-distribution-journal] branch master updated: SLING-9003 - Support multiple staging preconditions

[tm...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

tmaret pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-distribution-journal.git


The following commit(s) were added to refs/heads/master by this push:
     new 29427be  SLING-9003 - Support multiple staging preconditions
29427be is described below

commit 29427be7e2930fa9a2ea6ac66b1701746d2cd440
Author: tmaret <tm...@adobe.com>
AuthorDate: Thu Jan 16 13:28:14 2020 +0100

    SLING-9003 - Support multiple staging preconditions
---
 .../journal/impl/subscriber/StagingPrecondition.java     | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/apache/sling/distribution/journal/impl/subscriber/StagingPrecondition.java b/src/main/java/org/apache/sling/distribution/journal/impl/subscriber/StagingPrecondition.java
index 5bef311..353f7aa 100644
--- a/src/main/java/org/apache/sling/distribution/journal/impl/subscriber/StagingPrecondition.java
+++ b/src/main/java/org/apache/sling/distribution/journal/impl/subscriber/StagingPrecondition.java
@@ -37,9 +37,9 @@ import org.slf4j.LoggerFactory;
  * This is a precondition that watches status messages from other instances in order to confirm that a package can be processed.
  * The check will block until a status is found. If no status is received in 60 seconds it will throw an exception.
  */
-@Component(immediate = true, service = Precondition.class, property = { "name=staging" },
+@Component(immediate = true, service = Precondition.class,
         configurationPolicy = ConfigurationPolicy.REQUIRE)
-@Designate(ocd = StagingPrecondition.Configuration.class)
+@Designate(ocd = StagingPrecondition.Configuration.class, factory = true)
 public class StagingPrecondition implements Precondition {
 
     private static final Logger LOG = LoggerFactory.getLogger(StagingPrecondition.class);
@@ -102,13 +102,17 @@ public class StagingPrecondition implements Precondition {
 
 
     @ObjectClassDefinition(name = "Apache Sling Journal based Distribution - Staged Distribution Precondition",
-            description = "Apache Sling Content Distribution Sub Agent precondition for staged replication")
+            description = "Apache Sling Content Distribution Sub Agent precondition for staged distribution")
     public @interface Configuration {
 
-        @AttributeDefinition
-        String webconsole_configurationFactory_nameHint() default "Agent name: {subAgentName}";
+        @AttributeDefinition(name = "Precondition name", description = "The name of the staging precondition")
+        String name() default "staging";
 
-        @AttributeDefinition(name = "name", description = "The name of the agent to watch")
+        @AttributeDefinition(name = "Subscriber agent name", description = "The name of the subscriber agent to watch")
         String subAgentName() default "";
+
+        @AttributeDefinition
+        String webconsole_configurationFactory_nameHint() default "Precondition name: {name}";
+
     }
 }