You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ss...@apache.org on 2017/05/18 12:27:37 UTC
svn commit: r1795508 - in /sling/trunk/bundles/extensions/event/resource/src:
main/java/org/apache/sling/event/impl/jobs/config/InternalQueueConfiguration.java
test/java/org/apache/sling/event/impl/jobs/config/InternalQueueConfigurationTest.java
Author: sseifert
Date: Thu May 18 12:27:37 2017
New Revision: 1795508
URL: http://svn.apache.org/viewvc?rev=1795508&view=rev
Log:
SLING-6863 Event: webconsole.configurationFactory.nameHint Property has to be part of OCD
Modified:
sling/trunk/bundles/extensions/event/resource/src/main/java/org/apache/sling/event/impl/jobs/config/InternalQueueConfiguration.java
sling/trunk/bundles/extensions/event/resource/src/test/java/org/apache/sling/event/impl/jobs/config/InternalQueueConfigurationTest.java
Modified: sling/trunk/bundles/extensions/event/resource/src/main/java/org/apache/sling/event/impl/jobs/config/InternalQueueConfiguration.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/resource/src/main/java/org/apache/sling/event/impl/jobs/config/InternalQueueConfiguration.java?rev=1795508&r1=1795507&r2=1795508&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/event/resource/src/main/java/org/apache/sling/event/impl/jobs/config/InternalQueueConfiguration.java (original)
+++ sling/trunk/bundles/extensions/event/resource/src/main/java/org/apache/sling/event/impl/jobs/config/InternalQueueConfiguration.java Thu May 18 12:27:37 2017
@@ -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. */
Modified: sling/trunk/bundles/extensions/event/resource/src/test/java/org/apache/sling/event/impl/jobs/config/InternalQueueConfigurationTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/resource/src/test/java/org/apache/sling/event/impl/jobs/config/InternalQueueConfigurationTest.java?rev=1795508&r1=1795507&r2=1795508&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/event/resource/src/test/java/org/apache/sling/event/impl/jobs/config/InternalQueueConfigurationTest.java (original)
+++ sling/trunk/bundles/extensions/event/resource/src/test/java/org/apache/sling/event/impl/jobs/config/InternalQueueConfigurationTest.java Thu May 18 12:27:37 2017
@@ -107,6 +107,11 @@ public class InternalQueueConfigurationT
public int service_ranking() {
return 0;
}
+
+ @Override
+ public String webconsole_configurationFactory_nameHint() {
+ return null;
+ }
};
}