Author: cziegeler
Date: Wed Aug 30 11:57:00 2017
New Revision: 1806689
URL: http://svn.apache.org/viewvc?rev=1806689&view=rev
Log:
SLING-7091 : Label and value are interchanged for queue type
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/main/java/org/apache/sling/event/impl/jobs/config/MainQueueConfiguration.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=1806689&r1=1806688&r2=1806689&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
Wed Aug 30 11:57:00 2017
@@ -63,18 +63,18 @@ public class InternalQueueConfiguration
@AttributeDefinition(name = "Type",
description="The queue type.",
- options = {@Option(label="UNORDERED",value="Parallel"),
- @Option(label="ORDERED",value="Ordered"),
- @Option(label="TOPIC_ROUND_ROBIN",value="Topic Round
Robin")})
+ options = {@Option(label="Parallel",value="UNORDERED"),
+ @Option(label="Ordered",value="ORDERED"),
+ @Option(label="Topic Round
Robin",value="TOPIC_ROUND_ROBIN")})
String queue_type() default "UNORDERED";
@AttributeDefinition(
name="Priority",
description="The priority for the threads used by this queue.
Default is norm.",
options = {
- @Option(label="NORM",value="Norm"),
- @Option(label="MIN",value="Min"),
- @Option(label="MAX",value="Max")
+ @Option(label="Norm",value="NORM"),
+ @Option(label="Min",value="MIN"),
+ @Option(label="Max",value="MAX")
})
String queue_priority() default
ConfigurationConstants.DEFAULT_PRIORITY;
@@ -121,7 +121,7 @@ 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 + "}";
Modified:
sling/trunk/bundles/extensions/event/resource/src/main/java/org/apache/sling/event/impl/jobs/config/MainQueueConfiguration.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/resource/src/main/java/org/apache/sling/event/impl/jobs/config/MainQueueConfiguration.java?rev=1806689&r1=1806688&r2=1806689&view=diff
==============================================================================
---
sling/trunk/bundles/extensions/event/resource/src/main/java/org/apache/sling/event/impl/jobs/config/MainQueueConfiguration.java
(original)
+++
sling/trunk/bundles/extensions/event/resource/src/main/java/org/apache/sling/event/impl/jobs/config/MainQueueConfiguration.java
Wed Aug 30 11:57:00 2017
@@ -53,9 +53,9 @@ public class MainQueueConfiguration {
name="Priority",
description="The priority for the threads used by this queue.
Default is norm.",
options = {
- @Option(label="NORM",value="Norm"),
- @Option(label="MIN",value="Min"),
- @Option(label="MAX",value="Max")
+ @Option(label="Norm",value="NORM"),
+ @Option(label="Min",value="MIN"),
+ @Option(label="Max",value="MAX")
})
String queue_priority() default
ConfigurationConstants.DEFAULT_PRIORITY;
