svn commit: r1783186 - in /sling/trunk/contrib/extensions/distribution: core/src/main/java/org/apache/sling/distribution/agent/impl/ it/src/test/java/org/apache/sling/distribution/it/

[tommaso]

Author: tommaso
Date: Thu Feb 16 09:48:46 2017
New Revision: 1783186

URL: http://svn.apache.org/viewvc?rev=1783186&view=rev
Log:
SLING-6523 - priority queues back to processing queues

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/SimpleDistributionAgentQueueProcessor.java
    
sling/trunk/contrib/extensions/distribution/it/src/test/java/org/apache/sling/distribution/it/SelectiveForwardDistributionTest.java

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=1783186&r1=1783185&r2=1783186&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
 Thu Feb 16 09:48:46 2017
@@ -273,6 +273,7 @@ public class ForwardDistributionAgentFac
             Map<String, String> queueAliases = 
dispatchingStrategy.getMatchingQueues(null);
             importerEndpointsMap = 
SettingsUtils.expandUriMap(importerEndpointsMap, queueAliases);
             exportQueueStrategy = dispatchingStrategy;
+            endpointNames = importerEndpointsMap.keySet();
         } else {
             boolean asyncDelivery = 
PropertiesUtil.toBoolean(config.get(ASYNC_DELIVERY), false);
             if (asyncDelivery) {

Modified: 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgentQueueProcessor.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgentQueueProcessor.java?rev=1783186&r1=1783185&r2=1783186&view=diff
==============================================================================
--- 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgentQueueProcessor.java
 (original)
+++ 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgentQueueProcessor.java
 Thu Feb 16 09:48:46 2017
@@ -41,7 +41,11 @@ import org.apache.sling.distribution.que
 import org.apache.sling.distribution.util.impl.DistributionUtils;
 
 /**
- * A processor of agent queue entries, each entry's underlying package is 
fecthed and passed to the {@link DistributionPackageImporter} for import.
+ * A processor of agent queue entries, each entry's underlying package is 
fecthed and passed to the
+ * {@link DistributionPackageImporter} for import.
+ * If item can be delivered it can be removed from the queue, if it cannot be 
delivered because of a {@link RecoverableDistributionException}
+ * like a connection issue the item will stay in the queue, for other types of 
errors the item will be moved to the
+ * current queue "error queue" if that exists.
  */
 class SimpleDistributionAgentQueueProcessor implements 
DistributionQueueProcessor {
 

Modified: 
sling/trunk/contrib/extensions/distribution/it/src/test/java/org/apache/sling/distribution/it/SelectiveForwardDistributionTest.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/it/src/test/java/org/apache/sling/distribution/it/SelectiveForwardDistributionTest.java?rev=1783186&r1=1783185&r2=1783186&view=diff
==============================================================================
--- 
sling/trunk/contrib/extensions/distribution/it/src/test/java/org/apache/sling/distribution/it/SelectiveForwardDistributionTest.java
 (original)
+++ 
sling/trunk/contrib/extensions/distribution/it/src/test/java/org/apache/sling/distribution/it/SelectiveForwardDistributionTest.java
 Thu Feb 16 09:48:46 2017
@@ -36,7 +36,6 @@ import static org.junit.Assert.assertEqu
 public class SelectiveForwardDistributionTest extends 
DistributionIntegrationTestBase {
 
 
-    @Ignore
     @Test
     public void testQueues() throws Exception {
 
@@ -44,7 +43,6 @@ public class SelectiveForwardDistributio
         assertEquals(2, queues.size());
     }
 
-    @Ignore
     @Test
     public void testAddContent() throws Exception {
         String nodePath1 = createRandomNode(authorClient, 
"/content/news/forward_add_" + System.nanoTime());
@@ -60,7 +58,6 @@ public class SelectiveForwardDistributio
         assertExists(publishClient, nodePath2);
     }
 
-    @Ignore
     @Test
     public void testDeleteContent() throws Exception {
         String nodePath1 = createRandomNode(publishClient, 
"/content/news/forward_del_" + System.nanoTime());