svn commit: r1744018 - /sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/ForwardDistributionAgentFactory.java

[mp...@apache.org]

Author: mpetria
Date: Mon May 16 10:33:02 2016
New Revision: 1744018

URL: http://svn.apache.org/viewvc?rev=1744018&view=rev
Log:
SLING-5711: fix wrong commit of unfinished work

Modified:
    sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/ForwardDistributionAgentFactory.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=1744018&r1=1744017&r2=1744018&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 Mon May 16 10:33:02 2016
@@ -36,7 +36,6 @@ import org.apache.felix.scr.annotations.
 import org.apache.jackrabbit.vault.packaging.Packaging;
 import org.apache.sling.api.resource.ResourceResolverFactory;
 import org.apache.sling.commons.osgi.PropertiesUtil;
-import org.apache.sling.commons.scheduler.Scheduler;
 import org.apache.sling.distribution.DistributionRequestType;
 import org.apache.sling.distribution.component.impl.DistributionComponentConstants;
 import org.apache.sling.distribution.component.impl.SettingsUtils;
@@ -44,7 +43,6 @@ import org.apache.sling.distribution.eve
 import org.apache.sling.distribution.log.impl.DefaultDistributionLog;
 import org.apache.sling.distribution.packaging.DistributionPackageExporter;
 import org.apache.sling.distribution.packaging.DistributionPackageImporter;
-import org.apache.sling.distribution.packaging.impl.exporter.AsyncTransportDistributionPackageExporter;
 import org.apache.sling.distribution.packaging.impl.exporter.LocalDistributionPackageExporter;
 import org.apache.sling.distribution.packaging.impl.importer.RemoteDistributionPackageImporter;
 import org.apache.sling.distribution.queue.DistributionQueueProvider;
@@ -64,9 +62,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * An OSGi service factory for "forward agents" that push resources from the local instance to remote instances.
- *
- * @see {@link org.apache.sling.distribution.agent.DistributionAgent}
+ * An OSGi service factory for {@link org.apache.sling.distribution.agent.DistributionAgent}s which references already existing OSGi services.
  */
 @Component(metatype = true,
         label = "Apache Sling Distribution Agent - Forward Agents Factory",
@@ -115,9 +111,6 @@ public class ForwardDistributionAgentFac
     @Property(boolValue = true, label = "Queue Processing Enabled", description = "Whether or not the distribution agent should process packages in the queues.")
     private static final String QUEUE_PROCESSING_ENABLED = "queue.processing.enabled";
 
-    @Property(boolValue = true, label = "Asynchronous Transport Enabled", description = "Whether or not the distribution agent should deliver the package immediately after creation.")
-    private static final String ASYNC_TRANSPORT = "transport.async";
-
 
     /**
      * endpoints property
@@ -186,8 +179,6 @@ public class ForwardDistributionAgentFac
     @Reference
     private SlingRepository slingRepository;
 
-    @Reference
-    private Scheduler scheduler;
 
     @Activate
     protected void activate(BundleContext context, Map<String, Object> config) {
@@ -223,13 +214,13 @@ public class ForwardDistributionAgentFac
         priorityQueues = SettingsUtils.removeEmptyEntries(priorityQueues);
 
 
-
+        DistributionPackageExporter packageExporter = new LocalDistributionPackageExporter(packageBuilder);
         DistributionQueueProvider queueProvider = new JobHandlingDistributionQueueProvider(agentName, jobManager, context);
 
         DistributionQueueDispatchingStrategy exportQueueStrategy;
         DistributionQueueDispatchingStrategy errorQueueStrategy = null;
 
-        RemoteDistributionPackageImporter packageImporter = null;
+        DistributionPackageImporter packageImporter = null;
         Map<String, String> importerEndpointsMap = SettingsUtils.toUriMap(config.get(IMPORTER_ENDPOINTS));
         Set<String> processingQueues = new HashSet<String>();
 
@@ -252,14 +243,6 @@ public class ForwardDistributionAgentFac
 
         packageImporter = new RemoteDistributionPackageImporter(distributionLog, transportSecretProvider, importerEndpointsMap);
 
-        boolean asyncTransport = PropertiesUtil.toBoolean(config.get(ASYNC_TRANSPORT), false);
-        DistributionPackageExporter packageExporter;
-        if (asyncTransport) {
-            packageExporter = new AsyncTransportDistributionPackageExporter(scheduler, packageBuilder, packageImporter);
-        } else {
-            packageExporter = new LocalDistributionPackageExporter(packageBuilder);
-        }
-
         DistributionRequestType[] allowedRequests = new DistributionRequestType[]{DistributionRequestType.ADD, DistributionRequestType.DELETE};
 
         String retryStrategy = SettingsUtils.removeEmptyEntry(PropertiesUtil.toString(config.get(RETRY_STRATEGY), null));