This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-event.git
commit 27fd813d17bf5e28ae8c6fdbef65c1b32a31c82f Author: Stefan Seifert <[email protected]> AuthorDate: Thu May 18 12:27:37 2017 +0000 SLING-6863 Event: webconsole.configurationFactory.nameHint Property has to be part of OCD git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1795508 13f79535-47bb-0310-9956-ffa450edef68 --- .../sling/event/impl/jobs/config/InternalQueueConfiguration.java | 5 ++++- .../sling/event/impl/jobs/config/InternalQueueConfigurationTest.java | 5 +++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/apache/sling/event/impl/jobs/config/InternalQueueConfiguration.java b/src/main/java/org/apache/sling/event/impl/jobs/config/InternalQueueConfiguration.java index 4922a72..d01f77f 100644 --- a/src/main/java/org/apache/sling/event/impl/jobs/config/InternalQueueConfiguration.java +++ b/src/main/java/org/apache/sling/event/impl/jobs/config/InternalQueueConfiguration.java @@ -39,7 +39,6 @@ import org.slf4j.LoggerFactory; name="org.apache.sling.event.jobs.QueueConfiguration", configurationPolicy=ConfigurationPolicy.REQUIRE, property={ - "webconsole.configurationFactory.nameHint=Queue: {" + ConfigurationConstants.PROP_NAME + "}", Constants.SERVICE_VENDOR + "=The Apache Software Foundation" }) @Designate(ocd = InternalQueueConfiguration.Config.class, factory = true) @@ -122,6 +121,10 @@ public class InternalQueueConfiguration description="Integer value defining the ranking of this queue configuration. " + "If more than one queue matches a job topic, the one with the highest ranking is used.") int service_ranking() default 0; + + // Internal Name hint for web console. + String webconsole_configurationFactory_nameHint() default "Queue: {" + ConfigurationConstants.PROP_NAME + "}"; + } /** Logger. */ diff --git a/src/test/java/org/apache/sling/event/impl/jobs/config/InternalQueueConfigurationTest.java b/src/test/java/org/apache/sling/event/impl/jobs/config/InternalQueueConfigurationTest.java index 817407f..948d953 100644 --- a/src/test/java/org/apache/sling/event/impl/jobs/config/InternalQueueConfigurationTest.java +++ b/src/test/java/org/apache/sling/event/impl/jobs/config/InternalQueueConfigurationTest.java @@ -107,6 +107,11 @@ public class InternalQueueConfigurationTest { public int service_ranking() { return 0; } + + @Override + public String webconsole_configurationFactory_nameHint() { + return null; + } }; } -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
