[sling-org-apache-sling-app-cms] branch master updated: Adding config titles / descriptions and updating the pub config to use dropdowns

[dk...@apache.org]

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

dklco pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-app-cms.git


The following commit(s) were added to refs/heads/master by this push:
     new 0e0a9e7  Adding config titles / descriptions and updating the pub config to use dropdowns
0e0a9e7 is described below

commit 0e0a9e7f5fcd8400fdce4aabc3eec6b07b0b879b
Author: Dan Klco <dk...@apache.org>
AuthorDate: Tue Sep 29 08:53:51 2020 -0400

    Adding config titles / descriptions and updating the pub config to use dropdowns
---
 .../sling/cms/core/publication/PublicationConfig.java    |  9 +++++++--
 core/src/main/resources/OSGI-INF/l10n/bundle.properties  | 16 +++++++++++++---
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/core/src/main/java/org/apache/sling/cms/core/publication/PublicationConfig.java b/core/src/main/java/org/apache/sling/cms/core/publication/PublicationConfig.java
index 0884a64..8d9cfff 100644
--- a/core/src/main/java/org/apache/sling/cms/core/publication/PublicationConfig.java
+++ b/core/src/main/java/org/apache/sling/cms/core/publication/PublicationConfig.java
@@ -20,6 +20,7 @@ import org.apache.sling.cms.publication.INSTANCE_TYPE;
 import org.apache.sling.cms.publication.PUBLICATION_MODE;
 import org.osgi.service.metatype.annotations.AttributeDefinition;
 import org.osgi.service.metatype.annotations.ObjectClassDefinition;
+import org.osgi.service.metatype.annotations.Option;
 
 @ObjectClassDefinition(name = "%publication.config.name", description = "%publication.config.description", localization = "OSGI-INF/l10n/bundle")
 public @interface PublicationConfig {
@@ -27,9 +28,13 @@ public @interface PublicationConfig {
     @AttributeDefinition(name = "%publication.param.agents.name", description = "%publication.param.agents.description")
     String[] agents() default {};
 
-    @AttributeDefinition(name = "%publication.param.type.name", description = "%publication.param.type.description")
+    @AttributeDefinition(name = "%publication.param.type.name", description = "%publication.param.type.description", options = {
+            @Option(label = "Author", value = "AUTHOR"), @Option(label = "Renderer", value = "RENDERER"),
+            @Option(label = "Standalone", value = "STANDALONE") })
     INSTANCE_TYPE instanceType() default INSTANCE_TYPE.STANDALONE;
 
-    @AttributeDefinition(name = "%publication.param.mode.name", description = "%publication.param.mode.description")
+    @AttributeDefinition(name = "%publication.param.mode.name", description = "%publication.param.mode.description", options = {
+            @Option(label = "Content Distribution", value = "CONTENT_DISTRIBUTION"),
+            @Option(label = "Standalone", value = "STANDALONE") })
     PUBLICATION_MODE publicationMode() default PUBLICATION_MODE.STANDALONE;
 }
diff --git a/core/src/main/resources/OSGI-INF/l10n/bundle.properties b/core/src/main/resources/OSGI-INF/l10n/bundle.properties
index 89bb7db..c74e055 100644
--- a/core/src/main/resources/OSGI-INF/l10n/bundle.properties
+++ b/core/src/main/resources/OSGI-INF/l10n/bundle.properties
@@ -175,9 +175,19 @@ parentType.description=To be considered matching, the resource must have a paren
 ## Publication
 publication.config.name=Apache Sling CMS - Publication Configuration
 publication.config.description=Configure the publication mode for the instance
-
 publication.param.mode.name=Publication Mode
 publication.param.mode.description=Configure the publication mode: standalone, e.g. single instance property based or Content Distribution for multiple instances
-
 publication.param.agents.name=Publication Agents
-publication.param.agents.description=The publication agents to be used when publishing content
\ No newline at end of file
+publication.param.agents.description=The publication agents to be used when publishing content
+publication.param.type.name=Instance Type
+publication.param.type.description=The type of this instance
+
+forwardagentsync.config.name=Apache Sling CMS - Forward Agent Endpoint Sync
+forwardagentsync.config.description=Synchronize the endpoints for one or more forward agents based on a Sling Discovery topology
+forwardagentsync.param.agentTarget.name=Agent Target
+forwardagentsync.param.agentTarget.description=The target agent(s) LDAP expression, used to determine which agents to synchronize
+
+publicationpropprovider.config.name=Apache Sling CMS - Publication Property Provider
+publicationpropprovider.config.description=Exposes the publication properties via Sling Discovery
+publicationpropprovider.param.endpointPath.name=Endpoint Path
+publicationpropprovider.param.endpointPath.description=The path to generate the endpoint for this instance, without the starting slash
\ No newline at end of file