Author: mpetria
Date: Tue Dec 22 11:02:26 2015
New Revision: 1721343
URL: http://svn.apache.org/viewvc?rev=1721343&view=rev
Log:
SLING-5397: change selectiveQueues to priorityQueues
Modified:
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/ForwardDistributionAgentFactory.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/QueueDistributionAgentFactory.java
sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/publish-multiple/org.apache.sling.distribution.agent.impl.ForwardDistributionAgentFactory-publish-multiple.json
sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/publish-selective/org.apache.sling.distribution.agent.impl.ForwardDistributionAgentFactory-publish-selective.json
sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/queue-multiple/org.apache.sling.distribution.agent.impl.ForwardDistributionAgentFactory-queue-multiple.json
Modified:
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/ForwardDistributionAgentFactory.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/ForwardDistributionAgentFactory.java?rev=1721343&r1=1721342&r2=1721343&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/ForwardDistributionAgentFactory.java
(original)
+++
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/ForwardDistributionAgentFactory.java
Tue Dec 22 11:02:26 2015
@@ -49,8 +49,7 @@ import org.apache.sling.distribution.que
import
org.apache.sling.distribution.queue.impl.DistributionQueueDispatchingStrategy;
import org.apache.sling.distribution.queue.impl.ErrorQueueDispatchingStrategy;
import
org.apache.sling.distribution.queue.impl.MultipleQueueDispatchingStrategy;
-import
org.apache.sling.distribution.queue.impl.SelectiveQueueDispatchingStrategy;
-import org.apache.sling.distribution.queue.impl.SingleQueueDispatchingStrategy;
+import
org.apache.sling.distribution.queue.impl.PriorityQueueDispatchingStrategy;
import
org.apache.sling.distribution.queue.impl.jobhandling.JobHandlingDistributionQueueProvider;
import org.apache.sling.distribution.serialization.DistributionPackageBuilder;
import
org.apache.sling.distribution.transport.DistributionTransportSecretProvider;
@@ -124,9 +123,9 @@ public class ForwardDistributionAgentFac
"These queues will gather all the packages until they are removed
explicitly.")
public static final String PASSIVE_QUEUES = "passiveQueues";
- @Property(cardinality = 100, label = "Selective queues", description =
"List of selective queues that should used for specific paths." +
- "The selector format is
{queuePrefix}|{mainQueueMatcher}={pathMatcher}, e.g.
french|publish.*=/content/fr.*")
- public static final String SELECTIVE_QUEUES = "selectiveQueues";
+ @Property(cardinality = 100, label = "Priority queues", description =
"List of priority queues that should used for specific paths." +
+ "The selector format is
{queuePrefix}[|{mainQueueMatcher}]={pathMatcher}, e.g. french=/content/fr.*")
+ public static final String PRIORITY_QUEUES = "priorityQueues";
@Property(options = {
@PropertyOption(name = "none", value = "none"),
@PropertyOption(name = "errorQueue", value = "errorQueue")},
@@ -209,8 +208,8 @@ public class ForwardDistributionAgentFac
String[] passiveQueues =
PropertiesUtil.toStringArray(config.get(PASSIVE_QUEUES), new String[0]);
passiveQueues = SettingsUtils.removeEmptyEntries(passiveQueues, new
String[0]);
- Map<String, String> selectiveQueues =
PropertiesUtil.toMap(config.get(SELECTIVE_QUEUES), new String[0]);
- selectiveQueues = SettingsUtils.removeEmptyEntries(selectiveQueues);
+ Map<String, String> priorityQueues =
PropertiesUtil.toMap(config.get(PRIORITY_QUEUES), new String[0]);
+ priorityQueues = SettingsUtils.removeEmptyEntries(priorityQueues);
DistributionPackageExporter packageExporter = new
LocalDistributionPackageExporter(packageBuilder);
@@ -228,8 +227,8 @@ public class ForwardDistributionAgentFac
queuesMap.addAll(Arrays.asList(passiveQueues));
String[] queueNames = queuesMap.toArray(new String[queuesMap.size()]);
- if (selectiveQueues != null) {
- SelectiveQueueDispatchingStrategy dispatchingStrategy = new
SelectiveQueueDispatchingStrategy(selectiveQueues, queueNames);
+ if (priorityQueues != null) {
+ PriorityQueueDispatchingStrategy dispatchingStrategy = new
PriorityQueueDispatchingStrategy(priorityQueues, queueNames);
Map<String, String> queueAliases =
dispatchingStrategy.getMatchingQueues(null);
importerEndpointsMap =
SettingsUtils.expandUriMap(importerEndpointsMap, queueAliases);
exportQueueStrategy = dispatchingStrategy;
Modified:
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/QueueDistributionAgentFactory.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/QueueDistributionAgentFactory.java?rev=1721343&r1=1721342&r2=1721343&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/QueueDistributionAgentFactory.java
(original)
+++
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/QueueDistributionAgentFactory.java
Tue Dec 22 11:02:26 2015
@@ -18,9 +18,7 @@
*/
package org.apache.sling.distribution.agent.impl;
-import java.util.HashSet;
import java.util.Map;
-import java.util.Set;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
@@ -43,8 +41,7 @@ import org.apache.sling.distribution.pac
import
org.apache.sling.distribution.packaging.impl.exporter.LocalDistributionPackageExporter;
import org.apache.sling.distribution.queue.DistributionQueueProvider;
import
org.apache.sling.distribution.queue.impl.DistributionQueueDispatchingStrategy;
-import
org.apache.sling.distribution.queue.impl.MultipleQueueDispatchingStrategy;
-import
org.apache.sling.distribution.queue.impl.SelectiveQueueDispatchingStrategy;
+import
org.apache.sling.distribution.queue.impl.PriorityQueueDispatchingStrategy;
import org.apache.sling.distribution.queue.impl.SingleQueueDispatchingStrategy;
import
org.apache.sling.distribution.queue.impl.jobhandling.JobHandlingDistributionQueueProvider;
import org.apache.sling.distribution.serialization.DistributionPackageBuilder;
@@ -117,9 +114,9 @@ public class QueueDistributionAgentFacto
"e.g. use target=(name=...) to bind to services by name.")
public static final String TRIGGERS_TARGET = "triggers.target";
- @Property(cardinality = 100, label = "Selective queues", description =
"List of selective queues that should used for specific paths." +
- "The selector format is
{queuePrefix}|{mainQueueMatcher}={pathMatcher}, e.g.
french|publish.*=/content/fr.*")
- public static final String SELECTIVE_QUEUES = "selectiveQueues";
+ @Property(cardinality = 100, label = "Priority queues", description =
"List of priority queues that should used for specific paths." +
+ "The selector format is
{queuePrefix}[|{mainQueueMatcher}]={pathMatcher}, e.g. french=/content/fr.*")
+ public static final String PRIORITY_QUEUES = "priorityQueues";
@Reference
@@ -167,16 +164,16 @@ public class QueueDistributionAgentFacto
allowedRoots = SettingsUtils.removeEmptyEntries(allowedRoots);
- Map<String, String> selectiveQueues =
PropertiesUtil.toMap(config.get(SELECTIVE_QUEUES), new String[0]);
- selectiveQueues = SettingsUtils.removeEmptyEntries(selectiveQueues);
+ Map<String, String> priorityQueues =
PropertiesUtil.toMap(config.get(PRIORITY_QUEUES), new String[0]);
+ priorityQueues = SettingsUtils.removeEmptyEntries(priorityQueues);
DistributionQueueProvider queueProvider = new
JobHandlingDistributionQueueProvider(agentName, jobManager, context);
DistributionQueueDispatchingStrategy exportQueueStrategy = null;
- if (selectiveQueues != null) {
- exportQueueStrategy = new
SelectiveQueueDispatchingStrategy(selectiveQueues, new String[] {
DistributionQueueDispatchingStrategy.DEFAULT_QUEUE_NAME });
+ if (priorityQueues != null) {
+ exportQueueStrategy = new
PriorityQueueDispatchingStrategy(priorityQueues, new String[] {
DistributionQueueDispatchingStrategy.DEFAULT_QUEUE_NAME });
} else {
exportQueueStrategy = new SingleQueueDispatchingStrategy();
}
Modified:
sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/publish-multiple/org.apache.sling.distribution.agent.impl.ForwardDistributionAgentFactory-publish-multiple.json
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/publish-multiple/org.apache.sling.distribution.agent.impl.ForwardDistributionAgentFactory-publish-multiple.json?rev=1721343&r1=1721342&r2=1721343&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/publish-multiple/org.apache.sling.distribution.agent.impl.ForwardDistributionAgentFactory-publish-multiple.json
(original)
+++
sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/publish-multiple/org.apache.sling.distribution.agent.impl.ForwardDistributionAgentFactory-publish-multiple.json
Tue Dec 22 11:02:26 2015
@@ -5,8 +5,6 @@
"serviceName" : "distributionService",
- "useMultipleQueues" : true,
-
"packageImporter.endpoints" : [
"endpoint1=http://localhost:4503/libs/sling/distribution/services/importers/default";,
"endpoint2=http://localhost:4503/libs/sling/distribution/services/importers/defaultbadaddress";
Modified:
sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/publish-selective/org.apache.sling.distribution.agent.impl.ForwardDistributionAgentFactory-publish-selective.json
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/publish-selective/org.apache.sling.distribution.agent.impl.ForwardDistributionAgentFactory-publish-selective.json?rev=1721343&r1=1721342&r2=1721343&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/publish-selective/org.apache.sling.distribution.agent.impl.ForwardDistributionAgentFactory-publish-selective.json
(original)
+++
sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/publish-selective/org.apache.sling.distribution.agent.impl.ForwardDistributionAgentFactory-publish-selective.json
Tue Dec 22 11:02:26 2015
@@ -5,9 +5,7 @@
"serviceName" : "distributionService",
- "selectiveQueues": ["news|publisher.*=/content/news.*"],
-
- "useMultipleQueues" : true,
+ "priorityQueues": ["news=/content/news.*"],
"packageImporter.endpoints": [
"publisher1=http://localhost:4503/libs/sling/distribution/services/importers/default";
Modified:
sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/queue-multiple/org.apache.sling.distribution.agent.impl.ForwardDistributionAgentFactory-queue-multiple.json
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/queue-multiple/org.apache.sling.distribution.agent.impl.ForwardDistributionAgentFactory-queue-multiple.json?rev=1721343&r1=1721342&r2=1721343&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/queue-multiple/org.apache.sling.distribution.agent.impl.ForwardDistributionAgentFactory-queue-multiple.json
(original)
+++
sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/queue-multiple/org.apache.sling.distribution.agent.impl.ForwardDistributionAgentFactory-queue-multiple.json
Tue Dec 22 11:02:26 2015
@@ -5,8 +5,6 @@
"serviceName" : "distributionService",
- "useMultipleQueues" : true,
-
"packageImporter.endpoints" : [
"endpoint1=http://localhost:1/libs/sling/distribution/services/importers/bad1";,
"endpoint2=http://localhost:2/libs/sling/distribution/services/importers/bad2";
