You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by tm...@apache.org on 2018/02/02 10:43:01 UTC
[sling-org-apache-sling-distribution-core] branch SLING-7168
created (now 7317793)
This is an automated email from the ASF dual-hosted git repository.
tmaret pushed a change to branch SLING-7168
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-distribution-core.git.
at 7317793 SLING-7168 - Allow to implement custom distribution queue
This branch includes the following new commits:
new 26c217c SLING-7168 - Allow to implement custom distribution queue
new effe26c SLING-7168 - Allow to implement custom distribution queue
new 7317793 SLING-7168 - Allow to implement custom distribution queue
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
--
To stop receiving notification emails like this one, please contact
tmaret@apache.org.
[sling-org-apache-sling-distribution-core] 01/03: SLING-7168 -
Allow to implement custom distribution queue
Posted by tm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tmaret pushed a commit to branch SLING-7168
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-distribution-core.git
commit 26c217ce80b0f2c29a0132ccbaf48077bdaa6e0c
Author: tmaret <tm...@adobe.com>
AuthorDate: Thu Feb 1 18:01:58 2018 +0100
SLING-7168 - Allow to implement custom distribution queue
* Export the org.apache.sling.distribution.queue package
* Export the org.apache.sling.distribution.queue.spi package
* Export the org.apache.sling.distribution.log.spi package
* Expose DistributionQueue and DistributionLog as a consumer types
* Hide DistributionQueueProcessor and DistributionQueueProvider
* Make the exposed classes final
* Minor typo cleanups
---
pom.xml | 5 ++++-
.../sling/distribution/agent/DistributionAgent.java | 6 +++---
.../agent/impl/ForwardDistributionAgentFactory.java | 2 +-
.../agent/impl/QueueDistributionAgentFactory.java | 2 +-
.../impl/QueueingDistributionPackageProcessor.java | 2 +-
.../agent/impl/ReverseDistributionAgentFactory.java | 2 +-
.../agent/impl/SimpleDistributionAgent.java | 8 ++++----
.../agent/impl/SimpleDistributionAgentFactory.java | 2 +-
.../impl/SimpleDistributionAgentQueueProcessor.java | 4 ++--
.../agent/impl/SyncDistributionAgentFactory.java | 2 +-
.../impl/DefaultDistributionComponentProvider.java | 2 +-
.../component/impl/DistributionComponentKind.java | 2 +-
.../distribution/log/impl/DefaultDistributionLog.java | 2 +-
.../distribution/log/{ => spi}/DistributionLog.java | 5 ++++-
.../distribution/{queue => log/spi}/package-info.java | 4 ++--
.../monitor/DistributionQueueHealthCheck.java | 2 +-
.../monitor/impl/DistributionQueueMBeanImpl.java | 2 +-
.../impl/MonitoringDistributionQueueProvider.java | 6 +++---
.../packaging/DistributionPackageExporter.java | 3 ++-
.../exporter/AgentDistributionPackageExporter.java | 4 ++--
.../distribution/queue/DistributionQueueEntry.java | 2 ++
.../distribution/queue/DistributionQueueItem.java | 3 ++-
.../queue/DistributionQueueItemStatus.java | 4 +++-
.../distribution/queue/DistributionQueueStatus.java | 6 +++++-
.../distribution/queue/DistributionQueueType.java | 2 ++
.../queue/impl/AsyncDeliveryDispatchingStrategy.java | 1 +
.../queue/impl/CachingDistributionQueue.java | 2 +-
.../impl/DistributionQueueDispatchingStrategy.java | 10 +++++-----
.../queue/{ => impl}/DistributionQueueProcessor.java | 9 ++++++---
.../queue/{ => impl}/DistributionQueueProvider.java | 5 ++++-
.../queue/impl/DistributionQueueWrapper.java | 2 +-
.../queue/impl/ErrorQueueDispatchingStrategy.java | 3 +--
.../queue/impl/MultipleQueueDispatchingStrategy.java | 3 +--
.../queue/impl/PriorityQueueDispatchingStrategy.java | 1 -
.../queue/impl/SimpleAgentDistributionQueue.java | 2 +-
.../impl/jobhandling/DistributionAgentJobConsumer.java | 2 +-
.../impl/jobhandling/JobHandlingDistributionQueue.java | 4 ++--
.../JobHandlingDistributionQueueProvider.java | 10 +++++-----
.../queue/impl/simple/SimpleDistributionQueue.java | 4 ++--
.../impl/simple/SimpleDistributionQueueCheckpoint.java | 2 +-
.../impl/simple/SimpleDistributionQueueProcessor.java | 4 ++--
.../impl/simple/SimpleDistributionQueueProvider.java | 10 +++++-----
.../apache/sling/distribution/queue/package-info.java | 2 +-
.../queue/{ => spi}/DistributionQueue.java | 15 +++++++++++----
.../distribution/queue/{ => spi}/package-info.java | 4 ++--
.../ExtendedDistributionServiceResourceProvider.java | 4 ++--
.../servlet/DistributionAgentLogServlet.java | 2 +-
.../servlet/DistributionAgentQueueServlet.java | 4 ++--
.../impl/QueueingDistributionPackageProcessorTest.java | 2 +-
.../SimpleDistributionAgentQueueProcessorTest.java | 2 +-
.../agent/impl/SimpleDistributionAgentTest.java | 4 ++--
.../monitor/DistributionQueueHealthCheckTest.java | 15 ++++++++-------
.../monitor/impl/DistributionQueueMBeanTest.java | 2 +-
.../impl/AsyncDeliveryDispatchingStrategyTest.java | 7 ++++---
.../impl/PriorityQueueDispatchingStrategyTest.java | 3 +--
.../impl/SingleQueueDistributionStrategyTest.java | 18 ++++++++++++------
.../jobhandling/DistributionAgentJobConsumerTest.java | 2 +-
.../JobHandlingDistributionQueueProviderTest.java | 4 ++--
.../jobhandling/JobHandlingDistributionQueueTest.java | 2 +-
.../simple/SimpleDistributionQueueCheckpointTest.java | 2 +-
.../simple/SimpleDistributionQueueProcessorTest.java | 7 ++++---
.../simple/SimpleDistributionQueueProviderTest.java | 4 ++--
.../queue/impl/simple/SimpleDistributionQueueTest.java | 12 ++++++------
63 files changed, 156 insertions(+), 119 deletions(-)
diff --git a/pom.xml b/pom.xml
index 8e19597..9a91e6e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -71,7 +71,10 @@
<Export-Package>
org.apache.sling.distribution.util,
org.apache.sling.distribution.common,
- org.apache.sling.distribution.serialization
+ org.apache.sling.distribution.serialization,
+ org.apache.sling.distribution.queue.spi,
+ org.apache.sling.distribution.queue,
+ org.apache.sling.distribution.log.spi
</Export-Package>
<Import-Package>
org.apache.http.nio.*;resolution:=optional,
diff --git a/src/main/java/org/apache/sling/distribution/agent/DistributionAgent.java b/src/main/java/org/apache/sling/distribution/agent/DistributionAgent.java
index bb71ac4..f64f334 100644
--- a/src/main/java/org/apache/sling/distribution/agent/DistributionAgent.java
+++ b/src/main/java/org/apache/sling/distribution/agent/DistributionAgent.java
@@ -26,8 +26,8 @@ import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.distribution.DistributionRequest;
import org.apache.sling.distribution.DistributionResponse;
import org.apache.sling.distribution.common.DistributionException;
-import org.apache.sling.distribution.log.DistributionLog;
-import org.apache.sling.distribution.queue.DistributionQueue;
+import org.apache.sling.distribution.log.spi.DistributionLog;
+import org.apache.sling.distribution.queue.spi.DistributionQueue;
/**
* A distribution agent is responsible for handling {@link org.apache.sling.distribution.DistributionRequest}s.
@@ -51,7 +51,7 @@ public interface DistributionAgent {
* Get the agent queue with the given name
*
* @param name a queue name
- * @return a {@link org.apache.sling.distribution.queue.DistributionQueue} with the given name bound to this agent, if it exists,
+ * @return a {@link DistributionQueue} with the given name bound to this agent, if it exists,
* {@code null} otherwise
*/
@CheckForNull
diff --git a/src/main/java/org/apache/sling/distribution/agent/impl/ForwardDistributionAgentFactory.java b/src/main/java/org/apache/sling/distribution/agent/impl/ForwardDistributionAgentFactory.java
index edf53b6..a5a5ff1 100644
--- a/src/main/java/org/apache/sling/distribution/agent/impl/ForwardDistributionAgentFactory.java
+++ b/src/main/java/org/apache/sling/distribution/agent/impl/ForwardDistributionAgentFactory.java
@@ -53,7 +53,7 @@ import org.apache.sling.distribution.packaging.DistributionPackageExporter;
import org.apache.sling.distribution.packaging.DistributionPackageImporter;
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;
+import org.apache.sling.distribution.queue.impl.DistributionQueueProvider;
import org.apache.sling.distribution.queue.impl.AsyncDeliveryDispatchingStrategy;
import org.apache.sling.distribution.queue.impl.DistributionQueueDispatchingStrategy;
import org.apache.sling.distribution.queue.impl.ErrorQueueDispatchingStrategy;
diff --git a/src/main/java/org/apache/sling/distribution/agent/impl/QueueDistributionAgentFactory.java b/src/main/java/org/apache/sling/distribution/agent/impl/QueueDistributionAgentFactory.java
index df2cd9a..3dff208 100644
--- a/src/main/java/org/apache/sling/distribution/agent/impl/QueueDistributionAgentFactory.java
+++ b/src/main/java/org/apache/sling/distribution/agent/impl/QueueDistributionAgentFactory.java
@@ -44,7 +44,7 @@ import org.apache.sling.distribution.monitor.impl.QueueDistributionAgentMBeanImp
import org.apache.sling.distribution.packaging.DistributionPackageBuilder;
import org.apache.sling.distribution.packaging.DistributionPackageExporter;
import org.apache.sling.distribution.packaging.impl.exporter.LocalDistributionPackageExporter;
-import org.apache.sling.distribution.queue.DistributionQueueProvider;
+import org.apache.sling.distribution.queue.impl.DistributionQueueProvider;
import org.apache.sling.distribution.queue.impl.DistributionQueueDispatchingStrategy;
import org.apache.sling.distribution.queue.impl.PriorityQueueDispatchingStrategy;
import org.apache.sling.distribution.queue.impl.SingleQueueDispatchingStrategy;
diff --git a/src/main/java/org/apache/sling/distribution/agent/impl/QueueingDistributionPackageProcessor.java b/src/main/java/org/apache/sling/distribution/agent/impl/QueueingDistributionPackageProcessor.java
index b227719..5dd347f 100644
--- a/src/main/java/org/apache/sling/distribution/agent/impl/QueueingDistributionPackageProcessor.java
+++ b/src/main/java/org/apache/sling/distribution/agent/impl/QueueingDistributionPackageProcessor.java
@@ -39,7 +39,7 @@ import org.apache.sling.distribution.packaging.DistributionPackageProcessor;
import org.apache.sling.distribution.packaging.impl.DistributionPackageUtils;
import org.apache.sling.distribution.queue.DistributionQueueItemState;
import org.apache.sling.distribution.queue.DistributionQueueItemStatus;
-import org.apache.sling.distribution.queue.DistributionQueueProvider;
+import org.apache.sling.distribution.queue.impl.DistributionQueueProvider;
import org.apache.sling.distribution.queue.impl.DistributionQueueDispatchingStrategy;
/**
diff --git a/src/main/java/org/apache/sling/distribution/agent/impl/ReverseDistributionAgentFactory.java b/src/main/java/org/apache/sling/distribution/agent/impl/ReverseDistributionAgentFactory.java
index 19c25f6..f25d6a9 100644
--- a/src/main/java/org/apache/sling/distribution/agent/impl/ReverseDistributionAgentFactory.java
+++ b/src/main/java/org/apache/sling/distribution/agent/impl/ReverseDistributionAgentFactory.java
@@ -48,7 +48,7 @@ import org.apache.sling.distribution.packaging.DistributionPackageExporter;
import org.apache.sling.distribution.packaging.DistributionPackageImporter;
import org.apache.sling.distribution.packaging.impl.exporter.RemoteDistributionPackageExporter;
import org.apache.sling.distribution.packaging.impl.importer.LocalDistributionPackageImporter;
-import org.apache.sling.distribution.queue.DistributionQueueProvider;
+import org.apache.sling.distribution.queue.impl.DistributionQueueProvider;
import org.apache.sling.distribution.queue.impl.DistributionQueueDispatchingStrategy;
import org.apache.sling.distribution.queue.impl.SingleQueueDispatchingStrategy;
import org.apache.sling.distribution.queue.impl.jobhandling.JobHandlingDistributionQueueProvider;
diff --git a/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgent.java b/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgent.java
index 1d97a89..c50fdf2 100644
--- a/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgent.java
+++ b/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgent.java
@@ -33,15 +33,15 @@ import org.apache.sling.distribution.event.DistributionEventTopics;
import org.apache.sling.distribution.event.impl.DistributionEventFactory;
import org.apache.sling.distribution.impl.CompositeDistributionResponse;
import org.apache.sling.distribution.impl.SimpleDistributionResponse;
-import org.apache.sling.distribution.log.DistributionLog;
+import org.apache.sling.distribution.log.spi.DistributionLog;
import org.apache.sling.distribution.log.impl.DefaultDistributionLog;
import org.apache.sling.distribution.packaging.DistributionPackage;
import org.apache.sling.distribution.packaging.DistributionPackageExporter;
import org.apache.sling.distribution.packaging.DistributionPackageImporter;
import org.apache.sling.distribution.packaging.DistributionPackageProcessor;
-import org.apache.sling.distribution.queue.DistributionQueue;
-import org.apache.sling.distribution.queue.DistributionQueueProcessor;
-import org.apache.sling.distribution.queue.DistributionQueueProvider;
+import org.apache.sling.distribution.queue.spi.DistributionQueue;
+import org.apache.sling.distribution.queue.impl.DistributionQueueProcessor;
+import org.apache.sling.distribution.queue.impl.DistributionQueueProvider;
import org.apache.sling.distribution.queue.DistributionQueueState;
import org.apache.sling.distribution.queue.impl.DistributionQueueDispatchingStrategy;
import org.apache.sling.distribution.queue.impl.SimpleAgentDistributionQueue;
diff --git a/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgentFactory.java b/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgentFactory.java
index 4cc8ce8..27c236c 100644
--- a/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgentFactory.java
+++ b/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgentFactory.java
@@ -42,7 +42,7 @@ import org.apache.sling.distribution.monitor.impl.SimpleDistributionAgentMBean;
import org.apache.sling.distribution.monitor.impl.SimpleDistributionAgentMBeanImpl;
import org.apache.sling.distribution.packaging.DistributionPackageExporter;
import org.apache.sling.distribution.packaging.DistributionPackageImporter;
-import org.apache.sling.distribution.queue.DistributionQueueProvider;
+import org.apache.sling.distribution.queue.impl.DistributionQueueProvider;
import org.apache.sling.distribution.queue.impl.DistributionQueueDispatchingStrategy;
import org.apache.sling.distribution.queue.impl.SingleQueueDispatchingStrategy;
import org.apache.sling.distribution.queue.impl.jobhandling.JobHandlingDistributionQueueProvider;
diff --git a/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgentQueueProcessor.java b/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgentQueueProcessor.java
index 11930b8..95dc2e1 100644
--- a/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgentQueueProcessor.java
+++ b/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgentQueueProcessor.java
@@ -35,8 +35,8 @@ import org.apache.sling.distribution.packaging.impl.DistributionPackageUtils;
import org.apache.sling.distribution.queue.DistributionQueueEntry;
import org.apache.sling.distribution.queue.DistributionQueueItem;
import org.apache.sling.distribution.queue.DistributionQueueItemStatus;
-import org.apache.sling.distribution.queue.DistributionQueueProcessor;
-import org.apache.sling.distribution.queue.DistributionQueueProvider;
+import org.apache.sling.distribution.queue.impl.DistributionQueueProcessor;
+import org.apache.sling.distribution.queue.impl.DistributionQueueProvider;
import org.apache.sling.distribution.queue.impl.DistributionQueueDispatchingStrategy;
import org.apache.sling.distribution.util.impl.DistributionUtils;
import org.slf4j.Logger;
diff --git a/src/main/java/org/apache/sling/distribution/agent/impl/SyncDistributionAgentFactory.java b/src/main/java/org/apache/sling/distribution/agent/impl/SyncDistributionAgentFactory.java
index 6c4fe28..0506ce0 100644
--- a/src/main/java/org/apache/sling/distribution/agent/impl/SyncDistributionAgentFactory.java
+++ b/src/main/java/org/apache/sling/distribution/agent/impl/SyncDistributionAgentFactory.java
@@ -36,7 +36,7 @@ import org.apache.sling.distribution.packaging.DistributionPackageExporter;
import org.apache.sling.distribution.packaging.DistributionPackageImporter;
import org.apache.sling.distribution.packaging.impl.exporter.RemoteDistributionPackageExporter;
import org.apache.sling.distribution.packaging.impl.importer.RemoteDistributionPackageImporter;
-import org.apache.sling.distribution.queue.DistributionQueueProvider;
+import org.apache.sling.distribution.queue.impl.DistributionQueueProvider;
import org.apache.sling.distribution.queue.impl.DistributionQueueDispatchingStrategy;
import org.apache.sling.distribution.queue.impl.ErrorQueueDispatchingStrategy;
import org.apache.sling.distribution.queue.impl.MultipleQueueDispatchingStrategy;
diff --git a/src/main/java/org/apache/sling/distribution/component/impl/DefaultDistributionComponentProvider.java b/src/main/java/org/apache/sling/distribution/component/impl/DefaultDistributionComponentProvider.java
index d76091f..5745d38 100644
--- a/src/main/java/org/apache/sling/distribution/component/impl/DefaultDistributionComponentProvider.java
+++ b/src/main/java/org/apache/sling/distribution/component/impl/DefaultDistributionComponentProvider.java
@@ -36,7 +36,7 @@ import org.apache.sling.distribution.agent.impl.DistributionRequestAuthorization
import org.apache.sling.distribution.packaging.DistributionPackageBuilder;
import org.apache.sling.distribution.packaging.DistributionPackageExporter;
import org.apache.sling.distribution.packaging.DistributionPackageImporter;
-import org.apache.sling.distribution.queue.DistributionQueueProvider;
+import org.apache.sling.distribution.queue.impl.DistributionQueueProvider;
import org.apache.sling.distribution.queue.impl.DistributionQueueDispatchingStrategy;
import org.apache.sling.distribution.transport.DistributionTransportSecretProvider;
import org.apache.sling.distribution.trigger.DistributionTrigger;
diff --git a/src/main/java/org/apache/sling/distribution/component/impl/DistributionComponentKind.java b/src/main/java/org/apache/sling/distribution/component/impl/DistributionComponentKind.java
index 3fc19c5..e34a2f0 100644
--- a/src/main/java/org/apache/sling/distribution/component/impl/DistributionComponentKind.java
+++ b/src/main/java/org/apache/sling/distribution/component/impl/DistributionComponentKind.java
@@ -50,7 +50,7 @@ import org.apache.sling.distribution.packaging.impl.exporter.LocalDistributionPa
import org.apache.sling.distribution.packaging.impl.exporter.RemoteDistributionPackageExporterFactory;
import org.apache.sling.distribution.packaging.impl.importer.LocalDistributionPackageImporterFactory;
import org.apache.sling.distribution.packaging.impl.importer.RemoteDistributionPackageImporterFactory;
-import org.apache.sling.distribution.queue.DistributionQueueProvider;
+import org.apache.sling.distribution.queue.impl.DistributionQueueProvider;
import org.apache.sling.distribution.queue.impl.DistributionQueueDispatchingStrategy;
import org.apache.sling.distribution.serialization.impl.vlt.VaultDistributionPackageBuilderFactory;
import org.apache.sling.distribution.transport.DistributionTransportSecretProvider;
diff --git a/src/main/java/org/apache/sling/distribution/log/impl/DefaultDistributionLog.java b/src/main/java/org/apache/sling/distribution/log/impl/DefaultDistributionLog.java
index 1c37ed2..488238f 100644
--- a/src/main/java/org/apache/sling/distribution/log/impl/DefaultDistributionLog.java
+++ b/src/main/java/org/apache/sling/distribution/log/impl/DefaultDistributionLog.java
@@ -27,7 +27,7 @@ import java.util.LinkedList;
import java.util.List;
import org.apache.sling.distribution.component.impl.DistributionComponentKind;
-import org.apache.sling.distribution.log.DistributionLog;
+import org.apache.sling.distribution.log.spi.DistributionLog;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.slf4j.helpers.FormattingTuple;
diff --git a/src/main/java/org/apache/sling/distribution/log/DistributionLog.java b/src/main/java/org/apache/sling/distribution/log/spi/DistributionLog.java
similarity index 91%
rename from src/main/java/org/apache/sling/distribution/log/DistributionLog.java
rename to src/main/java/org/apache/sling/distribution/log/spi/DistributionLog.java
index 878d4ae..d05a2bb 100644
--- a/src/main/java/org/apache/sling/distribution/log/DistributionLog.java
+++ b/src/main/java/org/apache/sling/distribution/log/spi/DistributionLog.java
@@ -17,14 +17,17 @@
* under the License.
*/
-package org.apache.sling.distribution.log;
+package org.apache.sling.distribution.log.spi;
import java.util.Collection;
import java.util.List;
+import aQute.bnd.annotation.ConsumerType;
+
/**
* The log of a distribution component activity (e.g. a {@link org.apache.sling.distribution.agent.DistributionAgent})
*/
+@ConsumerType
public interface DistributionLog {
/**
diff --git a/src/main/java/org/apache/sling/distribution/queue/package-info.java b/src/main/java/org/apache/sling/distribution/log/spi/package-info.java
similarity index 92%
copy from src/main/java/org/apache/sling/distribution/queue/package-info.java
copy to src/main/java/org/apache/sling/distribution/log/spi/package-info.java
index 70795e9..71bb8a9 100644
--- a/src/main/java/org/apache/sling/distribution/queue/package-info.java
+++ b/src/main/java/org/apache/sling/distribution/log/spi/package-info.java
@@ -17,8 +17,8 @@
* under the License.
*/
-@Version("0.1.0")
-package org.apache.sling.distribution.queue;
+@Version("0.0.0")
+package org.apache.sling.distribution.log.spi;
import aQute.bnd.annotation.Version;
diff --git a/src/main/java/org/apache/sling/distribution/monitor/DistributionQueueHealthCheck.java b/src/main/java/org/apache/sling/distribution/monitor/DistributionQueueHealthCheck.java
index 1cfe185..15dc16d 100644
--- a/src/main/java/org/apache/sling/distribution/monitor/DistributionQueueHealthCheck.java
+++ b/src/main/java/org/apache/sling/distribution/monitor/DistributionQueueHealthCheck.java
@@ -36,7 +36,7 @@ import org.apache.felix.scr.annotations.References;
import org.apache.felix.scr.annotations.Service;
import org.apache.sling.commons.osgi.PropertiesUtil;
import org.apache.sling.distribution.agent.DistributionAgent;
-import org.apache.sling.distribution.queue.DistributionQueue;
+import org.apache.sling.distribution.queue.spi.DistributionQueue;
import org.apache.sling.distribution.queue.DistributionQueueEntry;
import org.apache.sling.distribution.queue.DistributionQueueItemStatus;
import org.apache.sling.hc.api.HealthCheck;
diff --git a/src/main/java/org/apache/sling/distribution/monitor/impl/DistributionQueueMBeanImpl.java b/src/main/java/org/apache/sling/distribution/monitor/impl/DistributionQueueMBeanImpl.java
index b73cfcb..7b89582 100644
--- a/src/main/java/org/apache/sling/distribution/monitor/impl/DistributionQueueMBeanImpl.java
+++ b/src/main/java/org/apache/sling/distribution/monitor/impl/DistributionQueueMBeanImpl.java
@@ -20,7 +20,7 @@ package org.apache.sling.distribution.monitor.impl;
import java.util.Calendar;
-import org.apache.sling.distribution.queue.DistributionQueue;
+import org.apache.sling.distribution.queue.spi.DistributionQueue;
/**
* Default implementation of {@link DistributionQueueMBean}
diff --git a/src/main/java/org/apache/sling/distribution/monitor/impl/MonitoringDistributionQueueProvider.java b/src/main/java/org/apache/sling/distribution/monitor/impl/MonitoringDistributionQueueProvider.java
index fe4ab38..b5eed1f 100644
--- a/src/main/java/org/apache/sling/distribution/monitor/impl/MonitoringDistributionQueueProvider.java
+++ b/src/main/java/org/apache/sling/distribution/monitor/impl/MonitoringDistributionQueueProvider.java
@@ -27,9 +27,9 @@ import java.util.List;
import java.util.Set;
import org.apache.sling.distribution.common.DistributionException;
-import org.apache.sling.distribution.queue.DistributionQueue;
-import org.apache.sling.distribution.queue.DistributionQueueProcessor;
-import org.apache.sling.distribution.queue.DistributionQueueProvider;
+import org.apache.sling.distribution.queue.spi.DistributionQueue;
+import org.apache.sling.distribution.queue.impl.DistributionQueueProcessor;
+import org.apache.sling.distribution.queue.impl.DistributionQueueProvider;
import org.apache.sling.distribution.queue.DistributionQueueType;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceRegistration;
diff --git a/src/main/java/org/apache/sling/distribution/packaging/DistributionPackageExporter.java b/src/main/java/org/apache/sling/distribution/packaging/DistributionPackageExporter.java
index f0a6f45..38cbc70 100644
--- a/src/main/java/org/apache/sling/distribution/packaging/DistributionPackageExporter.java
+++ b/src/main/java/org/apache/sling/distribution/packaging/DistributionPackageExporter.java
@@ -25,12 +25,13 @@ import aQute.bnd.annotation.ConsumerType;
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.distribution.DistributionRequest;
import org.apache.sling.distribution.common.DistributionException;
+import org.apache.sling.distribution.queue.spi.DistributionQueue;
/**
* A {@link DistributionPackageExporter) is responsible of exporting {@link DistributionPackage}s from a local or remote
* Sling instance.
* Such packages are usually imported by a {@link DistributionPackageImporter} or put inside
- * {@link org.apache.sling.distribution.queue.DistributionQueue}s for others to consume them.
+ * {@link DistributionQueue }s for others to consume them.
* Exporting a {@link DistributionPackage} means obtaining that package by e.g. directly creating it by bundling local
* Sling resources, retrieving it from a remote endpoint (by executing an HTTP POST request on another Sling
* instance exposing packages ina queue).
diff --git a/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/AgentDistributionPackageExporter.java b/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/AgentDistributionPackageExporter.java
index 160d0ee..0bf46aa 100644
--- a/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/AgentDistributionPackageExporter.java
+++ b/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/AgentDistributionPackageExporter.java
@@ -25,14 +25,14 @@ import org.apache.sling.distribution.DistributionRequest;
import org.apache.sling.distribution.DistributionRequestType;
import org.apache.sling.distribution.agent.DistributionAgent;
import org.apache.sling.distribution.common.DistributionException;
-import org.apache.sling.distribution.log.DistributionLog;
+import org.apache.sling.distribution.log.spi.DistributionLog;
import org.apache.sling.distribution.log.impl.DefaultDistributionLog;
import org.apache.sling.distribution.packaging.DistributionPackageProcessor;
import org.apache.sling.distribution.packaging.DistributionPackage;
import org.apache.sling.distribution.packaging.DistributionPackageExporter;
import org.apache.sling.distribution.packaging.DistributionPackageInfo;
import org.apache.sling.distribution.packaging.impl.DistributionPackageUtils;
-import org.apache.sling.distribution.queue.DistributionQueue;
+import org.apache.sling.distribution.queue.spi.DistributionQueue;
import org.apache.sling.distribution.queue.DistributionQueueEntry;
import org.apache.sling.distribution.queue.DistributionQueueItem;
import org.apache.sling.distribution.packaging.DistributionPackageBuilder;
diff --git a/src/main/java/org/apache/sling/distribution/queue/DistributionQueueEntry.java b/src/main/java/org/apache/sling/distribution/queue/DistributionQueueEntry.java
index 8ad111b..806d5ea 100644
--- a/src/main/java/org/apache/sling/distribution/queue/DistributionQueueEntry.java
+++ b/src/main/java/org/apache/sling/distribution/queue/DistributionQueueEntry.java
@@ -20,6 +20,8 @@ package org.apache.sling.distribution.queue;
import javax.annotation.Nonnull;
+import org.apache.sling.distribution.queue.spi.DistributionQueue;
+
/**
* an entry in a {@link DistributionQueue}
*/
diff --git a/src/main/java/org/apache/sling/distribution/queue/DistributionQueueItem.java b/src/main/java/org/apache/sling/distribution/queue/DistributionQueueItem.java
index b22dda1..17bba45 100644
--- a/src/main/java/org/apache/sling/distribution/queue/DistributionQueueItem.java
+++ b/src/main/java/org/apache/sling/distribution/queue/DistributionQueueItem.java
@@ -24,6 +24,7 @@ import java.util.Map;
import org.apache.sling.api.resource.ValueMap;
import org.apache.sling.api.wrappers.ValueMapDecorator;
import org.apache.sling.distribution.packaging.DistributionPackage;
+import org.apache.sling.distribution.queue.spi.DistributionQueue;
/**
* An item in a {@link DistributionQueue}
@@ -31,7 +32,7 @@ import org.apache.sling.distribution.packaging.DistributionPackage;
* to keep the package {@link DistributionPackage#createInputStream() stream} into
* the queues.
*/
-public class DistributionQueueItem extends ValueMapDecorator implements ValueMap {
+public final class DistributionQueueItem extends ValueMapDecorator implements ValueMap {
private final String packageId;
private final long size;
diff --git a/src/main/java/org/apache/sling/distribution/queue/DistributionQueueItemStatus.java b/src/main/java/org/apache/sling/distribution/queue/DistributionQueueItemStatus.java
index 55226bf..95cb786 100644
--- a/src/main/java/org/apache/sling/distribution/queue/DistributionQueueItemStatus.java
+++ b/src/main/java/org/apache/sling/distribution/queue/DistributionQueueItemStatus.java
@@ -20,10 +20,12 @@ package org.apache.sling.distribution.queue;
import java.util.Calendar;
+import org.apache.sling.distribution.queue.spi.DistributionQueue;
+
/**
* the current status of a certain item in a {@link DistributionQueue}
*/
-public class DistributionQueueItemStatus {
+public final class DistributionQueueItemStatus {
private final int attempts;
diff --git a/src/main/java/org/apache/sling/distribution/queue/DistributionQueueStatus.java b/src/main/java/org/apache/sling/distribution/queue/DistributionQueueStatus.java
index f404054..32fe293 100644
--- a/src/main/java/org/apache/sling/distribution/queue/DistributionQueueStatus.java
+++ b/src/main/java/org/apache/sling/distribution/queue/DistributionQueueStatus.java
@@ -19,6 +19,10 @@
package org.apache.sling.distribution.queue;
+import javax.annotation.Nonnull;
+
+import org.apache.sling.distribution.queue.spi.DistributionQueue;
+
/**
* The status of a certain {@link DistributionQueue}
*/
@@ -27,7 +31,7 @@ public final class DistributionQueueStatus {
private final DistributionQueueState queueState;
- public DistributionQueueStatus(int itemsCount, DistributionQueueState queueState) {
+ public DistributionQueueStatus(int itemsCount, @Nonnull DistributionQueueState queueState) {
this.itemsCount = itemsCount;
this.queueState = queueState;
}
diff --git a/src/main/java/org/apache/sling/distribution/queue/DistributionQueueType.java b/src/main/java/org/apache/sling/distribution/queue/DistributionQueueType.java
index 176ce30..88ea599 100644
--- a/src/main/java/org/apache/sling/distribution/queue/DistributionQueueType.java
+++ b/src/main/java/org/apache/sling/distribution/queue/DistributionQueueType.java
@@ -18,6 +18,8 @@
*/
package org.apache.sling.distribution.queue;
+import org.apache.sling.distribution.queue.spi.DistributionQueue;
+
/**
* the type of {@link DistributionQueue}
*/
diff --git a/src/main/java/org/apache/sling/distribution/queue/impl/AsyncDeliveryDispatchingStrategy.java b/src/main/java/org/apache/sling/distribution/queue/impl/AsyncDeliveryDispatchingStrategy.java
index ccdd09c..2903925 100644
--- a/src/main/java/org/apache/sling/distribution/queue/impl/AsyncDeliveryDispatchingStrategy.java
+++ b/src/main/java/org/apache/sling/distribution/queue/impl/AsyncDeliveryDispatchingStrategy.java
@@ -29,6 +29,7 @@ import org.apache.sling.distribution.packaging.impl.DistributionPackageUtils;
import org.apache.sling.distribution.packaging.impl.ReferencePackage;
import org.apache.sling.distribution.packaging.impl.SharedDistributionPackage;
import org.apache.sling.distribution.queue.*;
+import org.apache.sling.distribution.queue.spi.DistributionQueue;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/src/main/java/org/apache/sling/distribution/queue/impl/CachingDistributionQueue.java b/src/main/java/org/apache/sling/distribution/queue/impl/CachingDistributionQueue.java
index d0ba734..300a65c 100644
--- a/src/main/java/org/apache/sling/distribution/queue/impl/CachingDistributionQueue.java
+++ b/src/main/java/org/apache/sling/distribution/queue/impl/CachingDistributionQueue.java
@@ -18,7 +18,7 @@
*/
package org.apache.sling.distribution.queue.impl;
-import org.apache.sling.distribution.queue.DistributionQueue;
+import org.apache.sling.distribution.queue.spi.DistributionQueue;
import org.apache.sling.distribution.queue.DistributionQueueEntry;
import org.apache.sling.distribution.queue.DistributionQueueItem;
import org.apache.sling.distribution.queue.DistributionQueueStatus;
diff --git a/src/main/java/org/apache/sling/distribution/queue/impl/DistributionQueueDispatchingStrategy.java b/src/main/java/org/apache/sling/distribution/queue/impl/DistributionQueueDispatchingStrategy.java
index 7f08ff7..de907f9 100644
--- a/src/main/java/org/apache/sling/distribution/queue/impl/DistributionQueueDispatchingStrategy.java
+++ b/src/main/java/org/apache/sling/distribution/queue/impl/DistributionQueueDispatchingStrategy.java
@@ -25,13 +25,13 @@ import aQute.bnd.annotation.ConsumerType;
import org.apache.sling.distribution.common.DistributionException;
import org.apache.sling.distribution.packaging.DistributionPackage;
import org.apache.sling.distribution.queue.DistributionQueueItemStatus;
-import org.apache.sling.distribution.queue.DistributionQueueProvider;
+import org.apache.sling.distribution.queue.spi.DistributionQueue;
/**
* a {@link DistributionQueueDispatchingStrategy} implements an algorithm for dispatching
* {@link DistributionPackage}s among the available queues.
* <p/>
- * Usually a {@link DistributionPackage} will be dispatched to a single {@link org.apache.sling.distribution.queue.DistributionQueue}
+ * Usually a {@link DistributionPackage} will be dispatched to a single {@link DistributionQueue}
* but it would also be possible to dispatch the same package to multiple queues, resulting in obtaining multiple states
* (one for each queue) for a certain package.
*/
@@ -41,12 +41,12 @@ public interface DistributionQueueDispatchingStrategy {
/**
* synchronously distribute a {@link DistributionPackage}
- * to one or more {@link org.apache.sling.distribution.queue.DistributionQueue}s provided by the given {@link org.apache.sling.distribution.queue.DistributionQueueProvider}
+ * to one or more {@link DistributionQueue}s provided by the given {@link DistributionQueueProvider}
*
* @param distributionPackage a {@link DistributionPackage} to distribute
- * @param queueProvider the {@link org.apache.sling.distribution.queue.DistributionQueueProvider} used to provide the queues to be used for the given package
+ * @param queueProvider the {@link DistributionQueueProvider} used to provide the queues to be used for the given package
* @return an {@link java.lang.Iterable} of {@link org.apache.sling.distribution.queue.DistributionQueueItemStatus}s representing
- * the states of the {@link org.apache.sling.distribution.queue.DistributionQueueItem}s added to one or more {@link org.apache.sling.distribution.queue.DistributionQueue}s
+ * the states of the {@link org.apache.sling.distribution.queue.DistributionQueueItem}s added to one or more {@link DistributionQueue}s
* @throws DistributionException if any internal error happens during distribution
*/
Iterable<DistributionQueueItemStatus> add(@Nonnull DistributionPackage distributionPackage, @Nonnull DistributionQueueProvider queueProvider) throws DistributionException;
diff --git a/src/main/java/org/apache/sling/distribution/queue/DistributionQueueProcessor.java b/src/main/java/org/apache/sling/distribution/queue/impl/DistributionQueueProcessor.java
similarity index 76%
rename from src/main/java/org/apache/sling/distribution/queue/DistributionQueueProcessor.java
rename to src/main/java/org/apache/sling/distribution/queue/impl/DistributionQueueProcessor.java
index c97a191..5733c07 100644
--- a/src/main/java/org/apache/sling/distribution/queue/DistributionQueueProcessor.java
+++ b/src/main/java/org/apache/sling/distribution/queue/impl/DistributionQueueProcessor.java
@@ -16,11 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.distribution.queue;
+package org.apache.sling.distribution.queue.impl;
import javax.annotation.Nonnull;
import aQute.bnd.annotation.ProviderType;
+import org.apache.sling.distribution.queue.DistributionQueueEntry;
+import org.apache.sling.distribution.queue.DistributionQueueItem;
+import org.apache.sling.distribution.queue.spi.DistributionQueue;
/**
* Processor of {@link DistributionQueueItem}s
@@ -29,9 +32,9 @@ import aQute.bnd.annotation.ProviderType;
public interface DistributionQueueProcessor {
/**
- * Process an item from a certain {@link org.apache.sling.distribution.queue.DistributionQueue}
+ * Process an item from a certain {@link DistributionQueue}
*
- * @param queueName the name of the {@link org.apache.sling.distribution.queue.DistributionQueue} to be processed
+ * @param queueName the name of the {@link DistributionQueue} to be processed
* @param queueEntry the {@link org.apache.sling.distribution.queue.DistributionQueueEntry} to be processed
* @return {@code true} if the item was successfully processed, {@code false} otherwise
*/
diff --git a/src/main/java/org/apache/sling/distribution/queue/DistributionQueueProvider.java b/src/main/java/org/apache/sling/distribution/queue/impl/DistributionQueueProvider.java
similarity index 91%
rename from src/main/java/org/apache/sling/distribution/queue/DistributionQueueProvider.java
rename to src/main/java/org/apache/sling/distribution/queue/impl/DistributionQueueProvider.java
index e42aa6a..73b2fdf 100644
--- a/src/main/java/org/apache/sling/distribution/queue/DistributionQueueProvider.java
+++ b/src/main/java/org/apache/sling/distribution/queue/impl/DistributionQueueProvider.java
@@ -16,12 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.distribution.queue;
+package org.apache.sling.distribution.queue.impl;
import javax.annotation.Nonnull;
import aQute.bnd.annotation.ProviderType;
import org.apache.sling.distribution.common.DistributionException;
+import org.apache.sling.distribution.queue.DistributionQueueType;
+import org.apache.sling.distribution.queue.spi.DistributionQueue;
/**
* A provider for {@link DistributionQueue}s
@@ -44,6 +46,7 @@ public interface DistributionQueueProvider {
* @param type the type of the queue
* @return a {@link DistributionQueue}
*/
+ @Nonnull
DistributionQueue getQueue(@Nonnull String queueName, @Nonnull DistributionQueueType type);
/**
diff --git a/src/main/java/org/apache/sling/distribution/queue/impl/DistributionQueueWrapper.java b/src/main/java/org/apache/sling/distribution/queue/impl/DistributionQueueWrapper.java
index b5e2fcc..d5551b2 100644
--- a/src/main/java/org/apache/sling/distribution/queue/impl/DistributionQueueWrapper.java
+++ b/src/main/java/org/apache/sling/distribution/queue/impl/DistributionQueueWrapper.java
@@ -18,7 +18,7 @@
*/
package org.apache.sling.distribution.queue.impl;
-import org.apache.sling.distribution.queue.DistributionQueue;
+import org.apache.sling.distribution.queue.spi.DistributionQueue;
import org.apache.sling.distribution.queue.DistributionQueueEntry;
import org.apache.sling.distribution.queue.DistributionQueueItem;
import org.apache.sling.distribution.queue.DistributionQueueStatus;
diff --git a/src/main/java/org/apache/sling/distribution/queue/impl/ErrorQueueDispatchingStrategy.java b/src/main/java/org/apache/sling/distribution/queue/impl/ErrorQueueDispatchingStrategy.java
index 94dcac6..0d7102a 100644
--- a/src/main/java/org/apache/sling/distribution/queue/impl/ErrorQueueDispatchingStrategy.java
+++ b/src/main/java/org/apache/sling/distribution/queue/impl/ErrorQueueDispatchingStrategy.java
@@ -29,12 +29,11 @@ import java.util.TreeSet;
import org.apache.sling.distribution.common.DistributionException;
import org.apache.sling.distribution.packaging.DistributionPackage;
import org.apache.sling.distribution.packaging.impl.DistributionPackageUtils;
-import org.apache.sling.distribution.queue.DistributionQueue;
+import org.apache.sling.distribution.queue.spi.DistributionQueue;
import org.apache.sling.distribution.queue.DistributionQueueEntry;
import org.apache.sling.distribution.queue.DistributionQueueItem;
import org.apache.sling.distribution.queue.DistributionQueueItemState;
import org.apache.sling.distribution.queue.DistributionQueueItemStatus;
-import org.apache.sling.distribution.queue.DistributionQueueProvider;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/src/main/java/org/apache/sling/distribution/queue/impl/MultipleQueueDispatchingStrategy.java b/src/main/java/org/apache/sling/distribution/queue/impl/MultipleQueueDispatchingStrategy.java
index 8c00f27..a7a3931 100644
--- a/src/main/java/org/apache/sling/distribution/queue/impl/MultipleQueueDispatchingStrategy.java
+++ b/src/main/java/org/apache/sling/distribution/queue/impl/MultipleQueueDispatchingStrategy.java
@@ -28,11 +28,10 @@ import org.apache.sling.distribution.queue.DistributionQueueEntry;
import org.apache.sling.distribution.packaging.DistributionPackage;
import org.apache.sling.distribution.packaging.impl.SharedDistributionPackage;
import org.apache.sling.distribution.packaging.impl.DistributionPackageUtils;
-import org.apache.sling.distribution.queue.DistributionQueue;
+import org.apache.sling.distribution.queue.spi.DistributionQueue;
import org.apache.sling.distribution.queue.DistributionQueueItem;
import org.apache.sling.distribution.queue.DistributionQueueItemState;
import org.apache.sling.distribution.queue.DistributionQueueItemStatus;
-import org.apache.sling.distribution.queue.DistributionQueueProvider;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/src/main/java/org/apache/sling/distribution/queue/impl/PriorityQueueDispatchingStrategy.java b/src/main/java/org/apache/sling/distribution/queue/impl/PriorityQueueDispatchingStrategy.java
index 6a3dc1a..964ac01 100644
--- a/src/main/java/org/apache/sling/distribution/queue/impl/PriorityQueueDispatchingStrategy.java
+++ b/src/main/java/org/apache/sling/distribution/queue/impl/PriorityQueueDispatchingStrategy.java
@@ -21,7 +21,6 @@ package org.apache.sling.distribution.queue.impl;
import org.apache.sling.distribution.common.DistributionException;
import org.apache.sling.distribution.packaging.DistributionPackage;
import org.apache.sling.distribution.queue.DistributionQueueItemStatus;
-import org.apache.sling.distribution.queue.DistributionQueueProvider;
import javax.annotation.Nonnull;
import java.util.ArrayList;
diff --git a/src/main/java/org/apache/sling/distribution/queue/impl/SimpleAgentDistributionQueue.java b/src/main/java/org/apache/sling/distribution/queue/impl/SimpleAgentDistributionQueue.java
index 7d60ba0..f550ccb 100644
--- a/src/main/java/org/apache/sling/distribution/queue/impl/SimpleAgentDistributionQueue.java
+++ b/src/main/java/org/apache/sling/distribution/queue/impl/SimpleAgentDistributionQueue.java
@@ -19,7 +19,7 @@
package org.apache.sling.distribution.queue.impl;
-import org.apache.sling.distribution.queue.DistributionQueue;
+import org.apache.sling.distribution.queue.spi.DistributionQueue;
import org.apache.sling.distribution.queue.DistributionQueueState;
import org.apache.sling.distribution.queue.DistributionQueueStatus;
import org.apache.sling.distribution.queue.DistributionQueueType;
diff --git a/src/main/java/org/apache/sling/distribution/queue/impl/jobhandling/DistributionAgentJobConsumer.java b/src/main/java/org/apache/sling/distribution/queue/impl/jobhandling/DistributionAgentJobConsumer.java
index 72841e4..1e2a142 100644
--- a/src/main/java/org/apache/sling/distribution/queue/impl/jobhandling/DistributionAgentJobConsumer.java
+++ b/src/main/java/org/apache/sling/distribution/queue/impl/jobhandling/DistributionAgentJobConsumer.java
@@ -19,7 +19,7 @@
package org.apache.sling.distribution.queue.impl.jobhandling;
import org.apache.sling.distribution.queue.DistributionQueueEntry;
-import org.apache.sling.distribution.queue.DistributionQueueProcessor;
+import org.apache.sling.distribution.queue.impl.DistributionQueueProcessor;
import org.apache.sling.event.jobs.Job;
import org.apache.sling.event.jobs.consumer.JobConsumer;
import org.slf4j.Logger;
diff --git a/src/main/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingDistributionQueue.java b/src/main/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingDistributionQueue.java
index 3abda50..9a7ee28 100644
--- a/src/main/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingDistributionQueue.java
+++ b/src/main/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingDistributionQueue.java
@@ -24,7 +24,7 @@ import java.util.Collection;
import java.util.List;
import java.util.Map;
-import org.apache.sling.distribution.queue.DistributionQueue;
+import org.apache.sling.distribution.queue.spi.DistributionQueue;
import org.apache.sling.distribution.queue.DistributionQueueEntry;
import org.apache.sling.distribution.queue.DistributionQueueItem;
import org.apache.sling.distribution.queue.DistributionQueueItemStatus;
@@ -39,7 +39,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * a {@link org.apache.sling.distribution.queue.DistributionQueue} based on Sling Job Handling facilities
+ * a {@link DistributionQueue} based on Sling Job Handling facilities
*/
public class JobHandlingDistributionQueue implements DistributionQueue {
diff --git a/src/main/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingDistributionQueueProvider.java b/src/main/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingDistributionQueueProvider.java
index ed4f48a..347db72 100644
--- a/src/main/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingDistributionQueueProvider.java
+++ b/src/main/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingDistributionQueueProvider.java
@@ -29,9 +29,9 @@ import java.util.List;
import java.util.Set;
import org.apache.sling.distribution.common.DistributionException;
-import org.apache.sling.distribution.queue.DistributionQueue;
-import org.apache.sling.distribution.queue.DistributionQueueProcessor;
-import org.apache.sling.distribution.queue.DistributionQueueProvider;
+import org.apache.sling.distribution.queue.spi.DistributionQueue;
+import org.apache.sling.distribution.queue.impl.DistributionQueueProcessor;
+import org.apache.sling.distribution.queue.impl.DistributionQueueProvider;
import org.apache.sling.distribution.queue.DistributionQueueType;
import org.apache.sling.distribution.queue.impl.CachingDistributionQueue;
import org.apache.sling.event.impl.jobs.config.ConfigurationConstants;
@@ -46,8 +46,8 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * a queue provider {@link org.apache.sling.distribution.queue.DistributionQueueProvider} for sling jobs based
- * {@link org.apache.sling.distribution.queue.DistributionQueue}s
+ * a queue provider {@link DistributionQueueProvider} for sling jobs based
+ * {@link DistributionQueue}s
*/
public class JobHandlingDistributionQueueProvider implements DistributionQueueProvider {
diff --git a/src/main/java/org/apache/sling/distribution/queue/impl/simple/SimpleDistributionQueue.java b/src/main/java/org/apache/sling/distribution/queue/impl/simple/SimpleDistributionQueue.java
index 1bfa49e..3fc7352 100644
--- a/src/main/java/org/apache/sling/distribution/queue/impl/simple/SimpleDistributionQueue.java
+++ b/src/main/java/org/apache/sling/distribution/queue/impl/simple/SimpleDistributionQueue.java
@@ -28,7 +28,7 @@ import java.util.Queue;
import java.util.WeakHashMap;
import java.util.concurrent.LinkedBlockingQueue;
-import org.apache.sling.distribution.queue.DistributionQueue;
+import org.apache.sling.distribution.queue.spi.DistributionQueue;
import org.apache.sling.distribution.queue.DistributionQueueEntry;
import org.apache.sling.distribution.queue.DistributionQueueItem;
import org.apache.sling.distribution.queue.DistributionQueueItemState;
@@ -41,7 +41,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * A simple implementation of a {@link org.apache.sling.distribution.queue.DistributionQueue}.
+ * A simple implementation of a {@link DistributionQueue}.
* <p/>
* Note that, at the moment, this is a transient in memory queue not persisted on the repository and
* therefore not usable for production.
diff --git a/src/main/java/org/apache/sling/distribution/queue/impl/simple/SimpleDistributionQueueCheckpoint.java b/src/main/java/org/apache/sling/distribution/queue/impl/simple/SimpleDistributionQueueCheckpoint.java
index c000424..21c5282 100644
--- a/src/main/java/org/apache/sling/distribution/queue/impl/simple/SimpleDistributionQueueCheckpoint.java
+++ b/src/main/java/org/apache/sling/distribution/queue/impl/simple/SimpleDistributionQueueCheckpoint.java
@@ -25,7 +25,7 @@ import java.util.Collection;
import java.util.LinkedList;
import org.apache.commons.io.IOUtils;
-import org.apache.sling.distribution.queue.DistributionQueue;
+import org.apache.sling.distribution.queue.spi.DistributionQueue;
import org.apache.sling.distribution.queue.DistributionQueueEntry;
import org.apache.sling.distribution.queue.DistributionQueueItem;
import org.slf4j.Logger;
diff --git a/src/main/java/org/apache/sling/distribution/queue/impl/simple/SimpleDistributionQueueProcessor.java b/src/main/java/org/apache/sling/distribution/queue/impl/simple/SimpleDistributionQueueProcessor.java
index ac41222..f4d3074 100644
--- a/src/main/java/org/apache/sling/distribution/queue/impl/simple/SimpleDistributionQueueProcessor.java
+++ b/src/main/java/org/apache/sling/distribution/queue/impl/simple/SimpleDistributionQueueProcessor.java
@@ -18,9 +18,9 @@
*/
package org.apache.sling.distribution.queue.impl.simple;
-import org.apache.sling.distribution.queue.DistributionQueue;
+import org.apache.sling.distribution.queue.spi.DistributionQueue;
import org.apache.sling.distribution.queue.DistributionQueueEntry;
-import org.apache.sling.distribution.queue.DistributionQueueProcessor;
+import org.apache.sling.distribution.queue.impl.DistributionQueueProcessor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/src/main/java/org/apache/sling/distribution/queue/impl/simple/SimpleDistributionQueueProvider.java b/src/main/java/org/apache/sling/distribution/queue/impl/simple/SimpleDistributionQueueProvider.java
index e9dde47..4835bed 100644
--- a/src/main/java/org/apache/sling/distribution/queue/impl/simple/SimpleDistributionQueueProvider.java
+++ b/src/main/java/org/apache/sling/distribution/queue/impl/simple/SimpleDistributionQueueProvider.java
@@ -33,17 +33,17 @@ import org.apache.commons.io.IOUtils;
import org.apache.commons.io.LineIterator;
import org.apache.sling.commons.scheduler.ScheduleOptions;
import org.apache.sling.commons.scheduler.Scheduler;
-import org.apache.sling.distribution.queue.DistributionQueue;
+import org.apache.sling.distribution.queue.spi.DistributionQueue;
import org.apache.sling.distribution.queue.DistributionQueueItem;
-import org.apache.sling.distribution.queue.DistributionQueueProcessor;
-import org.apache.sling.distribution.queue.DistributionQueueProvider;
+import org.apache.sling.distribution.queue.impl.DistributionQueueProcessor;
+import org.apache.sling.distribution.queue.impl.DistributionQueueProvider;
import org.apache.sling.distribution.queue.DistributionQueueType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * a queue provider {@link org.apache.sling.distribution.queue.DistributionQueueProvider} for simple in memory
- * {@link org.apache.sling.distribution.queue.DistributionQueue}s
+ * a queue provider {@link DistributionQueueProvider} for simple in memory
+ * {@link DistributionQueue}s
*/
public class SimpleDistributionQueueProvider implements DistributionQueueProvider {
diff --git a/src/main/java/org/apache/sling/distribution/queue/package-info.java b/src/main/java/org/apache/sling/distribution/queue/package-info.java
index 70795e9..54a3ee1 100644
--- a/src/main/java/org/apache/sling/distribution/queue/package-info.java
+++ b/src/main/java/org/apache/sling/distribution/queue/package-info.java
@@ -17,7 +17,7 @@
* under the License.
*/
-@Version("0.1.0")
+@Version("0.0.0")
package org.apache.sling.distribution.queue;
import aQute.bnd.annotation.Version;
diff --git a/src/main/java/org/apache/sling/distribution/queue/DistributionQueue.java b/src/main/java/org/apache/sling/distribution/queue/spi/DistributionQueue.java
similarity index 85%
rename from src/main/java/org/apache/sling/distribution/queue/DistributionQueue.java
rename to src/main/java/org/apache/sling/distribution/queue/spi/DistributionQueue.java
index 4cec864..66642d6 100644
--- a/src/main/java/org/apache/sling/distribution/queue/DistributionQueue.java
+++ b/src/main/java/org/apache/sling/distribution/queue/spi/DistributionQueue.java
@@ -16,13 +16,18 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.distribution.queue;
+package org.apache.sling.distribution.queue.spi;
import javax.annotation.CheckForNull;
import javax.annotation.Nonnull;
-import aQute.bnd.annotation.ProviderType;
+import aQute.bnd.annotation.ConsumerType;
import org.apache.sling.distribution.packaging.DistributionPackage;
+import org.apache.sling.distribution.queue.DistributionQueueEntry;
+import org.apache.sling.distribution.queue.DistributionQueueItem;
+import org.apache.sling.distribution.queue.DistributionQueueStatus;
+import org.apache.sling.distribution.queue.DistributionQueueType;
+import org.apache.sling.distribution.queue.impl.DistributionQueueProcessor;
/**
* A queue is responsible for collecting the {@link DistributionPackage}s
@@ -32,9 +37,9 @@ import org.apache.sling.distribution.packaging.DistributionPackage;
* on that same agent.
* <p/>
* The items (packages) in the queue can then get processed according to a FIFO
- * strategy or in parallel, or some other way, via {@link org.apache.sling.distribution.queue.DistributionQueueProcessor}s.
+ * strategy or in parallel, or some other way, via {@link DistributionQueueProcessor}s.
*/
-@ProviderType
+@ConsumerType
public interface DistributionQueue {
/**
@@ -52,6 +57,7 @@ public interface DistributionQueue {
* to distribute
* @return the queue entry created for this item or {@code noll} if none is created
*/
+ @CheckForNull
DistributionQueueEntry add(@Nonnull DistributionQueueItem item);
/**
@@ -103,5 +109,6 @@ public interface DistributionQueue {
* get the type of this queue
* @return the type
*/
+ @Nonnull
DistributionQueueType getType();
}
diff --git a/src/main/java/org/apache/sling/distribution/queue/package-info.java b/src/main/java/org/apache/sling/distribution/queue/spi/package-info.java
similarity index 92%
copy from src/main/java/org/apache/sling/distribution/queue/package-info.java
copy to src/main/java/org/apache/sling/distribution/queue/spi/package-info.java
index 70795e9..8ccaeac 100644
--- a/src/main/java/org/apache/sling/distribution/queue/package-info.java
+++ b/src/main/java/org/apache/sling/distribution/queue/spi/package-info.java
@@ -17,8 +17,8 @@
* under the License.
*/
-@Version("0.1.0")
-package org.apache.sling.distribution.queue;
+@Version("0.0.0")
+package org.apache.sling.distribution.queue.spi;
import aQute.bnd.annotation.Version;
diff --git a/src/main/java/org/apache/sling/distribution/resources/impl/ExtendedDistributionServiceResourceProvider.java b/src/main/java/org/apache/sling/distribution/resources/impl/ExtendedDistributionServiceResourceProvider.java
index 2ccdf7c..6d5ae84 100644
--- a/src/main/java/org/apache/sling/distribution/resources/impl/ExtendedDistributionServiceResourceProvider.java
+++ b/src/main/java/org/apache/sling/distribution/resources/impl/ExtendedDistributionServiceResourceProvider.java
@@ -31,11 +31,11 @@ import org.apache.sling.distribution.agent.DistributionAgentState;
import org.apache.sling.distribution.component.impl.DistributionComponent;
import org.apache.sling.distribution.component.impl.DistributionComponentKind;
import org.apache.sling.distribution.component.impl.DistributionComponentProvider;
-import org.apache.sling.distribution.log.DistributionLog;
+import org.apache.sling.distribution.log.spi.DistributionLog;
import org.apache.sling.distribution.queue.impl.ErrorQueueDispatchingStrategy;
import org.apache.sling.distribution.packaging.DistributionPackageInfo;
import org.apache.sling.distribution.packaging.impl.DistributionPackageUtils;
-import org.apache.sling.distribution.queue.DistributionQueue;
+import org.apache.sling.distribution.queue.spi.DistributionQueue;
import org.apache.sling.distribution.queue.DistributionQueueEntry;
import org.apache.sling.distribution.queue.DistributionQueueItem;
import org.apache.sling.distribution.queue.DistributionQueueItemStatus;
diff --git a/src/main/java/org/apache/sling/distribution/servlet/DistributionAgentLogServlet.java b/src/main/java/org/apache/sling/distribution/servlet/DistributionAgentLogServlet.java
index 6e87484..95ad92b 100644
--- a/src/main/java/org/apache/sling/distribution/servlet/DistributionAgentLogServlet.java
+++ b/src/main/java/org/apache/sling/distribution/servlet/DistributionAgentLogServlet.java
@@ -27,7 +27,7 @@ import org.apache.sling.api.SlingHttpServletRequest;
import org.apache.sling.api.SlingHttpServletResponse;
import org.apache.sling.api.servlets.SlingAllMethodsServlet;
import org.apache.sling.distribution.DistributionRequest;
-import org.apache.sling.distribution.log.DistributionLog;
+import org.apache.sling.distribution.log.spi.DistributionLog;
import org.apache.sling.distribution.resources.DistributionResourceTypes;
import org.apache.sling.distribution.util.RequestUtils;
import org.slf4j.Logger;
diff --git a/src/main/java/org/apache/sling/distribution/servlet/DistributionAgentQueueServlet.java b/src/main/java/org/apache/sling/distribution/servlet/DistributionAgentQueueServlet.java
index cd1c56d..bc0db4e 100644
--- a/src/main/java/org/apache/sling/distribution/servlet/DistributionAgentQueueServlet.java
+++ b/src/main/java/org/apache/sling/distribution/servlet/DistributionAgentQueueServlet.java
@@ -33,7 +33,7 @@ import org.apache.sling.distribution.common.DistributionException;
import org.apache.sling.distribution.packaging.DistributionPackage;
import org.apache.sling.distribution.packaging.DistributionPackageInfo;
import org.apache.sling.distribution.packaging.impl.DistributionPackageUtils;
-import org.apache.sling.distribution.queue.DistributionQueue;
+import org.apache.sling.distribution.queue.spi.DistributionQueue;
import org.apache.sling.distribution.queue.DistributionQueueEntry;
import org.apache.sling.distribution.queue.DistributionQueueItem;
import org.apache.sling.distribution.resources.DistributionResourceTypes;
@@ -43,7 +43,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * Servlet to retrieve a {@link org.apache.sling.distribution.queue.DistributionQueue} status.
+ * Servlet to retrieve a {@link DistributionQueue} status.
*/
@SuppressWarnings("serial")
@SlingServlet(resourceTypes = DistributionResourceTypes.AGENT_QUEUE_RESOURCE_TYPE, methods = {"POST"})
diff --git a/src/test/java/org/apache/sling/distribution/agent/impl/QueueingDistributionPackageProcessorTest.java b/src/test/java/org/apache/sling/distribution/agent/impl/QueueingDistributionPackageProcessorTest.java
index c1d6b5e..1820e9d 100644
--- a/src/test/java/org/apache/sling/distribution/agent/impl/QueueingDistributionPackageProcessorTest.java
+++ b/src/test/java/org/apache/sling/distribution/agent/impl/QueueingDistributionPackageProcessorTest.java
@@ -29,7 +29,7 @@ import org.apache.sling.distribution.packaging.DistributionPackage;
import org.apache.sling.distribution.packaging.DistributionPackageInfo;
import org.apache.sling.distribution.queue.DistributionQueueItemState;
import org.apache.sling.distribution.queue.DistributionQueueItemStatus;
-import org.apache.sling.distribution.queue.DistributionQueueProvider;
+import org.apache.sling.distribution.queue.impl.DistributionQueueProvider;
import org.apache.sling.distribution.queue.impl.DistributionQueueDispatchingStrategy;
import org.junit.Test;
diff --git a/src/test/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgentQueueProcessorTest.java b/src/test/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgentQueueProcessorTest.java
index 378aa51..a96601c 100644
--- a/src/test/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgentQueueProcessorTest.java
+++ b/src/test/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgentQueueProcessorTest.java
@@ -28,7 +28,7 @@ import org.apache.sling.distribution.queue.DistributionQueueEntry;
import org.apache.sling.distribution.queue.DistributionQueueItem;
import org.apache.sling.distribution.queue.DistributionQueueItemState;
import org.apache.sling.distribution.queue.DistributionQueueItemStatus;
-import org.apache.sling.distribution.queue.DistributionQueueProvider;
+import org.apache.sling.distribution.queue.impl.DistributionQueueProvider;
import org.junit.Test;
import static org.mockito.Mockito.mock;
diff --git a/src/test/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgentTest.java b/src/test/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgentTest.java
index 86c3075..cfbf7e4 100644
--- a/src/test/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgentTest.java
+++ b/src/test/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgentTest.java
@@ -39,11 +39,11 @@ import org.apache.sling.distribution.packaging.DistributionPackage;
import org.apache.sling.distribution.packaging.DistributionPackageExporter;
import org.apache.sling.distribution.packaging.DistributionPackageImporter;
import org.apache.sling.distribution.packaging.DistributionPackageInfo;
-import org.apache.sling.distribution.queue.DistributionQueue;
+import org.apache.sling.distribution.queue.spi.DistributionQueue;
import org.apache.sling.distribution.queue.DistributionQueueItemState;
import org.apache.sling.distribution.queue.impl.DistributionQueueDispatchingStrategy;
import org.apache.sling.distribution.queue.DistributionQueueItemStatus;
-import org.apache.sling.distribution.queue.DistributionQueueProvider;
+import org.apache.sling.distribution.queue.impl.DistributionQueueProvider;
import org.apache.sling.distribution.queue.impl.simple.SimpleDistributionQueue;
import org.apache.sling.distribution.trigger.DistributionRequestHandler;
import org.apache.sling.distribution.trigger.DistributionTrigger;
diff --git a/src/test/java/org/apache/sling/distribution/monitor/DistributionQueueHealthCheckTest.java b/src/test/java/org/apache/sling/distribution/monitor/DistributionQueueHealthCheckTest.java
index 0147c78..68ce1a4 100644
--- a/src/test/java/org/apache/sling/distribution/monitor/DistributionQueueHealthCheckTest.java
+++ b/src/test/java/org/apache/sling/distribution/monitor/DistributionQueueHealthCheckTest.java
@@ -19,11 +19,14 @@
package org.apache.sling.distribution.monitor;
import java.util.ArrayList;
+import java.util.Calendar;
import java.util.Collections;
+import java.util.HashMap;
import java.util.List;
import org.apache.sling.distribution.agent.DistributionAgent;
-import org.apache.sling.distribution.queue.DistributionQueue;
+import org.apache.sling.distribution.queue.DistributionQueueItemState;
+import org.apache.sling.distribution.queue.spi.DistributionQueue;
import org.apache.sling.distribution.queue.DistributionQueueEntry;
import org.apache.sling.distribution.queue.DistributionQueueItem;
import org.apache.sling.distribution.queue.DistributionQueueItemStatus;
@@ -78,9 +81,8 @@ public class DistributionQueueHealthCheckTest {
distributionQueueHealthCheck.activate(Collections.<String, Object>emptyMap());
DistributionQueue queue = mock(DistributionQueue.class);
- DistributionQueueItem item = mock(DistributionQueueItem.class);
- DistributionQueueItemStatus status = mock(DistributionQueueItemStatus.class);
- when(status.getAttempts()).thenReturn(1);
+ DistributionQueueItem item = new DistributionQueueItem("packageId", new HashMap<String, Object>());
+ DistributionQueueItemStatus status = new DistributionQueueItemStatus(Calendar.getInstance(), DistributionQueueItemState.QUEUED, 1, "queueName");
when(queue.getItem(any(String.class))).thenReturn(new DistributionQueueEntry(null, item, status));
when(queue.getHead()).thenReturn(new DistributionQueueEntry(null, item, status));
DistributionAgent distributionAgent = mock(DistributionAgent.class);
@@ -103,9 +105,8 @@ public class DistributionQueueHealthCheckTest {
distributionQueueHealthCheck.activate(Collections.<String, Object>emptyMap());
DistributionQueue queue = mock(DistributionQueue.class);
- DistributionQueueItem item = mock(DistributionQueueItem.class);
- DistributionQueueItemStatus status = mock(DistributionQueueItemStatus.class);
- when(status.getAttempts()).thenReturn(10);
+ DistributionQueueItem item = new DistributionQueueItem("packageId", new HashMap<String, Object>());
+ DistributionQueueItemStatus status = new DistributionQueueItemStatus(Calendar.getInstance(), DistributionQueueItemState.QUEUED, 10, "queueName");
when(queue.getItem(any(String.class))).thenReturn(new DistributionQueueEntry(null, item, status));
when(queue.getHead()).thenReturn(new DistributionQueueEntry(null, item, status));
DistributionAgent distributionAgent = mock(DistributionAgent.class);
diff --git a/src/test/java/org/apache/sling/distribution/monitor/impl/DistributionQueueMBeanTest.java b/src/test/java/org/apache/sling/distribution/monitor/impl/DistributionQueueMBeanTest.java
index 153ba57..1f77dcf 100644
--- a/src/test/java/org/apache/sling/distribution/monitor/impl/DistributionQueueMBeanTest.java
+++ b/src/test/java/org/apache/sling/distribution/monitor/impl/DistributionQueueMBeanTest.java
@@ -33,7 +33,7 @@ import static org.mockito.Mockito.when;
import java.util.Calendar;
import java.util.HashMap;
-import org.apache.sling.distribution.queue.DistributionQueue;
+import org.apache.sling.distribution.queue.spi.DistributionQueue;
import org.apache.sling.distribution.queue.DistributionQueueEntry;
import org.apache.sling.distribution.queue.DistributionQueueItem;
import org.apache.sling.distribution.queue.DistributionQueueItemStatus;
diff --git a/src/test/java/org/apache/sling/distribution/queue/impl/AsyncDeliveryDispatchingStrategyTest.java b/src/test/java/org/apache/sling/distribution/queue/impl/AsyncDeliveryDispatchingStrategyTest.java
index 41853c5..6447611 100644
--- a/src/test/java/org/apache/sling/distribution/queue/impl/AsyncDeliveryDispatchingStrategyTest.java
+++ b/src/test/java/org/apache/sling/distribution/queue/impl/AsyncDeliveryDispatchingStrategyTest.java
@@ -25,6 +25,7 @@ import static org.mockito.Matchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
+import java.util.Calendar;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -33,11 +34,11 @@ import org.apache.sling.distribution.common.DistributionException;
import org.apache.sling.distribution.packaging.DistributionPackage;
import org.apache.sling.distribution.packaging.DistributionPackageInfo;
import org.apache.sling.distribution.packaging.impl.SharedDistributionPackage;
-import org.apache.sling.distribution.queue.DistributionQueue;
+import org.apache.sling.distribution.queue.DistributionQueueItemState;
+import org.apache.sling.distribution.queue.spi.DistributionQueue;
import org.apache.sling.distribution.queue.DistributionQueueEntry;
import org.apache.sling.distribution.queue.DistributionQueueItem;
import org.apache.sling.distribution.queue.DistributionQueueItemStatus;
-import org.apache.sling.distribution.queue.DistributionQueueProvider;
import org.apache.sling.distribution.queue.DistributionQueueState;
import org.apache.sling.distribution.queue.DistributionQueueStatus;
import org.junit.Test;
@@ -76,7 +77,7 @@ public class AsyncDeliveryDispatchingStrategyTest {
// setup queues
DistributionQueueProvider queueProvider = mock(DistributionQueueProvider.class);
DistributionQueue dq1 = mock(DistributionQueue.class);
- DistributionQueueItemStatus status = mock(DistributionQueueItemStatus.class);
+ DistributionQueueItemStatus status = new DistributionQueueItemStatus(Calendar.getInstance(), DistributionQueueItemState.QUEUED, 0, "queueName");
DistributionQueueEntry entry = new DistributionQueueEntry("1242112", new DistributionQueueItem(distributionPackage.getId(),
new HashMap<String, Object>()), status);
when(dq1.add(any(DistributionQueueItem.class))).thenReturn(entry);
diff --git a/src/test/java/org/apache/sling/distribution/queue/impl/PriorityQueueDispatchingStrategyTest.java b/src/test/java/org/apache/sling/distribution/queue/impl/PriorityQueueDispatchingStrategyTest.java
index 34546c9..4ea08a9 100644
--- a/src/test/java/org/apache/sling/distribution/queue/impl/PriorityQueueDispatchingStrategyTest.java
+++ b/src/test/java/org/apache/sling/distribution/queue/impl/PriorityQueueDispatchingStrategyTest.java
@@ -21,8 +21,7 @@ package org.apache.sling.distribution.queue.impl;
import org.apache.sling.distribution.packaging.DistributionPackage;
import org.apache.sling.distribution.packaging.DistributionPackageInfo;
import org.apache.sling.distribution.packaging.impl.SharedDistributionPackage;
-import org.apache.sling.distribution.queue.DistributionQueue;
-import org.apache.sling.distribution.queue.DistributionQueueProvider;
+import org.apache.sling.distribution.queue.spi.DistributionQueue;
import org.junit.BeforeClass;
import org.junit.Test;
diff --git a/src/test/java/org/apache/sling/distribution/queue/impl/SingleQueueDistributionStrategyTest.java b/src/test/java/org/apache/sling/distribution/queue/impl/SingleQueueDistributionStrategyTest.java
index a1c7f26..5cc3f0e 100644
--- a/src/test/java/org/apache/sling/distribution/queue/impl/SingleQueueDistributionStrategyTest.java
+++ b/src/test/java/org/apache/sling/distribution/queue/impl/SingleQueueDistributionStrategyTest.java
@@ -18,14 +18,16 @@
*/
package org.apache.sling.distribution.queue.impl;
+import java.util.Calendar;
+import java.util.HashMap;
import java.util.Iterator;
import org.apache.sling.distribution.packaging.DistributionPackage;
-import org.apache.sling.distribution.queue.DistributionQueue;
+import org.apache.sling.distribution.queue.DistributionQueueItemState;
+import org.apache.sling.distribution.queue.spi.DistributionQueue;
import org.apache.sling.distribution.queue.DistributionQueueEntry;
import org.apache.sling.distribution.queue.DistributionQueueItem;
import org.apache.sling.distribution.queue.DistributionQueueItemStatus;
-import org.apache.sling.distribution.queue.DistributionQueueProvider;
import org.junit.Test;
import static org.junit.Assert.assertNotNull;
@@ -46,7 +48,7 @@ public class SingleQueueDistributionStrategyTest {
DistributionQueueProvider queueProvider = mock(DistributionQueueProvider.class);
DistributionQueue queue = mock(DistributionQueue.class);
when(queueProvider.getQueue(DistributionQueueDispatchingStrategy.DEFAULT_QUEUE_NAME)).thenReturn(queue);
- DistributionQueueItemStatus state = mock(DistributionQueueItemStatus.class);
+ DistributionQueueItemStatus state = newDistributionQueueItemStatus();
when(queue.add(any(DistributionQueueItem.class))).thenReturn(new DistributionQueueEntry(null, null, state));
Iterable<DistributionQueueItemStatus> returnedStates = singleQueueDistributionStrategy.add(distributionPackage, queueProvider);
@@ -63,9 +65,9 @@ public class SingleQueueDistributionStrategyTest {
DistributionPackage distributionPackage = mock(DistributionPackage.class);
DistributionQueueProvider queueProvider = mock(DistributionQueueProvider.class);
DistributionQueue queue = mock(DistributionQueue.class);
- DistributionQueueItem queueItem = mock(DistributionQueueItem.class);
+ DistributionQueueItem queueItem = new DistributionQueueItem("packageId", new HashMap<String, Object>());
when(queueProvider.getQueue(DistributionQueueDispatchingStrategy.DEFAULT_QUEUE_NAME)).thenReturn(queue);
- DistributionQueueItemStatus state = mock(DistributionQueueItemStatus.class);
+ DistributionQueueItemStatus state = newDistributionQueueItemStatus();
when(queue.add(queueItem)).thenReturn(new DistributionQueueEntry(null, queueItem, state));
Iterable<DistributionQueueItemStatus> returnedStates = singleQueueDistributionStrategy.add(distributionPackage, queueProvider);
assertNotNull(returnedStates);
@@ -82,7 +84,7 @@ public class SingleQueueDistributionStrategyTest {
DistributionQueueProvider queueProvider = mock(DistributionQueueProvider.class);
DistributionQueue queue = mock(DistributionQueue.class);
when(queueProvider.getQueue(DistributionQueueDispatchingStrategy.DEFAULT_QUEUE_NAME)).thenReturn(queue);
- DistributionQueueItemStatus state = mock(DistributionQueueItemStatus.class);
+ DistributionQueueItemStatus state = newDistributionQueueItemStatus();
when(queue.add(any(DistributionQueueItem.class))).thenReturn(new DistributionQueueEntry(null, null, state));
@@ -93,4 +95,8 @@ public class SingleQueueDistributionStrategyTest {
assertTrue(iterator.hasNext());
assertNotNull(iterator.next());
}
+
+ private DistributionQueueItemStatus newDistributionQueueItemStatus() {
+ return new DistributionQueueItemStatus(Calendar.getInstance(), DistributionQueueItemState.QUEUED, 0, DistributionQueueDispatchingStrategy.DEFAULT_QUEUE_NAME);
+ }
}
diff --git a/src/test/java/org/apache/sling/distribution/queue/impl/jobhandling/DistributionAgentJobConsumerTest.java b/src/test/java/org/apache/sling/distribution/queue/impl/jobhandling/DistributionAgentJobConsumerTest.java
index 57e3d61..e7ba3ce 100644
--- a/src/test/java/org/apache/sling/distribution/queue/impl/jobhandling/DistributionAgentJobConsumerTest.java
+++ b/src/test/java/org/apache/sling/distribution/queue/impl/jobhandling/DistributionAgentJobConsumerTest.java
@@ -19,7 +19,7 @@
package org.apache.sling.distribution.queue.impl.jobhandling;
import org.apache.sling.distribution.queue.DistributionQueueEntry;
-import org.apache.sling.distribution.queue.DistributionQueueProcessor;
+import org.apache.sling.distribution.queue.impl.DistributionQueueProcessor;
import org.apache.sling.event.jobs.Job;
import org.apache.sling.event.jobs.consumer.JobConsumer;
import org.junit.Test;
diff --git a/src/test/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingDistributionQueueProviderTest.java b/src/test/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingDistributionQueueProviderTest.java
index 5dbc2fa..be8ec4f 100644
--- a/src/test/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingDistributionQueueProviderTest.java
+++ b/src/test/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingDistributionQueueProviderTest.java
@@ -18,8 +18,8 @@
*/
package org.apache.sling.distribution.queue.impl.jobhandling;
-import org.apache.sling.distribution.queue.DistributionQueue;
-import org.apache.sling.distribution.queue.DistributionQueueProcessor;
+import org.apache.sling.distribution.queue.spi.DistributionQueue;
+import org.apache.sling.distribution.queue.impl.DistributionQueueProcessor;
import org.apache.sling.event.jobs.JobManager;
import org.apache.sling.event.jobs.QueueConfiguration;
import org.junit.Test;
diff --git a/src/test/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingDistributionQueueTest.java b/src/test/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingDistributionQueueTest.java
index 53c5134..25c0f84 100644
--- a/src/test/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingDistributionQueueTest.java
+++ b/src/test/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingDistributionQueueTest.java
@@ -23,7 +23,7 @@ import java.util.Map;
import org.apache.sling.distribution.DistributionRequestType;
import org.apache.sling.distribution.packaging.DistributionPackageInfo;
-import org.apache.sling.distribution.queue.DistributionQueue;
+import org.apache.sling.distribution.queue.spi.DistributionQueue;
import org.apache.sling.distribution.queue.DistributionQueueItem;
import org.apache.sling.distribution.queue.DistributionQueueItemState;
import org.apache.sling.distribution.queue.DistributionQueueItemStatus;
diff --git a/src/test/java/org/apache/sling/distribution/queue/impl/simple/SimpleDistributionQueueCheckpointTest.java b/src/test/java/org/apache/sling/distribution/queue/impl/simple/SimpleDistributionQueueCheckpointTest.java
index 62c6917..860fd54 100644
--- a/src/test/java/org/apache/sling/distribution/queue/impl/simple/SimpleDistributionQueueCheckpointTest.java
+++ b/src/test/java/org/apache/sling/distribution/queue/impl/simple/SimpleDistributionQueueCheckpointTest.java
@@ -28,7 +28,7 @@ import java.util.LinkedList;
import java.util.Map;
import org.apache.commons.io.FileUtils;
-import org.apache.sling.distribution.queue.DistributionQueue;
+import org.apache.sling.distribution.queue.spi.DistributionQueue;
import org.apache.sling.distribution.queue.DistributionQueueEntry;
import org.apache.sling.distribution.queue.DistributionQueueItem;
import org.apache.sling.distribution.queue.DistributionQueueItemState;
diff --git a/src/test/java/org/apache/sling/distribution/queue/impl/simple/SimpleDistributionQueueProcessorTest.java b/src/test/java/org/apache/sling/distribution/queue/impl/simple/SimpleDistributionQueueProcessorTest.java
index bd840dd..56fb555 100644
--- a/src/test/java/org/apache/sling/distribution/queue/impl/simple/SimpleDistributionQueueProcessorTest.java
+++ b/src/test/java/org/apache/sling/distribution/queue/impl/simple/SimpleDistributionQueueProcessorTest.java
@@ -19,12 +19,13 @@
package org.apache.sling.distribution.queue.impl.simple;
import java.util.Collection;
+import java.util.HashMap;
import java.util.LinkedList;
-import org.apache.sling.distribution.queue.DistributionQueue;
+import org.apache.sling.distribution.queue.spi.DistributionQueue;
import org.apache.sling.distribution.queue.DistributionQueueEntry;
import org.apache.sling.distribution.queue.DistributionQueueItem;
-import org.apache.sling.distribution.queue.DistributionQueueProcessor;
+import org.apache.sling.distribution.queue.impl.DistributionQueueProcessor;
import org.junit.Test;
import static org.mockito.Mockito.mock;
@@ -63,7 +64,7 @@ public class SimpleDistributionQueueProcessorTest {
SimpleDistributionQueueProvider queueProvider = mock(SimpleDistributionQueueProvider.class);
Collection<SimpleDistributionQueue> queues = new LinkedList<SimpleDistributionQueue>();
SimpleDistributionQueue queue = mock(SimpleDistributionQueue.class);
- DistributionQueueItem item = mock(DistributionQueueItem.class);
+ DistributionQueueItem item = new DistributionQueueItem("packageId", new HashMap<String, Object>());
when(queue.getHead()).thenReturn(new DistributionQueueEntry(null, item, null)).thenReturn(null);
queues.add(queue);
diff --git a/src/test/java/org/apache/sling/distribution/queue/impl/simple/SimpleDistributionQueueProviderTest.java b/src/test/java/org/apache/sling/distribution/queue/impl/simple/SimpleDistributionQueueProviderTest.java
index a6144d8..f2331b3 100644
--- a/src/test/java/org/apache/sling/distribution/queue/impl/simple/SimpleDistributionQueueProviderTest.java
+++ b/src/test/java/org/apache/sling/distribution/queue/impl/simple/SimpleDistributionQueueProviderTest.java
@@ -23,10 +23,10 @@ import java.io.File;
import org.apache.commons.io.FileUtils;
import org.apache.sling.commons.scheduler.ScheduleOptions;
import org.apache.sling.commons.scheduler.Scheduler;
-import org.apache.sling.distribution.queue.DistributionQueue;
+import org.apache.sling.distribution.queue.spi.DistributionQueue;
import org.apache.sling.distribution.queue.DistributionQueueEntry;
import org.apache.sling.distribution.queue.DistributionQueueItem;
-import org.apache.sling.distribution.queue.DistributionQueueProcessor;
+import org.apache.sling.distribution.queue.impl.DistributionQueueProcessor;
import org.junit.Test;
import static org.junit.Assert.*;
diff --git a/src/test/java/org/apache/sling/distribution/queue/impl/simple/SimpleDistributionQueueTest.java b/src/test/java/org/apache/sling/distribution/queue/impl/simple/SimpleDistributionQueueTest.java
index ab35bde..7689f6e 100644
--- a/src/test/java/org/apache/sling/distribution/queue/impl/simple/SimpleDistributionQueueTest.java
+++ b/src/test/java/org/apache/sling/distribution/queue/impl/simple/SimpleDistributionQueueTest.java
@@ -18,7 +18,9 @@
*/
package org.apache.sling.distribution.queue.impl.simple;
-import org.apache.sling.distribution.queue.DistributionQueue;
+import java.util.HashMap;
+
+import org.apache.sling.distribution.queue.spi.DistributionQueue;
import org.apache.sling.distribution.queue.DistributionQueueEntry;
import org.apache.sling.distribution.queue.DistributionQueueItem;
import org.apache.sling.distribution.queue.DistributionQueueItemStatus;
@@ -40,7 +42,7 @@ public class SimpleDistributionQueueTest {
@Test
public void testPackageAddition() throws Exception {
DistributionQueue queue = new SimpleDistributionQueue("agentName", "default");
- DistributionQueueItem pkg = mock(DistributionQueueItem.class);
+ DistributionQueueItem pkg = new DistributionQueueItem("packageId", new HashMap<String, Object>());
assertNotNull(queue.add(pkg));
assertFalse(queue.getStatus().isEmpty());
}
@@ -48,8 +50,7 @@ public class SimpleDistributionQueueTest {
@Test
public void testPackageAdditionAndRemoval() throws Exception {
DistributionQueue queue = new SimpleDistributionQueue("agentName", "default");
- DistributionQueueItem pkg = mock(DistributionQueueItem.class);
- when(pkg.getPackageId()).thenReturn("id");
+ DistributionQueueItem pkg = new DistributionQueueItem("id", new HashMap<String, Object>());
assertNotNull(queue.add(pkg));
assertFalse(queue.getStatus().isEmpty());
assertNotNull(queue.remove(pkg.getPackageId()));
@@ -61,8 +62,7 @@ public class SimpleDistributionQueueTest {
@Test
public void testPackageAdditionRetrievalAndRemoval() throws Exception {
DistributionQueue queue = new SimpleDistributionQueue("agentName", "default");
- DistributionQueueItem pkg = mock(DistributionQueueItem.class);
- when(pkg.getPackageId()).thenReturn("id");
+ DistributionQueueItem pkg = new DistributionQueueItem("id", new HashMap<String, Object>());
assertNotNull(queue.add(pkg));
assertFalse(queue.getStatus().isEmpty());
assertEquals(pkg, queue.getHead().getItem());
--
To stop receiving notification emails like this one, please contact
tmaret@apache.org.
[sling-org-apache-sling-distribution-core] 03/03: SLING-7168 -
Allow to implement custom distribution queue
Posted by tm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tmaret pushed a commit to branch SLING-7168
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-distribution-core.git
commit 7317793d754205b47c1edb24d259c725a12d4b67
Author: tmaret <tm...@adobe.com>
AuthorDate: Fri Feb 2 11:40:46 2018 +0100
SLING-7168 - Allow to implement custom distribution queue
* Export the org.apache.sling.distribution.packaging package
* Hide DistributionPackageExporter, DistributionPackageImporter, DistributionPackageBuilderProvider, DistributionPackageProcessor
---
pom.xml | 3 ++-
.../impl/ForwardDistributionAgentFactory.java | 4 ++--
.../ImportingDistributionPackageProcessor.java | 4 ++--
.../agent/impl/QueueDistributionAgentFactory.java | 2 +-
.../impl/QueueingDistributionPackageProcessor.java | 2 +-
.../impl/ReverseDistributionAgentFactory.java | 4 ++--
.../agent/impl/SimpleDistributionAgent.java | 6 +++---
.../agent/impl/SimpleDistributionAgentFactory.java | 4 ++--
.../SimpleDistributionAgentQueueProcessor.java | 4 ++--
.../agent/impl/SyncDistributionAgentFactory.java | 4 ++--
.../impl/DefaultDistributionComponentProvider.java | 4 ++--
.../component/impl/DistributionComponentKind.java | 4 ++--
.../DistributionPackageBuilderProvider.java | 3 ++-
.../{ => impl}/DistributionPackageExporter.java | 7 ++++---
.../{ => impl}/DistributionPackageImporter.java | 4 +++-
.../{ => impl}/DistributionPackageProcessor.java | 3 ++-
.../exporter/AgentDistributionPackageExporter.java | 6 +++---
.../AgentDistributionPackageExporterFactory.java | 6 +++---
.../exporter/LocalDistributionPackageExporter.java | 6 +++---
.../LocalDistributionPackageExporterFactory.java | 4 ++--
.../RemoteDistributionPackageExporter.java | 6 +++---
.../RemoteDistributionPackageExporterFactory.java | 4 ++--
.../importer/LocalDistributionPackageImporter.java | 4 ++--
.../LocalDistributionPackageImporterFactory.java | 2 +-
.../RemoteDistributionPackageImporter.java | 4 ++--
.../RemoteDistributionPackageImporterFactory.java | 2 +-
.../RepositoryDistributionPackageImporter.java | 4 ++--
...positoryDistributionPackageImporterFactory.java | 2 +-
...tionPackageProcessor.java => package-info.java} | 22 ++--------------------
.../DefaultDistributionPackageBuilderProvider.java | 2 +-
.../servlet/DistributionAgentQueueServlet.java | 2 +-
.../DistributionPackageExporterServlet.java | 4 ++--
.../DistributionPackageImporterServlet.java | 2 +-
.../ImportingDistributionPackageProcessorTest.java | 2 +-
.../SimpleDistributionAgentQueueProcessorTest.java | 4 ++--
.../agent/impl/SimpleDistributionAgentTest.java | 6 +++---
.../AgentDistributionPackageExporterTest.java | 4 ++--
.../LocalDistributionPackageExporterTest.java | 2 +-
.../RemoteDistributionPackageExporterTest.java | 2 +-
39 files changed, 76 insertions(+), 88 deletions(-)
diff --git a/pom.xml b/pom.xml
index d51a4d8..123393b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -76,7 +76,8 @@
org.apache.sling.distribution.queue,
org.apache.sling.distribution.log.spi,
org.apache.sling.distribution.agent,
- org.apache.sling.distribution.agent.spi
+ org.apache.sling.distribution.agent.spi,
+ org.apache.sling.distribution.packaging
</Export-Package>
<Import-Package>
org.apache.http.nio.*;resolution:=optional,
diff --git a/src/main/java/org/apache/sling/distribution/agent/impl/ForwardDistributionAgentFactory.java b/src/main/java/org/apache/sling/distribution/agent/impl/ForwardDistributionAgentFactory.java
index 16a58fa..757fb83 100644
--- a/src/main/java/org/apache/sling/distribution/agent/impl/ForwardDistributionAgentFactory.java
+++ b/src/main/java/org/apache/sling/distribution/agent/impl/ForwardDistributionAgentFactory.java
@@ -49,8 +49,8 @@ import org.apache.sling.distribution.monitor.impl.ForwardDistributionAgentMBean;
import org.apache.sling.distribution.monitor.impl.ForwardDistributionAgentMBeanImpl;
import org.apache.sling.distribution.monitor.impl.MonitoringDistributionQueueProvider;
import org.apache.sling.distribution.packaging.DistributionPackageBuilder;
-import org.apache.sling.distribution.packaging.DistributionPackageExporter;
-import org.apache.sling.distribution.packaging.DistributionPackageImporter;
+import org.apache.sling.distribution.packaging.impl.DistributionPackageExporter;
+import org.apache.sling.distribution.packaging.impl.DistributionPackageImporter;
import org.apache.sling.distribution.packaging.impl.exporter.LocalDistributionPackageExporter;
import org.apache.sling.distribution.packaging.impl.importer.RemoteDistributionPackageImporter;
import org.apache.sling.distribution.queue.impl.DistributionQueueProvider;
diff --git a/src/main/java/org/apache/sling/distribution/agent/impl/ImportingDistributionPackageProcessor.java b/src/main/java/org/apache/sling/distribution/agent/impl/ImportingDistributionPackageProcessor.java
index 938e390..f404fe9 100644
--- a/src/main/java/org/apache/sling/distribution/agent/impl/ImportingDistributionPackageProcessor.java
+++ b/src/main/java/org/apache/sling/distribution/agent/impl/ImportingDistributionPackageProcessor.java
@@ -25,8 +25,8 @@ import org.apache.sling.distribution.common.DistributionException;
import org.apache.sling.distribution.impl.SimpleDistributionResponse;
import org.apache.sling.distribution.log.impl.DefaultDistributionLog;
import org.apache.sling.distribution.packaging.DistributionPackage;
-import org.apache.sling.distribution.packaging.DistributionPackageImporter;
-import org.apache.sling.distribution.packaging.DistributionPackageProcessor;
+import org.apache.sling.distribution.packaging.impl.DistributionPackageImporter;
+import org.apache.sling.distribution.packaging.impl.DistributionPackageProcessor;
import org.apache.sling.distribution.util.impl.DistributionUtils;
import java.util.LinkedList;
diff --git a/src/main/java/org/apache/sling/distribution/agent/impl/QueueDistributionAgentFactory.java b/src/main/java/org/apache/sling/distribution/agent/impl/QueueDistributionAgentFactory.java
index fa92378..7f3c507 100644
--- a/src/main/java/org/apache/sling/distribution/agent/impl/QueueDistributionAgentFactory.java
+++ b/src/main/java/org/apache/sling/distribution/agent/impl/QueueDistributionAgentFactory.java
@@ -42,7 +42,7 @@ import org.apache.sling.distribution.monitor.impl.MonitoringDistributionQueuePro
import org.apache.sling.distribution.monitor.impl.QueueDistributionAgentMBean;
import org.apache.sling.distribution.monitor.impl.QueueDistributionAgentMBeanImpl;
import org.apache.sling.distribution.packaging.DistributionPackageBuilder;
-import org.apache.sling.distribution.packaging.DistributionPackageExporter;
+import org.apache.sling.distribution.packaging.impl.DistributionPackageExporter;
import org.apache.sling.distribution.packaging.impl.exporter.LocalDistributionPackageExporter;
import org.apache.sling.distribution.queue.impl.DistributionQueueProvider;
import org.apache.sling.distribution.queue.impl.DistributionQueueDispatchingStrategy;
diff --git a/src/main/java/org/apache/sling/distribution/agent/impl/QueueingDistributionPackageProcessor.java b/src/main/java/org/apache/sling/distribution/agent/impl/QueueingDistributionPackageProcessor.java
index 5dd347f..68353f3 100644
--- a/src/main/java/org/apache/sling/distribution/agent/impl/QueueingDistributionPackageProcessor.java
+++ b/src/main/java/org/apache/sling/distribution/agent/impl/QueueingDistributionPackageProcessor.java
@@ -35,7 +35,7 @@ import org.apache.sling.distribution.event.impl.DistributionEventFactory;
import org.apache.sling.distribution.impl.SimpleDistributionResponse;
import org.apache.sling.distribution.log.impl.DefaultDistributionLog;
import org.apache.sling.distribution.packaging.DistributionPackage;
-import org.apache.sling.distribution.packaging.DistributionPackageProcessor;
+import org.apache.sling.distribution.packaging.impl.DistributionPackageProcessor;
import org.apache.sling.distribution.packaging.impl.DistributionPackageUtils;
import org.apache.sling.distribution.queue.DistributionQueueItemState;
import org.apache.sling.distribution.queue.DistributionQueueItemStatus;
diff --git a/src/main/java/org/apache/sling/distribution/agent/impl/ReverseDistributionAgentFactory.java b/src/main/java/org/apache/sling/distribution/agent/impl/ReverseDistributionAgentFactory.java
index 7e9189b..31f2ad2 100644
--- a/src/main/java/org/apache/sling/distribution/agent/impl/ReverseDistributionAgentFactory.java
+++ b/src/main/java/org/apache/sling/distribution/agent/impl/ReverseDistributionAgentFactory.java
@@ -44,8 +44,8 @@ import org.apache.sling.distribution.monitor.impl.MonitoringDistributionQueuePro
import org.apache.sling.distribution.monitor.impl.ReverseDistributionAgentMBean;
import org.apache.sling.distribution.monitor.impl.ReverseDistributionAgentMBeanImpl;
import org.apache.sling.distribution.packaging.DistributionPackageBuilder;
-import org.apache.sling.distribution.packaging.DistributionPackageExporter;
-import org.apache.sling.distribution.packaging.DistributionPackageImporter;
+import org.apache.sling.distribution.packaging.impl.DistributionPackageExporter;
+import org.apache.sling.distribution.packaging.impl.DistributionPackageImporter;
import org.apache.sling.distribution.packaging.impl.exporter.RemoteDistributionPackageExporter;
import org.apache.sling.distribution.packaging.impl.importer.LocalDistributionPackageImporter;
import org.apache.sling.distribution.queue.impl.DistributionQueueProvider;
diff --git a/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgent.java b/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgent.java
index e9bed63..257286f 100644
--- a/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgent.java
+++ b/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgent.java
@@ -36,9 +36,9 @@ import org.apache.sling.distribution.impl.SimpleDistributionResponse;
import org.apache.sling.distribution.log.spi.DistributionLog;
import org.apache.sling.distribution.log.impl.DefaultDistributionLog;
import org.apache.sling.distribution.packaging.DistributionPackage;
-import org.apache.sling.distribution.packaging.DistributionPackageExporter;
-import org.apache.sling.distribution.packaging.DistributionPackageImporter;
-import org.apache.sling.distribution.packaging.DistributionPackageProcessor;
+import org.apache.sling.distribution.packaging.impl.DistributionPackageExporter;
+import org.apache.sling.distribution.packaging.impl.DistributionPackageImporter;
+import org.apache.sling.distribution.packaging.impl.DistributionPackageProcessor;
import org.apache.sling.distribution.queue.spi.DistributionQueue;
import org.apache.sling.distribution.queue.impl.DistributionQueueProcessor;
import org.apache.sling.distribution.queue.impl.DistributionQueueProvider;
diff --git a/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgentFactory.java b/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgentFactory.java
index 2186610..b58f0b7 100644
--- a/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgentFactory.java
+++ b/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgentFactory.java
@@ -40,8 +40,8 @@ import org.apache.sling.distribution.event.impl.DistributionEventFactory;
import org.apache.sling.distribution.log.impl.DefaultDistributionLog;
import org.apache.sling.distribution.monitor.impl.SimpleDistributionAgentMBean;
import org.apache.sling.distribution.monitor.impl.SimpleDistributionAgentMBeanImpl;
-import org.apache.sling.distribution.packaging.DistributionPackageExporter;
-import org.apache.sling.distribution.packaging.DistributionPackageImporter;
+import org.apache.sling.distribution.packaging.impl.DistributionPackageExporter;
+import org.apache.sling.distribution.packaging.impl.DistributionPackageImporter;
import org.apache.sling.distribution.queue.impl.DistributionQueueProvider;
import org.apache.sling.distribution.queue.impl.DistributionQueueDispatchingStrategy;
import org.apache.sling.distribution.queue.impl.SingleQueueDispatchingStrategy;
diff --git a/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgentQueueProcessor.java b/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgentQueueProcessor.java
index 95dc2e1..0d96219 100644
--- a/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgentQueueProcessor.java
+++ b/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgentQueueProcessor.java
@@ -29,8 +29,8 @@ import org.apache.sling.distribution.event.DistributionEventTopics;
import org.apache.sling.distribution.event.impl.DistributionEventFactory;
import org.apache.sling.distribution.log.impl.DefaultDistributionLog;
import org.apache.sling.distribution.packaging.DistributionPackage;
-import org.apache.sling.distribution.packaging.DistributionPackageExporter;
-import org.apache.sling.distribution.packaging.DistributionPackageImporter;
+import org.apache.sling.distribution.packaging.impl.DistributionPackageExporter;
+import org.apache.sling.distribution.packaging.impl.DistributionPackageImporter;
import org.apache.sling.distribution.packaging.impl.DistributionPackageUtils;
import org.apache.sling.distribution.queue.DistributionQueueEntry;
import org.apache.sling.distribution.queue.DistributionQueueItem;
diff --git a/src/main/java/org/apache/sling/distribution/agent/impl/SyncDistributionAgentFactory.java b/src/main/java/org/apache/sling/distribution/agent/impl/SyncDistributionAgentFactory.java
index b8cb5e0..337b653 100644
--- a/src/main/java/org/apache/sling/distribution/agent/impl/SyncDistributionAgentFactory.java
+++ b/src/main/java/org/apache/sling/distribution/agent/impl/SyncDistributionAgentFactory.java
@@ -32,8 +32,8 @@ import org.apache.sling.distribution.monitor.impl.MonitoringDistributionQueuePro
import org.apache.sling.distribution.monitor.impl.SyncDistributionAgentMBean;
import org.apache.sling.distribution.monitor.impl.SyncDistributionAgentMBeanImpl;
import org.apache.sling.distribution.packaging.DistributionPackageBuilder;
-import org.apache.sling.distribution.packaging.DistributionPackageExporter;
-import org.apache.sling.distribution.packaging.DistributionPackageImporter;
+import org.apache.sling.distribution.packaging.impl.DistributionPackageExporter;
+import org.apache.sling.distribution.packaging.impl.DistributionPackageImporter;
import org.apache.sling.distribution.packaging.impl.exporter.RemoteDistributionPackageExporter;
import org.apache.sling.distribution.packaging.impl.importer.RemoteDistributionPackageImporter;
import org.apache.sling.distribution.queue.impl.DistributionQueueProvider;
diff --git a/src/main/java/org/apache/sling/distribution/component/impl/DefaultDistributionComponentProvider.java b/src/main/java/org/apache/sling/distribution/component/impl/DefaultDistributionComponentProvider.java
index 1ba3743..05e92f0 100644
--- a/src/main/java/org/apache/sling/distribution/component/impl/DefaultDistributionComponentProvider.java
+++ b/src/main/java/org/apache/sling/distribution/component/impl/DefaultDistributionComponentProvider.java
@@ -34,8 +34,8 @@ import org.apache.sling.commons.osgi.PropertiesUtil;
import org.apache.sling.distribution.agent.spi.DistributionAgent;
import org.apache.sling.distribution.agent.impl.DistributionRequestAuthorizationStrategy;
import org.apache.sling.distribution.packaging.DistributionPackageBuilder;
-import org.apache.sling.distribution.packaging.DistributionPackageExporter;
-import org.apache.sling.distribution.packaging.DistributionPackageImporter;
+import org.apache.sling.distribution.packaging.impl.DistributionPackageExporter;
+import org.apache.sling.distribution.packaging.impl.DistributionPackageImporter;
import org.apache.sling.distribution.queue.impl.DistributionQueueProvider;
import org.apache.sling.distribution.queue.impl.DistributionQueueDispatchingStrategy;
import org.apache.sling.distribution.transport.DistributionTransportSecretProvider;
diff --git a/src/main/java/org/apache/sling/distribution/component/impl/DistributionComponentKind.java b/src/main/java/org/apache/sling/distribution/component/impl/DistributionComponentKind.java
index f5316f8..8f69b08 100644
--- a/src/main/java/org/apache/sling/distribution/component/impl/DistributionComponentKind.java
+++ b/src/main/java/org/apache/sling/distribution/component/impl/DistributionComponentKind.java
@@ -43,8 +43,8 @@ import org.apache.sling.distribution.agent.impl.ReverseDistributionAgentFactory;
import org.apache.sling.distribution.agent.impl.SimpleDistributionAgentFactory;
import org.apache.sling.distribution.agent.impl.SyncDistributionAgentFactory;
import org.apache.sling.distribution.packaging.DistributionPackageBuilder;
-import org.apache.sling.distribution.packaging.DistributionPackageExporter;
-import org.apache.sling.distribution.packaging.DistributionPackageImporter;
+import org.apache.sling.distribution.packaging.impl.DistributionPackageExporter;
+import org.apache.sling.distribution.packaging.impl.DistributionPackageImporter;
import org.apache.sling.distribution.packaging.impl.exporter.AgentDistributionPackageExporterFactory;
import org.apache.sling.distribution.packaging.impl.exporter.LocalDistributionPackageExporterFactory;
import org.apache.sling.distribution.packaging.impl.exporter.RemoteDistributionPackageExporterFactory;
diff --git a/src/main/java/org/apache/sling/distribution/packaging/DistributionPackageBuilderProvider.java b/src/main/java/org/apache/sling/distribution/packaging/impl/DistributionPackageBuilderProvider.java
similarity index 91%
rename from src/main/java/org/apache/sling/distribution/packaging/DistributionPackageBuilderProvider.java
rename to src/main/java/org/apache/sling/distribution/packaging/impl/DistributionPackageBuilderProvider.java
index 56e5389..6744392 100644
--- a/src/main/java/org/apache/sling/distribution/packaging/DistributionPackageBuilderProvider.java
+++ b/src/main/java/org/apache/sling/distribution/packaging/impl/DistributionPackageBuilderProvider.java
@@ -16,11 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.distribution.packaging;
+package org.apache.sling.distribution.packaging.impl;
import javax.annotation.CheckForNull;
import aQute.bnd.annotation.ProviderType;
+import org.apache.sling.distribution.packaging.DistributionPackageBuilder;
/**
* A helper interface to allow finding registered {@link DistributionPackageBuilder}s
diff --git a/src/main/java/org/apache/sling/distribution/packaging/DistributionPackageExporter.java b/src/main/java/org/apache/sling/distribution/packaging/impl/DistributionPackageExporter.java
similarity index 94%
rename from src/main/java/org/apache/sling/distribution/packaging/DistributionPackageExporter.java
rename to src/main/java/org/apache/sling/distribution/packaging/impl/DistributionPackageExporter.java
index 38cbc70..74efdd9 100644
--- a/src/main/java/org/apache/sling/distribution/packaging/DistributionPackageExporter.java
+++ b/src/main/java/org/apache/sling/distribution/packaging/impl/DistributionPackageExporter.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.distribution.packaging;
+package org.apache.sling.distribution.packaging.impl;
import javax.annotation.CheckForNull;
import javax.annotation.Nonnull;
@@ -25,12 +25,13 @@ import aQute.bnd.annotation.ConsumerType;
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.distribution.DistributionRequest;
import org.apache.sling.distribution.common.DistributionException;
+import org.apache.sling.distribution.packaging.DistributionPackage;
import org.apache.sling.distribution.queue.spi.DistributionQueue;
/**
- * A {@link DistributionPackageExporter) is responsible of exporting {@link DistributionPackage}s from a local or remote
+ * A {@link DistributionPackageExporter) is responsible of exporting {@link DistributionPackage }s from a local or remote
* Sling instance.
- * Such packages are usually imported by a {@link DistributionPackageImporter} or put inside
+ * Such packages are usually imported by a {@link DistributionPackageImporter } or put inside
* {@link DistributionQueue }s for others to consume them.
* Exporting a {@link DistributionPackage} means obtaining that package by e.g. directly creating it by bundling local
* Sling resources, retrieving it from a remote endpoint (by executing an HTTP POST request on another Sling
diff --git a/src/main/java/org/apache/sling/distribution/packaging/DistributionPackageImporter.java b/src/main/java/org/apache/sling/distribution/packaging/impl/DistributionPackageImporter.java
similarity index 92%
rename from src/main/java/org/apache/sling/distribution/packaging/DistributionPackageImporter.java
rename to src/main/java/org/apache/sling/distribution/packaging/impl/DistributionPackageImporter.java
index a558a1f..c7c65b7 100644
--- a/src/main/java/org/apache/sling/distribution/packaging/DistributionPackageImporter.java
+++ b/src/main/java/org/apache/sling/distribution/packaging/impl/DistributionPackageImporter.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.distribution.packaging;
+package org.apache.sling.distribution.packaging.impl;
import javax.annotation.Nonnull;
import java.io.InputStream;
@@ -24,6 +24,8 @@ import java.io.InputStream;
import aQute.bnd.annotation.ConsumerType;
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.distribution.common.DistributionException;
+import org.apache.sling.distribution.packaging.DistributionPackage;
+import org.apache.sling.distribution.packaging.DistributionPackageInfo;
/**
* A {@link DistributionPackageImporter} is responsible for importing {@link DistributionPackage}s into either a local
diff --git a/src/main/java/org/apache/sling/distribution/packaging/DistributionPackageProcessor.java b/src/main/java/org/apache/sling/distribution/packaging/impl/DistributionPackageProcessor.java
similarity index 91%
copy from src/main/java/org/apache/sling/distribution/packaging/DistributionPackageProcessor.java
copy to src/main/java/org/apache/sling/distribution/packaging/impl/DistributionPackageProcessor.java
index 0fd260a..ea66a00 100644
--- a/src/main/java/org/apache/sling/distribution/packaging/DistributionPackageProcessor.java
+++ b/src/main/java/org/apache/sling/distribution/packaging/impl/DistributionPackageProcessor.java
@@ -17,9 +17,10 @@
* under the License.
*/
-package org.apache.sling.distribution.packaging;
+package org.apache.sling.distribution.packaging.impl;
import org.apache.sling.distribution.DistributionResponse;
+import org.apache.sling.distribution.packaging.DistributionPackage;
import java.util.List;
diff --git a/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/AgentDistributionPackageExporter.java b/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/AgentDistributionPackageExporter.java
index cf2f7b1..63744a0 100644
--- a/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/AgentDistributionPackageExporter.java
+++ b/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/AgentDistributionPackageExporter.java
@@ -27,16 +27,16 @@ import org.apache.sling.distribution.agent.spi.DistributionAgent;
import org.apache.sling.distribution.common.DistributionException;
import org.apache.sling.distribution.log.spi.DistributionLog;
import org.apache.sling.distribution.log.impl.DefaultDistributionLog;
-import org.apache.sling.distribution.packaging.DistributionPackageProcessor;
+import org.apache.sling.distribution.packaging.impl.DistributionPackageProcessor;
import org.apache.sling.distribution.packaging.DistributionPackage;
-import org.apache.sling.distribution.packaging.DistributionPackageExporter;
+import org.apache.sling.distribution.packaging.impl.DistributionPackageExporter;
import org.apache.sling.distribution.packaging.DistributionPackageInfo;
import org.apache.sling.distribution.packaging.impl.DistributionPackageUtils;
import org.apache.sling.distribution.queue.spi.DistributionQueue;
import org.apache.sling.distribution.queue.DistributionQueueEntry;
import org.apache.sling.distribution.queue.DistributionQueueItem;
import org.apache.sling.distribution.packaging.DistributionPackageBuilder;
-import org.apache.sling.distribution.packaging.DistributionPackageBuilderProvider;
+import org.apache.sling.distribution.packaging.impl.DistributionPackageBuilderProvider;
import org.apache.sling.distribution.packaging.impl.DistributionPackageWrapper;
import org.apache.sling.distribution.packaging.impl.SimpleDistributionPackage;
import org.slf4j.Logger;
diff --git a/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/AgentDistributionPackageExporterFactory.java b/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/AgentDistributionPackageExporterFactory.java
index 3837b7a..1d6fd01 100644
--- a/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/AgentDistributionPackageExporterFactory.java
+++ b/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/AgentDistributionPackageExporterFactory.java
@@ -35,9 +35,9 @@ import org.apache.sling.distribution.agent.spi.DistributionAgent;
import org.apache.sling.distribution.common.DistributionException;
import org.apache.sling.distribution.component.impl.DistributionComponentConstants;
import org.apache.sling.distribution.packaging.DistributionPackage;
-import org.apache.sling.distribution.packaging.DistributionPackageBuilderProvider;
-import org.apache.sling.distribution.packaging.DistributionPackageExporter;
-import org.apache.sling.distribution.packaging.DistributionPackageProcessor;
+import org.apache.sling.distribution.packaging.impl.DistributionPackageBuilderProvider;
+import org.apache.sling.distribution.packaging.impl.DistributionPackageExporter;
+import org.apache.sling.distribution.packaging.impl.DistributionPackageProcessor;
import org.apache.sling.distribution.queue.impl.DistributionQueueDispatchingStrategy;
/**
diff --git a/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/LocalDistributionPackageExporter.java b/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/LocalDistributionPackageExporter.java
index 1827975..03a6243 100644
--- a/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/LocalDistributionPackageExporter.java
+++ b/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/LocalDistributionPackageExporter.java
@@ -23,14 +23,14 @@ import javax.annotation.Nonnull;
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.distribution.DistributionRequest;
import org.apache.sling.distribution.common.DistributionException;
-import org.apache.sling.distribution.packaging.DistributionPackageProcessor;
+import org.apache.sling.distribution.packaging.impl.DistributionPackageProcessor;
import org.apache.sling.distribution.packaging.impl.DistributionPackageUtils;
import org.apache.sling.distribution.packaging.DistributionPackage;
-import org.apache.sling.distribution.packaging.DistributionPackageExporter;
+import org.apache.sling.distribution.packaging.impl.DistributionPackageExporter;
import org.apache.sling.distribution.packaging.DistributionPackageBuilder;
/**
- * {@link org.apache.sling.distribution.packaging.DistributionPackageExporter} implementation which creates a
+ * {@link DistributionPackageExporter} implementation which creates a
* {@link DistributionPackage} locally.
*/
public class LocalDistributionPackageExporter implements DistributionPackageExporter {
diff --git a/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/LocalDistributionPackageExporterFactory.java b/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/LocalDistributionPackageExporterFactory.java
index 5e57428..6b16f84 100644
--- a/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/LocalDistributionPackageExporterFactory.java
+++ b/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/LocalDistributionPackageExporterFactory.java
@@ -34,8 +34,8 @@ import org.apache.sling.distribution.common.DistributionException;
import org.apache.sling.distribution.component.impl.DistributionComponentConstants;
import org.apache.sling.distribution.packaging.DistributionPackage;
import org.apache.sling.distribution.packaging.DistributionPackageBuilder;
-import org.apache.sling.distribution.packaging.DistributionPackageExporter;
-import org.apache.sling.distribution.packaging.DistributionPackageProcessor;
+import org.apache.sling.distribution.packaging.impl.DistributionPackageExporter;
+import org.apache.sling.distribution.packaging.impl.DistributionPackageProcessor;
/**
* OSGi configuration factory for {@link LocalDistributionPackageExporter}s.
diff --git a/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/RemoteDistributionPackageExporter.java b/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/RemoteDistributionPackageExporter.java
index c2de641..2eea5fd 100644
--- a/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/RemoteDistributionPackageExporter.java
+++ b/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/RemoteDistributionPackageExporter.java
@@ -27,16 +27,16 @@ import org.apache.sling.distribution.DistributionRequest;
import org.apache.sling.distribution.DistributionRequestType;
import org.apache.sling.distribution.common.DistributionException;
import org.apache.sling.distribution.log.impl.DefaultDistributionLog;
-import org.apache.sling.distribution.packaging.DistributionPackageProcessor;
+import org.apache.sling.distribution.packaging.impl.DistributionPackageProcessor;
import org.apache.sling.distribution.packaging.impl.DistributionPackageUtils;
import org.apache.sling.distribution.packaging.DistributionPackage;
-import org.apache.sling.distribution.packaging.DistributionPackageExporter;
+import org.apache.sling.distribution.packaging.impl.DistributionPackageExporter;
import org.apache.sling.distribution.packaging.DistributionPackageBuilder;
import org.apache.sling.distribution.transport.DistributionTransportSecretProvider;
import org.apache.sling.distribution.transport.impl.*;
/**
- * Remote implementation of {@link org.apache.sling.distribution.packaging.DistributionPackageExporter}
+ * Remote implementation of {@link DistributionPackageExporter}
*/
public class RemoteDistributionPackageExporter implements DistributionPackageExporter {
diff --git a/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/RemoteDistributionPackageExporterFactory.java b/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/RemoteDistributionPackageExporterFactory.java
index 89578eb..dd78351 100644
--- a/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/RemoteDistributionPackageExporterFactory.java
+++ b/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/RemoteDistributionPackageExporterFactory.java
@@ -36,8 +36,8 @@ import org.apache.sling.distribution.component.impl.DistributionComponentConstan
import org.apache.sling.distribution.component.impl.DistributionComponentKind;
import org.apache.sling.distribution.component.impl.SettingsUtils;
import org.apache.sling.distribution.log.impl.DefaultDistributionLog;
-import org.apache.sling.distribution.packaging.DistributionPackageExporter;
-import org.apache.sling.distribution.packaging.DistributionPackageProcessor;
+import org.apache.sling.distribution.packaging.impl.DistributionPackageExporter;
+import org.apache.sling.distribution.packaging.impl.DistributionPackageProcessor;
import org.apache.sling.distribution.packaging.DistributionPackage;
import org.apache.sling.distribution.packaging.DistributionPackageBuilder;
import org.apache.sling.distribution.transport.DistributionTransportSecretProvider;
diff --git a/src/main/java/org/apache/sling/distribution/packaging/impl/importer/LocalDistributionPackageImporter.java b/src/main/java/org/apache/sling/distribution/packaging/impl/importer/LocalDistributionPackageImporter.java
index 1bdddae..9ac3c48 100644
--- a/src/main/java/org/apache/sling/distribution/packaging/impl/importer/LocalDistributionPackageImporter.java
+++ b/src/main/java/org/apache/sling/distribution/packaging/impl/importer/LocalDistributionPackageImporter.java
@@ -32,7 +32,7 @@ import org.apache.sling.distribution.event.DistributionEventTopics;
import org.apache.sling.distribution.event.impl.DistributionEventFactory;
import org.apache.sling.distribution.packaging.DistributionPackage;
import org.apache.sling.distribution.packaging.DistributionPackageBuilder;
-import org.apache.sling.distribution.packaging.DistributionPackageImporter;
+import org.apache.sling.distribution.packaging.impl.DistributionPackageImporter;
import org.apache.sling.distribution.packaging.DistributionPackageInfo;
import org.apache.sling.distribution.packaging.impl.DistributionPackageUtils;
import org.apache.sling.distribution.packaging.impl.ReferencePackage;
@@ -40,7 +40,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * {@link org.apache.sling.distribution.packaging.DistributionPackageImporter} implementation which imports a
+ * {@link DistributionPackageImporter} implementation which imports a
* {@link DistributionPackage} locally.
*/
public class LocalDistributionPackageImporter implements DistributionPackageImporter {
diff --git a/src/main/java/org/apache/sling/distribution/packaging/impl/importer/LocalDistributionPackageImporterFactory.java b/src/main/java/org/apache/sling/distribution/packaging/impl/importer/LocalDistributionPackageImporterFactory.java
index f142225..fe23775 100644
--- a/src/main/java/org/apache/sling/distribution/packaging/impl/importer/LocalDistributionPackageImporterFactory.java
+++ b/src/main/java/org/apache/sling/distribution/packaging/impl/importer/LocalDistributionPackageImporterFactory.java
@@ -35,7 +35,7 @@ import org.apache.sling.distribution.component.impl.SettingsUtils;
import org.apache.sling.distribution.event.impl.DistributionEventFactory;
import org.apache.sling.distribution.common.DistributionException;
import org.apache.sling.distribution.packaging.DistributionPackage;
-import org.apache.sling.distribution.packaging.DistributionPackageImporter;
+import org.apache.sling.distribution.packaging.impl.DistributionPackageImporter;
import org.apache.sling.distribution.packaging.DistributionPackageInfo;
import org.apache.sling.distribution.packaging.DistributionPackageBuilder;
diff --git a/src/main/java/org/apache/sling/distribution/packaging/impl/importer/RemoteDistributionPackageImporter.java b/src/main/java/org/apache/sling/distribution/packaging/impl/importer/RemoteDistributionPackageImporter.java
index 652e121..6fed1eb 100644
--- a/src/main/java/org/apache/sling/distribution/packaging/impl/importer/RemoteDistributionPackageImporter.java
+++ b/src/main/java/org/apache/sling/distribution/packaging/impl/importer/RemoteDistributionPackageImporter.java
@@ -28,13 +28,13 @@ import org.apache.sling.distribution.common.DistributionException;
import org.apache.sling.distribution.log.impl.DefaultDistributionLog;
import org.apache.sling.distribution.packaging.impl.DistributionPackageUtils;
import org.apache.sling.distribution.packaging.DistributionPackage;
-import org.apache.sling.distribution.packaging.DistributionPackageImporter;
+import org.apache.sling.distribution.packaging.impl.DistributionPackageImporter;
import org.apache.sling.distribution.packaging.DistributionPackageInfo;
import org.apache.sling.distribution.transport.DistributionTransportSecretProvider;
import org.apache.sling.distribution.transport.impl.*;
/**
- * Remote implementation of {@link org.apache.sling.distribution.packaging.DistributionPackageImporter}
+ * Remote implementation of {@link DistributionPackageImporter}
*/
public class RemoteDistributionPackageImporter implements DistributionPackageImporter {
diff --git a/src/main/java/org/apache/sling/distribution/packaging/impl/importer/RemoteDistributionPackageImporterFactory.java b/src/main/java/org/apache/sling/distribution/packaging/impl/importer/RemoteDistributionPackageImporterFactory.java
index 486b550..822fb44 100644
--- a/src/main/java/org/apache/sling/distribution/packaging/impl/importer/RemoteDistributionPackageImporterFactory.java
+++ b/src/main/java/org/apache/sling/distribution/packaging/impl/importer/RemoteDistributionPackageImporterFactory.java
@@ -37,7 +37,7 @@ import org.apache.sling.distribution.component.impl.DistributionComponentKind;
import org.apache.sling.distribution.component.impl.SettingsUtils;
import org.apache.sling.distribution.log.impl.DefaultDistributionLog;
import org.apache.sling.distribution.packaging.DistributionPackage;
-import org.apache.sling.distribution.packaging.DistributionPackageImporter;
+import org.apache.sling.distribution.packaging.impl.DistributionPackageImporter;
import org.apache.sling.distribution.packaging.DistributionPackageInfo;
import org.apache.sling.distribution.transport.DistributionTransportSecretProvider;
import org.apache.sling.distribution.transport.impl.HttpConfiguration;
diff --git a/src/main/java/org/apache/sling/distribution/packaging/impl/importer/RepositoryDistributionPackageImporter.java b/src/main/java/org/apache/sling/distribution/packaging/impl/importer/RepositoryDistributionPackageImporter.java
index 710a3f2..246a6d6 100644
--- a/src/main/java/org/apache/sling/distribution/packaging/impl/importer/RepositoryDistributionPackageImporter.java
+++ b/src/main/java/org/apache/sling/distribution/packaging/impl/importer/RepositoryDistributionPackageImporter.java
@@ -32,14 +32,14 @@ import org.apache.jackrabbit.util.Text;
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.distribution.common.DistributionException;
import org.apache.sling.distribution.packaging.DistributionPackage;
-import org.apache.sling.distribution.packaging.DistributionPackageImporter;
+import org.apache.sling.distribution.packaging.impl.DistributionPackageImporter;
import org.apache.sling.distribution.packaging.DistributionPackageInfo;
import org.apache.sling.jcr.api.SlingRepository;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * {@link org.apache.sling.distribution.packaging.DistributionPackageImporter} importing
+ * {@link DistributionPackageImporter} importing
* {@link DistributionPackage} stream + type into an underlying JCR repository.
*/
public class RepositoryDistributionPackageImporter implements DistributionPackageImporter {
diff --git a/src/main/java/org/apache/sling/distribution/packaging/impl/importer/RepositoryDistributionPackageImporterFactory.java b/src/main/java/org/apache/sling/distribution/packaging/impl/importer/RepositoryDistributionPackageImporterFactory.java
index 3d9d83a..956b144 100644
--- a/src/main/java/org/apache/sling/distribution/packaging/impl/importer/RepositoryDistributionPackageImporterFactory.java
+++ b/src/main/java/org/apache/sling/distribution/packaging/impl/importer/RepositoryDistributionPackageImporterFactory.java
@@ -34,7 +34,7 @@ import org.apache.sling.commons.osgi.PropertiesUtil;
import org.apache.sling.distribution.common.DistributionException;
import org.apache.sling.distribution.component.impl.DistributionComponentConstants;
import org.apache.sling.distribution.packaging.DistributionPackage;
-import org.apache.sling.distribution.packaging.DistributionPackageImporter;
+import org.apache.sling.distribution.packaging.impl.DistributionPackageImporter;
import org.apache.sling.distribution.packaging.DistributionPackageInfo;
import org.apache.sling.jcr.api.SlingRepository;
diff --git a/src/main/java/org/apache/sling/distribution/packaging/DistributionPackageProcessor.java b/src/main/java/org/apache/sling/distribution/packaging/package-info.java
similarity index 64%
rename from src/main/java/org/apache/sling/distribution/packaging/DistributionPackageProcessor.java
rename to src/main/java/org/apache/sling/distribution/packaging/package-info.java
index 0fd260a..44371f0 100644
--- a/src/main/java/org/apache/sling/distribution/packaging/DistributionPackageProcessor.java
+++ b/src/main/java/org/apache/sling/distribution/packaging/package-info.java
@@ -17,26 +17,8 @@
* under the License.
*/
+@Version("0.0.0")
package org.apache.sling.distribution.packaging;
-import org.apache.sling.distribution.DistributionResponse;
+import aQute.bnd.annotation.Version;
-import java.util.List;
-
-/**
- * A callback function used to process packages
- */
-public interface DistributionPackageProcessor {
-
- /**
- * process a distribution package
- * @param distributionPackage the distribution package
- */
- void process(DistributionPackage distributionPackage);
-
- List<DistributionResponse> getAllResponses();
-
- int getPackagesCount();
-
- long getPackagesSize();
-}
diff --git a/src/main/java/org/apache/sling/distribution/serialization/impl/DefaultDistributionPackageBuilderProvider.java b/src/main/java/org/apache/sling/distribution/serialization/impl/DefaultDistributionPackageBuilderProvider.java
index 29f6b91..d1beb1f 100644
--- a/src/main/java/org/apache/sling/distribution/serialization/impl/DefaultDistributionPackageBuilderProvider.java
+++ b/src/main/java/org/apache/sling/distribution/serialization/impl/DefaultDistributionPackageBuilderProvider.java
@@ -27,7 +27,7 @@ import org.apache.sling.distribution.component.impl.DistributionComponent;
import org.apache.sling.distribution.component.impl.DistributionComponentKind;
import org.apache.sling.distribution.component.impl.DistributionComponentProvider;
import org.apache.sling.distribution.packaging.DistributionPackageBuilder;
-import org.apache.sling.distribution.packaging.DistributionPackageBuilderProvider;
+import org.apache.sling.distribution.packaging.impl.DistributionPackageBuilderProvider;
@Component
@Service(DistributionPackageBuilderProvider.class)
diff --git a/src/main/java/org/apache/sling/distribution/servlet/DistributionAgentQueueServlet.java b/src/main/java/org/apache/sling/distribution/servlet/DistributionAgentQueueServlet.java
index 31f61fa..d13e884 100644
--- a/src/main/java/org/apache/sling/distribution/servlet/DistributionAgentQueueServlet.java
+++ b/src/main/java/org/apache/sling/distribution/servlet/DistributionAgentQueueServlet.java
@@ -38,7 +38,7 @@ import org.apache.sling.distribution.queue.DistributionQueueEntry;
import org.apache.sling.distribution.queue.DistributionQueueItem;
import org.apache.sling.distribution.resources.DistributionResourceTypes;
import org.apache.sling.distribution.packaging.DistributionPackageBuilder;
-import org.apache.sling.distribution.packaging.DistributionPackageBuilderProvider;
+import org.apache.sling.distribution.packaging.impl.DistributionPackageBuilderProvider;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/src/main/java/org/apache/sling/distribution/servlet/DistributionPackageExporterServlet.java b/src/main/java/org/apache/sling/distribution/servlet/DistributionPackageExporterServlet.java
index fe3da3e..c7ba4de 100644
--- a/src/main/java/org/apache/sling/distribution/servlet/DistributionPackageExporterServlet.java
+++ b/src/main/java/org/apache/sling/distribution/servlet/DistributionPackageExporterServlet.java
@@ -34,10 +34,10 @@ import org.apache.sling.api.servlets.SlingAllMethodsServlet;
import org.apache.sling.distribution.DistributionRequest;
import org.apache.sling.distribution.DistributionResponse;
import org.apache.sling.distribution.common.DistributionException;
-import org.apache.sling.distribution.packaging.DistributionPackageProcessor;
+import org.apache.sling.distribution.packaging.impl.DistributionPackageProcessor;
import org.apache.sling.distribution.packaging.impl.DistributionPackageUtils;
import org.apache.sling.distribution.packaging.DistributionPackage;
-import org.apache.sling.distribution.packaging.DistributionPackageExporter;
+import org.apache.sling.distribution.packaging.impl.DistributionPackageExporter;
import org.apache.sling.distribution.resources.DistributionResourceTypes;
import org.apache.sling.distribution.util.RequestUtils;
import org.slf4j.Logger;
diff --git a/src/main/java/org/apache/sling/distribution/servlet/DistributionPackageImporterServlet.java b/src/main/java/org/apache/sling/distribution/servlet/DistributionPackageImporterServlet.java
index b817c45..8e880a5 100644
--- a/src/main/java/org/apache/sling/distribution/servlet/DistributionPackageImporterServlet.java
+++ b/src/main/java/org/apache/sling/distribution/servlet/DistributionPackageImporterServlet.java
@@ -37,7 +37,7 @@ import org.apache.sling.api.SlingHttpServletRequest;
import org.apache.sling.api.SlingHttpServletResponse;
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.api.servlets.SlingAllMethodsServlet;
-import org.apache.sling.distribution.packaging.DistributionPackageImporter;
+import org.apache.sling.distribution.packaging.impl.DistributionPackageImporter;
import org.apache.sling.distribution.packaging.DistributionPackageInfo;
import org.apache.sling.distribution.resources.DistributionResourceTypes;
import org.slf4j.Logger;
diff --git a/src/test/java/org/apache/sling/distribution/agent/impl/ImportingDistributionPackageProcessorTest.java b/src/test/java/org/apache/sling/distribution/agent/impl/ImportingDistributionPackageProcessorTest.java
index b4bc48a..94f2eea 100644
--- a/src/test/java/org/apache/sling/distribution/agent/impl/ImportingDistributionPackageProcessorTest.java
+++ b/src/test/java/org/apache/sling/distribution/agent/impl/ImportingDistributionPackageProcessorTest.java
@@ -22,7 +22,7 @@ import org.apache.sling.api.resource.ResourceResolverFactory;
import org.apache.sling.distribution.DistributionRequestType;
import org.apache.sling.distribution.log.impl.DefaultDistributionLog;
import org.apache.sling.distribution.packaging.DistributionPackage;
-import org.apache.sling.distribution.packaging.DistributionPackageImporter;
+import org.apache.sling.distribution.packaging.impl.DistributionPackageImporter;
import org.apache.sling.distribution.packaging.DistributionPackageInfo;
import org.apache.sling.jcr.api.SlingRepository;
import org.junit.Test;
diff --git a/src/test/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgentQueueProcessorTest.java b/src/test/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgentQueueProcessorTest.java
index a96601c..b5f2217 100644
--- a/src/test/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgentQueueProcessorTest.java
+++ b/src/test/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgentQueueProcessorTest.java
@@ -22,8 +22,8 @@ import java.util.HashMap;
import org.apache.sling.distribution.event.impl.DistributionEventFactory;
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.DistributionPackageExporter;
+import org.apache.sling.distribution.packaging.impl.DistributionPackageImporter;
import org.apache.sling.distribution.queue.DistributionQueueEntry;
import org.apache.sling.distribution.queue.DistributionQueueItem;
import org.apache.sling.distribution.queue.DistributionQueueItemState;
diff --git a/src/test/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgentTest.java b/src/test/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgentTest.java
index cfbf7e4..cb2b5e6 100644
--- a/src/test/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgentTest.java
+++ b/src/test/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgentTest.java
@@ -34,10 +34,10 @@ import org.apache.sling.distribution.SimpleDistributionRequest;
import org.apache.sling.distribution.common.DistributionException;
import org.apache.sling.distribution.event.impl.DistributionEventFactory;
import org.apache.sling.distribution.log.impl.DefaultDistributionLog;
-import org.apache.sling.distribution.packaging.DistributionPackageProcessor;
+import org.apache.sling.distribution.packaging.impl.DistributionPackageProcessor;
import org.apache.sling.distribution.packaging.DistributionPackage;
-import org.apache.sling.distribution.packaging.DistributionPackageExporter;
-import org.apache.sling.distribution.packaging.DistributionPackageImporter;
+import org.apache.sling.distribution.packaging.impl.DistributionPackageExporter;
+import org.apache.sling.distribution.packaging.impl.DistributionPackageImporter;
import org.apache.sling.distribution.packaging.DistributionPackageInfo;
import org.apache.sling.distribution.queue.spi.DistributionQueue;
import org.apache.sling.distribution.queue.DistributionQueueItemState;
diff --git a/src/test/java/org/apache/sling/distribution/packaging/impl/exporter/AgentDistributionPackageExporterTest.java b/src/test/java/org/apache/sling/distribution/packaging/impl/exporter/AgentDistributionPackageExporterTest.java
index 80582dd..ff811a8 100644
--- a/src/test/java/org/apache/sling/distribution/packaging/impl/exporter/AgentDistributionPackageExporterTest.java
+++ b/src/test/java/org/apache/sling/distribution/packaging/impl/exporter/AgentDistributionPackageExporterTest.java
@@ -25,9 +25,9 @@ import org.apache.sling.distribution.DistributionRequestType;
import org.apache.sling.distribution.DistributionResponse;
import org.apache.sling.distribution.SimpleDistributionRequest;
import org.apache.sling.distribution.agent.spi.DistributionAgent;
-import org.apache.sling.distribution.packaging.DistributionPackageProcessor;
+import org.apache.sling.distribution.packaging.impl.DistributionPackageProcessor;
import org.apache.sling.distribution.packaging.DistributionPackage;
-import org.apache.sling.distribution.packaging.DistributionPackageBuilderProvider;
+import org.apache.sling.distribution.packaging.impl.DistributionPackageBuilderProvider;
import org.junit.Test;
import java.util.ArrayList;
diff --git a/src/test/java/org/apache/sling/distribution/packaging/impl/exporter/LocalDistributionPackageExporterTest.java b/src/test/java/org/apache/sling/distribution/packaging/impl/exporter/LocalDistributionPackageExporterTest.java
index fd6b61a..c797de8 100644
--- a/src/test/java/org/apache/sling/distribution/packaging/impl/exporter/LocalDistributionPackageExporterTest.java
+++ b/src/test/java/org/apache/sling/distribution/packaging/impl/exporter/LocalDistributionPackageExporterTest.java
@@ -26,7 +26,7 @@ import org.apache.sling.distribution.DistributionRequest;
import org.apache.sling.distribution.DistributionRequestType;
import org.apache.sling.distribution.DistributionResponse;
import org.apache.sling.distribution.SimpleDistributionRequest;
-import org.apache.sling.distribution.packaging.DistributionPackageProcessor;
+import org.apache.sling.distribution.packaging.impl.DistributionPackageProcessor;
import org.apache.sling.distribution.packaging.DistributionPackage;
import org.apache.sling.distribution.packaging.DistributionPackageBuilder;
import org.junit.Test;
diff --git a/src/test/java/org/apache/sling/distribution/packaging/impl/exporter/RemoteDistributionPackageExporterTest.java b/src/test/java/org/apache/sling/distribution/packaging/impl/exporter/RemoteDistributionPackageExporterTest.java
index a69e4eb..e94271d 100644
--- a/src/test/java/org/apache/sling/distribution/packaging/impl/exporter/RemoteDistributionPackageExporterTest.java
+++ b/src/test/java/org/apache/sling/distribution/packaging/impl/exporter/RemoteDistributionPackageExporterTest.java
@@ -34,7 +34,7 @@ import org.apache.sling.distribution.SimpleDistributionRequest;
import org.apache.sling.distribution.log.impl.DefaultDistributionLog;
import org.apache.sling.distribution.packaging.DistributionPackage;
import org.apache.sling.distribution.packaging.DistributionPackageBuilder;
-import org.apache.sling.distribution.packaging.DistributionPackageProcessor;
+import org.apache.sling.distribution.packaging.impl.DistributionPackageProcessor;
import org.apache.sling.distribution.transport.DistributionTransportSecretProvider;
import org.apache.sling.distribution.transport.impl.HttpConfiguration;
import org.junit.Test;
--
To stop receiving notification emails like this one, please contact
tmaret@apache.org.
[sling-org-apache-sling-distribution-core] 02/03: SLING-7168 -
Allow to implement custom distribution queue
Posted by tm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tmaret pushed a commit to branch SLING-7168
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-distribution-core.git
commit effe26c9852add57c7ce7c2c3e592c4eefc19cd6
Author: tmaret <tm...@adobe.com>
AuthorDate: Fri Feb 2 11:30:35 2018 +0100
SLING-7168 - Allow to implement custom distribution queue
* Export the org.apache.sling.distribution.agent package
* Export the org.apache.sling.distribution.agent.spi package
* Expose DistributionAgent as a consumer type
---
pom.xml | 4 +++-
.../impl/AbstractDistributionAgentFactory.java | 2 +-
.../agent/impl/ForwardDistributionAgentFactory.java | 4 ++--
.../agent/impl/QueueDistributionAgentFactory.java | 4 ++--
.../agent/impl/ReverseDistributionAgentFactory.java | 4 ++--
.../agent/impl/SimpleDistributionAgent.java | 4 ++--
.../agent/impl/SimpleDistributionAgentFactory.java | 4 ++--
.../agent/impl/SyncDistributionAgentFactory.java | 4 ++--
.../agent/impl/TriggerAgentRequestHandler.java | 2 +-
.../package-info.java} | 21 +++------------------
.../agent/{ => spi}/DistributionAgent.java | 9 +++++----
.../spi/package-info.java} | 21 +++------------------
.../impl/DefaultDistributionComponentProvider.java | 2 +-
.../component/impl/DistributionComponentKind.java | 2 +-
.../sling/distribution/impl/DefaultDistributor.java | 2 +-
.../sling/distribution/log/spi/DistributionLog.java | 2 +-
.../monitor/DistributionQueueHealthCheck.java | 2 +-
.../impl/ForwardDistributionAgentMBeanImpl.java | 2 +-
.../impl/QueueDistributionAgentMBeanImpl.java | 2 +-
.../impl/ReverseDistributionAgentMBeanImpl.java | 2 +-
.../impl/SimpleDistributionAgentMBeanImpl.java | 2 +-
.../impl/SyncDistributionAgentMBeanImpl.java | 2 +-
.../exporter/AgentDistributionPackageExporter.java | 2 +-
.../AgentDistributionPackageExporterFactory.java | 2 +-
.../jobhandling/DistributionAgentJobConsumer.java | 3 ++-
.../distribution/queue/spi/DistributionQueue.java | 3 ++-
...ExtendedDistributionServiceResourceProvider.java | 2 +-
.../servlet/DistributionAgentCreationFilter.java | 2 +-
.../servlet/DistributionAgentLogServlet.java | 3 ++-
.../servlet/DistributionAgentQueueServlet.java | 2 +-
.../servlet/DistributionAgentServlet.java | 4 ++--
.../trigger/impl/ScheduledDistributionTrigger.java | 3 ++-
.../agent/impl/TriggerAgentRequestHandlerTest.java | 2 +-
.../monitor/DistributionQueueHealthCheckTest.java | 2 +-
.../impl/ForwardDistributionAgentMBeanTest.java | 2 +-
.../impl/QueueDistributionAgentMBeanTest.java | 2 +-
.../impl/ReverseDistributionAgentMBeanTest.java | 2 +-
.../impl/SimpleDistributionAgentMBeanTest.java | 2 +-
.../impl/SyncDistributionAgentMBeanTest.java | 2 +-
.../AgentDistributionPackageExporterTest.java | 2 +-
40 files changed, 61 insertions(+), 84 deletions(-)
diff --git a/pom.xml b/pom.xml
index 9a91e6e..d51a4d8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -74,7 +74,9 @@
org.apache.sling.distribution.serialization,
org.apache.sling.distribution.queue.spi,
org.apache.sling.distribution.queue,
- org.apache.sling.distribution.log.spi
+ org.apache.sling.distribution.log.spi,
+ org.apache.sling.distribution.agent,
+ org.apache.sling.distribution.agent.spi
</Export-Package>
<Import-Package>
org.apache.http.nio.*;resolution:=optional,
diff --git a/src/main/java/org/apache/sling/distribution/agent/impl/AbstractDistributionAgentFactory.java b/src/main/java/org/apache/sling/distribution/agent/impl/AbstractDistributionAgentFactory.java
index 4082f47..275c747 100644
--- a/src/main/java/org/apache/sling/distribution/agent/impl/AbstractDistributionAgentFactory.java
+++ b/src/main/java/org/apache/sling/distribution/agent/impl/AbstractDistributionAgentFactory.java
@@ -27,7 +27,7 @@ import java.util.concurrent.CopyOnWriteArrayList;
import javax.management.ObjectName;
import org.apache.sling.commons.osgi.PropertiesUtil;
-import org.apache.sling.distribution.agent.DistributionAgent;
+import org.apache.sling.distribution.agent.spi.DistributionAgent;
import org.apache.sling.distribution.component.impl.DistributionComponentConstants;
import org.apache.sling.distribution.component.impl.DistributionComponentKind;
import org.apache.sling.distribution.component.impl.SettingsUtils;
diff --git a/src/main/java/org/apache/sling/distribution/agent/impl/ForwardDistributionAgentFactory.java b/src/main/java/org/apache/sling/distribution/agent/impl/ForwardDistributionAgentFactory.java
index a5a5ff1..16a58fa 100644
--- a/src/main/java/org/apache/sling/distribution/agent/impl/ForwardDistributionAgentFactory.java
+++ b/src/main/java/org/apache/sling/distribution/agent/impl/ForwardDistributionAgentFactory.java
@@ -40,7 +40,7 @@ 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.agent.DistributionAgent;
+import org.apache.sling.distribution.agent.spi.DistributionAgent;
import org.apache.sling.distribution.component.impl.DistributionComponentConstants;
import org.apache.sling.distribution.component.impl.SettingsUtils;
import org.apache.sling.distribution.event.impl.DistributionEventFactory;
@@ -71,7 +71,7 @@ import org.osgi.framework.BundleContext;
import org.osgi.service.cm.ConfigurationAdmin;
/**
- * An OSGi service factory for {@link org.apache.sling.distribution.agent.DistributionAgent}s which references already existing OSGi services.
+ * An OSGi service factory for {@link DistributionAgent}s which references already existing OSGi services.
*/
@Component(metatype = true,
label = "Apache Sling Distribution Agent - Forward Agents Factory",
diff --git a/src/main/java/org/apache/sling/distribution/agent/impl/QueueDistributionAgentFactory.java b/src/main/java/org/apache/sling/distribution/agent/impl/QueueDistributionAgentFactory.java
index 3dff208..fa92378 100644
--- a/src/main/java/org/apache/sling/distribution/agent/impl/QueueDistributionAgentFactory.java
+++ b/src/main/java/org/apache/sling/distribution/agent/impl/QueueDistributionAgentFactory.java
@@ -33,7 +33,7 @@ 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.distribution.DistributionRequestType;
-import org.apache.sling.distribution.agent.DistributionAgent;
+import org.apache.sling.distribution.agent.spi.DistributionAgent;
import org.apache.sling.distribution.component.impl.DistributionComponentConstants;
import org.apache.sling.distribution.component.impl.SettingsUtils;
import org.apache.sling.distribution.event.impl.DistributionEventFactory;
@@ -59,7 +59,7 @@ import org.osgi.framework.BundleContext;
* An OSGi service factory for "queuing agents" that queue resources from the local instance (and can be eventually
* pulled from another remote "reverse agent").
*
- * @see {@link org.apache.sling.distribution.agent.DistributionAgent}
+ * @see {@link DistributionAgent}
*/
@Component(metatype = true,
label = "Apache Sling Distribution Agent - Queue Agents Factory",
diff --git a/src/main/java/org/apache/sling/distribution/agent/impl/ReverseDistributionAgentFactory.java b/src/main/java/org/apache/sling/distribution/agent/impl/ReverseDistributionAgentFactory.java
index f25d6a9..7e9189b 100644
--- a/src/main/java/org/apache/sling/distribution/agent/impl/ReverseDistributionAgentFactory.java
+++ b/src/main/java/org/apache/sling/distribution/agent/impl/ReverseDistributionAgentFactory.java
@@ -35,7 +35,7 @@ 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.distribution.DistributionRequestType;
-import org.apache.sling.distribution.agent.DistributionAgent;
+import org.apache.sling.distribution.agent.spi.DistributionAgent;
import org.apache.sling.distribution.component.impl.DistributionComponentConstants;
import org.apache.sling.distribution.component.impl.SettingsUtils;
import org.apache.sling.distribution.event.impl.DistributionEventFactory;
@@ -63,7 +63,7 @@ import org.osgi.framework.BundleContext;
/**
* An OSGi service factory for "reverse agents" that pull resources from remote instances (e.g. from "queueing agents").
*
- * @see {@link org.apache.sling.distribution.agent.DistributionAgent}
+ * @see {@link DistributionAgent}
*/
@Component(metatype = true,
label = "Apache Sling Distribution Agent - Reverse Agents Factory",
diff --git a/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgent.java b/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgent.java
index c50fdf2..e9bed63 100644
--- a/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgent.java
+++ b/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgent.java
@@ -24,7 +24,7 @@ import org.apache.sling.distribution.DistributionRequest;
import org.apache.sling.distribution.DistributionRequestState;
import org.apache.sling.distribution.DistributionRequestType;
import org.apache.sling.distribution.DistributionResponse;
-import org.apache.sling.distribution.agent.DistributionAgent;
+import org.apache.sling.distribution.agent.spi.DistributionAgent;
import org.apache.sling.distribution.agent.DistributionAgentState;
import org.apache.sling.distribution.common.DistributionException;
import org.apache.sling.distribution.component.impl.DistributionComponentKind;
@@ -57,7 +57,7 @@ import java.util.TreeSet;
import java.util.concurrent.atomic.AtomicInteger;
/**
- * Basic implementation of a {@link org.apache.sling.distribution.agent.DistributionAgent}
+ * Basic implementation of a {@link DistributionAgent}
*/
public class SimpleDistributionAgent implements DistributionAgent {
private final static String DEFAULT_AGENT_SERVICE = "defaultAgentService";
diff --git a/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgentFactory.java b/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgentFactory.java
index 27c236c..2186610 100644
--- a/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgentFactory.java
+++ b/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgentFactory.java
@@ -33,7 +33,7 @@ import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.ReferencePolicy;
import org.apache.sling.api.resource.ResourceResolverFactory;
import org.apache.sling.commons.osgi.PropertiesUtil;
-import org.apache.sling.distribution.agent.DistributionAgent;
+import org.apache.sling.distribution.agent.spi.DistributionAgent;
import org.apache.sling.distribution.component.impl.DistributionComponentConstants;
import org.apache.sling.distribution.component.impl.SettingsUtils;
import org.apache.sling.distribution.event.impl.DistributionEventFactory;
@@ -53,7 +53,7 @@ import org.apache.sling.settings.SlingSettingsService;
import org.osgi.framework.BundleContext;
/**
- * An OSGi service factory for {@link org.apache.sling.distribution.agent.DistributionAgent}s which references already existing OSGi services.
+ * An OSGi service factory for {@link DistributionAgent}s which references already existing OSGi services.
*/
@Component(metatype = true,
label = "Apache Sling Distribution Agent - Simple Agents Factory",
diff --git a/src/main/java/org/apache/sling/distribution/agent/impl/SyncDistributionAgentFactory.java b/src/main/java/org/apache/sling/distribution/agent/impl/SyncDistributionAgentFactory.java
index 0506ce0..b8cb5e0 100644
--- a/src/main/java/org/apache/sling/distribution/agent/impl/SyncDistributionAgentFactory.java
+++ b/src/main/java/org/apache/sling/distribution/agent/impl/SyncDistributionAgentFactory.java
@@ -23,7 +23,7 @@ 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.distribution.DistributionRequestType;
-import org.apache.sling.distribution.agent.DistributionAgent;
+import org.apache.sling.distribution.agent.spi.DistributionAgent;
import org.apache.sling.distribution.component.impl.DistributionComponentConstants;
import org.apache.sling.distribution.component.impl.SettingsUtils;
import org.apache.sling.distribution.event.impl.DistributionEventFactory;
@@ -54,7 +54,7 @@ import java.util.*;
/**
* An OSGi service factory for "synchronizing agents" that synchronize (pull and push) resources between remote instances.
*
- * @see {@link org.apache.sling.distribution.agent.DistributionAgent}
+ * @see {@link DistributionAgent}
*/
@Component(metatype = true,
label = "Apache Sling Distribution Agent - Sync Agents Factory",
diff --git a/src/main/java/org/apache/sling/distribution/agent/impl/TriggerAgentRequestHandler.java b/src/main/java/org/apache/sling/distribution/agent/impl/TriggerAgentRequestHandler.java
index 07851dc..21b76c7 100644
--- a/src/main/java/org/apache/sling/distribution/agent/impl/TriggerAgentRequestHandler.java
+++ b/src/main/java/org/apache/sling/distribution/agent/impl/TriggerAgentRequestHandler.java
@@ -23,7 +23,7 @@ import javax.annotation.Nullable;
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.distribution.DistributionRequest;
-import org.apache.sling.distribution.agent.DistributionAgent;
+import org.apache.sling.distribution.agent.spi.DistributionAgent;
import org.apache.sling.distribution.component.impl.DistributionComponentKind;
import org.apache.sling.distribution.log.impl.DefaultDistributionLog;
import org.apache.sling.distribution.trigger.DistributionRequestHandler;
diff --git a/src/main/java/org/apache/sling/distribution/log/spi/DistributionLog.java b/src/main/java/org/apache/sling/distribution/agent/package-info.java
similarity index 64%
copy from src/main/java/org/apache/sling/distribution/log/spi/DistributionLog.java
copy to src/main/java/org/apache/sling/distribution/agent/package-info.java
index d05a2bb..59b30d6 100644
--- a/src/main/java/org/apache/sling/distribution/log/spi/DistributionLog.java
+++ b/src/main/java/org/apache/sling/distribution/agent/package-info.java
@@ -17,23 +17,8 @@
* under the License.
*/
-package org.apache.sling.distribution.log.spi;
+@Version("0.0.0")
+package org.apache.sling.distribution.agent;
-import java.util.Collection;
-import java.util.List;
+import aQute.bnd.annotation.Version;
-import aQute.bnd.annotation.ConsumerType;
-
-/**
- * The log of a distribution component activity (e.g. a {@link org.apache.sling.distribution.agent.DistributionAgent})
- */
-@ConsumerType
-public interface DistributionLog {
-
- /**
- * get the text log lines
- *
- * @return a {@link Collection} of the log lines
- */
- List<String> getLines();
-}
diff --git a/src/main/java/org/apache/sling/distribution/agent/DistributionAgent.java b/src/main/java/org/apache/sling/distribution/agent/spi/DistributionAgent.java
similarity index 92%
rename from src/main/java/org/apache/sling/distribution/agent/DistributionAgent.java
rename to src/main/java/org/apache/sling/distribution/agent/spi/DistributionAgent.java
index f64f334..66b2ddb 100644
--- a/src/main/java/org/apache/sling/distribution/agent/DistributionAgent.java
+++ b/src/main/java/org/apache/sling/distribution/agent/spi/DistributionAgent.java
@@ -16,15 +16,16 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.distribution.agent;
+package org.apache.sling.distribution.agent.spi;
import javax.annotation.CheckForNull;
import javax.annotation.Nonnull;
-import aQute.bnd.annotation.ProviderType;
+import aQute.bnd.annotation.ConsumerType;
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.distribution.DistributionRequest;
import org.apache.sling.distribution.DistributionResponse;
+import org.apache.sling.distribution.agent.DistributionAgentState;
import org.apache.sling.distribution.common.DistributionException;
import org.apache.sling.distribution.log.spi.DistributionLog;
import org.apache.sling.distribution.queue.spi.DistributionQueue;
@@ -36,7 +37,7 @@ import org.apache.sling.distribution.queue.spi.DistributionQueue;
* specific path(s) which will resume pulling resources from a certain Sling instance and / or pushing resources to
* other instances.
*/
-@ProviderType
+@ConsumerType
public interface DistributionAgent {
/**
@@ -77,7 +78,7 @@ public interface DistributionAgent {
* The content to be sent will be assembled according to the information contained in the request.
* A {@link org.apache.sling.distribution.DistributionResponse} holding the {@link org.apache.sling.distribution.DistributionRequestState}
* of the provided request will be returned.
- * Synchronous {@link org.apache.sling.distribution.agent.DistributionAgent}s will usually block until the execution has finished
+ * Synchronous {@link DistributionAgent}s will usually block until the execution has finished
* while asynchronous agents will usually return the response as soon as the content to be distributed has been assembled
* and scheduled for distribution.
*
diff --git a/src/main/java/org/apache/sling/distribution/log/spi/DistributionLog.java b/src/main/java/org/apache/sling/distribution/agent/spi/package-info.java
similarity index 64%
copy from src/main/java/org/apache/sling/distribution/log/spi/DistributionLog.java
copy to src/main/java/org/apache/sling/distribution/agent/spi/package-info.java
index d05a2bb..e60a106 100644
--- a/src/main/java/org/apache/sling/distribution/log/spi/DistributionLog.java
+++ b/src/main/java/org/apache/sling/distribution/agent/spi/package-info.java
@@ -17,23 +17,8 @@
* under the License.
*/
-package org.apache.sling.distribution.log.spi;
+@Version("0.0.0")
+package org.apache.sling.distribution.agent.spi;
-import java.util.Collection;
-import java.util.List;
+import aQute.bnd.annotation.Version;
-import aQute.bnd.annotation.ConsumerType;
-
-/**
- * The log of a distribution component activity (e.g. a {@link org.apache.sling.distribution.agent.DistributionAgent})
- */
-@ConsumerType
-public interface DistributionLog {
-
- /**
- * get the text log lines
- *
- * @return a {@link Collection} of the log lines
- */
- List<String> getLines();
-}
diff --git a/src/main/java/org/apache/sling/distribution/component/impl/DefaultDistributionComponentProvider.java b/src/main/java/org/apache/sling/distribution/component/impl/DefaultDistributionComponentProvider.java
index 5745d38..1ba3743 100644
--- a/src/main/java/org/apache/sling/distribution/component/impl/DefaultDistributionComponentProvider.java
+++ b/src/main/java/org/apache/sling/distribution/component/impl/DefaultDistributionComponentProvider.java
@@ -31,7 +31,7 @@ import org.apache.felix.scr.annotations.ReferencePolicy;
import org.apache.felix.scr.annotations.References;
import org.apache.felix.scr.annotations.Service;
import org.apache.sling.commons.osgi.PropertiesUtil;
-import org.apache.sling.distribution.agent.DistributionAgent;
+import org.apache.sling.distribution.agent.spi.DistributionAgent;
import org.apache.sling.distribution.agent.impl.DistributionRequestAuthorizationStrategy;
import org.apache.sling.distribution.packaging.DistributionPackageBuilder;
import org.apache.sling.distribution.packaging.DistributionPackageExporter;
diff --git a/src/main/java/org/apache/sling/distribution/component/impl/DistributionComponentKind.java b/src/main/java/org/apache/sling/distribution/component/impl/DistributionComponentKind.java
index e34a2f0..f5316f8 100644
--- a/src/main/java/org/apache/sling/distribution/component/impl/DistributionComponentKind.java
+++ b/src/main/java/org/apache/sling/distribution/component/impl/DistributionComponentKind.java
@@ -34,7 +34,7 @@ import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
-import org.apache.sling.distribution.agent.DistributionAgent;
+import org.apache.sling.distribution.agent.spi.DistributionAgent;
import org.apache.sling.distribution.agent.impl.DistributionRequestAuthorizationStrategy;
import org.apache.sling.distribution.agent.impl.ForwardDistributionAgentFactory;
import org.apache.sling.distribution.agent.impl.PrivilegeDistributionRequestAuthorizationStrategy;
diff --git a/src/main/java/org/apache/sling/distribution/impl/DefaultDistributor.java b/src/main/java/org/apache/sling/distribution/impl/DefaultDistributor.java
index 4c84eb1..ef1bf87 100644
--- a/src/main/java/org/apache/sling/distribution/impl/DefaultDistributor.java
+++ b/src/main/java/org/apache/sling/distribution/impl/DefaultDistributor.java
@@ -29,7 +29,7 @@ import org.apache.sling.distribution.DistributionRequest;
import org.apache.sling.distribution.DistributionRequestState;
import org.apache.sling.distribution.DistributionResponse;
import org.apache.sling.distribution.Distributor;
-import org.apache.sling.distribution.agent.DistributionAgent;
+import org.apache.sling.distribution.agent.spi.DistributionAgent;
import org.apache.sling.distribution.component.impl.DistributionComponentProvider;
import org.apache.sling.distribution.common.DistributionException;
import org.slf4j.Logger;
diff --git a/src/main/java/org/apache/sling/distribution/log/spi/DistributionLog.java b/src/main/java/org/apache/sling/distribution/log/spi/DistributionLog.java
index d05a2bb..289f81b 100644
--- a/src/main/java/org/apache/sling/distribution/log/spi/DistributionLog.java
+++ b/src/main/java/org/apache/sling/distribution/log/spi/DistributionLog.java
@@ -25,7 +25,7 @@ import java.util.List;
import aQute.bnd.annotation.ConsumerType;
/**
- * The log of a distribution component activity (e.g. a {@link org.apache.sling.distribution.agent.DistributionAgent})
+ * The log of a distribution component activity (e.g. a DistributionAgent)
*/
@ConsumerType
public interface DistributionLog {
diff --git a/src/main/java/org/apache/sling/distribution/monitor/DistributionQueueHealthCheck.java b/src/main/java/org/apache/sling/distribution/monitor/DistributionQueueHealthCheck.java
index 15dc16d..38bf41e 100644
--- a/src/main/java/org/apache/sling/distribution/monitor/DistributionQueueHealthCheck.java
+++ b/src/main/java/org/apache/sling/distribution/monitor/DistributionQueueHealthCheck.java
@@ -35,7 +35,7 @@ import org.apache.felix.scr.annotations.ReferencePolicy;
import org.apache.felix.scr.annotations.References;
import org.apache.felix.scr.annotations.Service;
import org.apache.sling.commons.osgi.PropertiesUtil;
-import org.apache.sling.distribution.agent.DistributionAgent;
+import org.apache.sling.distribution.agent.spi.DistributionAgent;
import org.apache.sling.distribution.queue.spi.DistributionQueue;
import org.apache.sling.distribution.queue.DistributionQueueEntry;
import org.apache.sling.distribution.queue.DistributionQueueItemStatus;
diff --git a/src/main/java/org/apache/sling/distribution/monitor/impl/ForwardDistributionAgentMBeanImpl.java b/src/main/java/org/apache/sling/distribution/monitor/impl/ForwardDistributionAgentMBeanImpl.java
index 3baef0a..09a55f7 100644
--- a/src/main/java/org/apache/sling/distribution/monitor/impl/ForwardDistributionAgentMBeanImpl.java
+++ b/src/main/java/org/apache/sling/distribution/monitor/impl/ForwardDistributionAgentMBeanImpl.java
@@ -21,7 +21,7 @@ package org.apache.sling.distribution.monitor.impl;
import java.util.Map;
import org.apache.sling.commons.osgi.PropertiesUtil;
-import org.apache.sling.distribution.agent.DistributionAgent;
+import org.apache.sling.distribution.agent.spi.DistributionAgent;
/**
* The ForwardDistributionAgent MBean implementation, based on the OSGi configuration.
diff --git a/src/main/java/org/apache/sling/distribution/monitor/impl/QueueDistributionAgentMBeanImpl.java b/src/main/java/org/apache/sling/distribution/monitor/impl/QueueDistributionAgentMBeanImpl.java
index ec9527b..1c7863c 100644
--- a/src/main/java/org/apache/sling/distribution/monitor/impl/QueueDistributionAgentMBeanImpl.java
+++ b/src/main/java/org/apache/sling/distribution/monitor/impl/QueueDistributionAgentMBeanImpl.java
@@ -21,7 +21,7 @@ package org.apache.sling.distribution.monitor.impl;
import java.util.Map;
import org.apache.sling.commons.osgi.PropertiesUtil;
-import org.apache.sling.distribution.agent.DistributionAgent;
+import org.apache.sling.distribution.agent.spi.DistributionAgent;
/**
* The QueueDistributionAgent MBean implementation, based on the OSGi configuration.
diff --git a/src/main/java/org/apache/sling/distribution/monitor/impl/ReverseDistributionAgentMBeanImpl.java b/src/main/java/org/apache/sling/distribution/monitor/impl/ReverseDistributionAgentMBeanImpl.java
index c29323b..430b2e6 100644
--- a/src/main/java/org/apache/sling/distribution/monitor/impl/ReverseDistributionAgentMBeanImpl.java
+++ b/src/main/java/org/apache/sling/distribution/monitor/impl/ReverseDistributionAgentMBeanImpl.java
@@ -21,7 +21,7 @@ package org.apache.sling.distribution.monitor.impl;
import java.util.Map;
import org.apache.sling.commons.osgi.PropertiesUtil;
-import org.apache.sling.distribution.agent.DistributionAgent;
+import org.apache.sling.distribution.agent.spi.DistributionAgent;
/**
* The ReverseDistributionAgent MBean implementation, based on the OSGi configuration.
diff --git a/src/main/java/org/apache/sling/distribution/monitor/impl/SimpleDistributionAgentMBeanImpl.java b/src/main/java/org/apache/sling/distribution/monitor/impl/SimpleDistributionAgentMBeanImpl.java
index 1ec1880..47187f7 100644
--- a/src/main/java/org/apache/sling/distribution/monitor/impl/SimpleDistributionAgentMBeanImpl.java
+++ b/src/main/java/org/apache/sling/distribution/monitor/impl/SimpleDistributionAgentMBeanImpl.java
@@ -21,7 +21,7 @@ package org.apache.sling.distribution.monitor.impl;
import java.util.Map;
import org.apache.sling.commons.osgi.PropertiesUtil;
-import org.apache.sling.distribution.agent.DistributionAgent;
+import org.apache.sling.distribution.agent.spi.DistributionAgent;
/**
* The SimpleDistributionAgent MBean implementation, based on the OSGi configuration.
diff --git a/src/main/java/org/apache/sling/distribution/monitor/impl/SyncDistributionAgentMBeanImpl.java b/src/main/java/org/apache/sling/distribution/monitor/impl/SyncDistributionAgentMBeanImpl.java
index bcbfd92..8ba28af 100644
--- a/src/main/java/org/apache/sling/distribution/monitor/impl/SyncDistributionAgentMBeanImpl.java
+++ b/src/main/java/org/apache/sling/distribution/monitor/impl/SyncDistributionAgentMBeanImpl.java
@@ -21,7 +21,7 @@ package org.apache.sling.distribution.monitor.impl;
import java.util.Map;
import org.apache.sling.commons.osgi.PropertiesUtil;
-import org.apache.sling.distribution.agent.DistributionAgent;
+import org.apache.sling.distribution.agent.spi.DistributionAgent;
/**
* The SyncDistributionAgent MBean implementation, based on the OSGi configuration.
diff --git a/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/AgentDistributionPackageExporter.java b/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/AgentDistributionPackageExporter.java
index 0bf46aa..cf2f7b1 100644
--- a/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/AgentDistributionPackageExporter.java
+++ b/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/AgentDistributionPackageExporter.java
@@ -23,7 +23,7 @@ import javax.annotation.Nonnull;
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.distribution.DistributionRequest;
import org.apache.sling.distribution.DistributionRequestType;
-import org.apache.sling.distribution.agent.DistributionAgent;
+import org.apache.sling.distribution.agent.spi.DistributionAgent;
import org.apache.sling.distribution.common.DistributionException;
import org.apache.sling.distribution.log.spi.DistributionLog;
import org.apache.sling.distribution.log.impl.DefaultDistributionLog;
diff --git a/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/AgentDistributionPackageExporterFactory.java b/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/AgentDistributionPackageExporterFactory.java
index 73b9b1f..3837b7a 100644
--- a/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/AgentDistributionPackageExporterFactory.java
+++ b/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/AgentDistributionPackageExporterFactory.java
@@ -31,7 +31,7 @@ import org.apache.felix.scr.annotations.Service;
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.commons.osgi.PropertiesUtil;
import org.apache.sling.distribution.DistributionRequest;
-import org.apache.sling.distribution.agent.DistributionAgent;
+import org.apache.sling.distribution.agent.spi.DistributionAgent;
import org.apache.sling.distribution.common.DistributionException;
import org.apache.sling.distribution.component.impl.DistributionComponentConstants;
import org.apache.sling.distribution.packaging.DistributionPackage;
diff --git a/src/main/java/org/apache/sling/distribution/queue/impl/jobhandling/DistributionAgentJobConsumer.java b/src/main/java/org/apache/sling/distribution/queue/impl/jobhandling/DistributionAgentJobConsumer.java
index 1e2a142..2bd37e0 100644
--- a/src/main/java/org/apache/sling/distribution/queue/impl/jobhandling/DistributionAgentJobConsumer.java
+++ b/src/main/java/org/apache/sling/distribution/queue/impl/jobhandling/DistributionAgentJobConsumer.java
@@ -18,6 +18,7 @@
*/
package org.apache.sling.distribution.queue.impl.jobhandling;
+import org.apache.sling.distribution.agent.spi.DistributionAgent;
import org.apache.sling.distribution.queue.DistributionQueueEntry;
import org.apache.sling.distribution.queue.impl.DistributionQueueProcessor;
import org.apache.sling.event.jobs.Job;
@@ -26,7 +27,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * {@link JobConsumer} for {@link org.apache.sling.distribution.agent.DistributionAgent}s using {@link JobHandlingDistributionQueue}
+ * {@link JobConsumer} for {@link DistributionAgent}s using {@link JobHandlingDistributionQueue}
*/
class DistributionAgentJobConsumer implements JobConsumer {
diff --git a/src/main/java/org/apache/sling/distribution/queue/spi/DistributionQueue.java b/src/main/java/org/apache/sling/distribution/queue/spi/DistributionQueue.java
index 66642d6..f520d79 100644
--- a/src/main/java/org/apache/sling/distribution/queue/spi/DistributionQueue.java
+++ b/src/main/java/org/apache/sling/distribution/queue/spi/DistributionQueue.java
@@ -22,6 +22,7 @@ import javax.annotation.CheckForNull;
import javax.annotation.Nonnull;
import aQute.bnd.annotation.ConsumerType;
+import org.apache.sling.distribution.agent.spi.DistributionAgent;
import org.apache.sling.distribution.packaging.DistributionPackage;
import org.apache.sling.distribution.queue.DistributionQueueEntry;
import org.apache.sling.distribution.queue.DistributionQueueItem;
@@ -31,7 +32,7 @@ import org.apache.sling.distribution.queue.impl.DistributionQueueProcessor;
/**
* A queue is responsible for collecting the {@link DistributionPackage}s
- * exported by a {@link org.apache.sling.distribution.agent.DistributionAgent} in
+ * exported by a {@link DistributionAgent} in
* order to be able to process them also when there are multiple (concurrent)
* {@link org.apache.sling.distribution.DistributionRequest}s executed
* on that same agent.
diff --git a/src/main/java/org/apache/sling/distribution/resources/impl/ExtendedDistributionServiceResourceProvider.java b/src/main/java/org/apache/sling/distribution/resources/impl/ExtendedDistributionServiceResourceProvider.java
index 6d5ae84..57f75d1 100644
--- a/src/main/java/org/apache/sling/distribution/resources/impl/ExtendedDistributionServiceResourceProvider.java
+++ b/src/main/java/org/apache/sling/distribution/resources/impl/ExtendedDistributionServiceResourceProvider.java
@@ -26,7 +26,7 @@ import java.util.List;
import java.util.Map;
-import org.apache.sling.distribution.agent.DistributionAgent;
+import org.apache.sling.distribution.agent.spi.DistributionAgent;
import org.apache.sling.distribution.agent.DistributionAgentState;
import org.apache.sling.distribution.component.impl.DistributionComponent;
import org.apache.sling.distribution.component.impl.DistributionComponentKind;
diff --git a/src/main/java/org/apache/sling/distribution/servlet/DistributionAgentCreationFilter.java b/src/main/java/org/apache/sling/distribution/servlet/DistributionAgentCreationFilter.java
index 0721255..af24cbb 100644
--- a/src/main/java/org/apache/sling/distribution/servlet/DistributionAgentCreationFilter.java
+++ b/src/main/java/org/apache/sling/distribution/servlet/DistributionAgentCreationFilter.java
@@ -33,7 +33,7 @@ import org.apache.felix.scr.annotations.Properties;
import org.apache.felix.scr.annotations.Property;
import org.apache.felix.scr.annotations.Service;
import org.apache.sling.api.SlingHttpServletRequest;
-import org.apache.sling.distribution.agent.DistributionAgent;
+import org.apache.sling.distribution.agent.spi.DistributionAgent;
import org.osgi.framework.BundleContext;
import org.osgi.framework.InvalidSyntaxException;
import org.osgi.framework.ServiceReference;
diff --git a/src/main/java/org/apache/sling/distribution/servlet/DistributionAgentLogServlet.java b/src/main/java/org/apache/sling/distribution/servlet/DistributionAgentLogServlet.java
index 95ad92b..1e2e485 100644
--- a/src/main/java/org/apache/sling/distribution/servlet/DistributionAgentLogServlet.java
+++ b/src/main/java/org/apache/sling/distribution/servlet/DistributionAgentLogServlet.java
@@ -27,6 +27,7 @@ import org.apache.sling.api.SlingHttpServletRequest;
import org.apache.sling.api.SlingHttpServletResponse;
import org.apache.sling.api.servlets.SlingAllMethodsServlet;
import org.apache.sling.distribution.DistributionRequest;
+import org.apache.sling.distribution.agent.spi.DistributionAgent;
import org.apache.sling.distribution.log.spi.DistributionLog;
import org.apache.sling.distribution.resources.DistributionResourceTypes;
import org.apache.sling.distribution.util.RequestUtils;
@@ -34,7 +35,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * Servlet to ask {@link org.apache.sling.distribution.agent.DistributionAgent}s to distribute (via HTTP POST).
+ * Servlet to ask {@link DistributionAgent}s to distribute (via HTTP POST).
*/
@SuppressWarnings("serial")
@SlingServlet(resourceTypes = DistributionResourceTypes.LOG_RESOURCE_TYPE, methods = "GET", extensions = "txt")
diff --git a/src/main/java/org/apache/sling/distribution/servlet/DistributionAgentQueueServlet.java b/src/main/java/org/apache/sling/distribution/servlet/DistributionAgentQueueServlet.java
index bc0db4e..31f61fa 100644
--- a/src/main/java/org/apache/sling/distribution/servlet/DistributionAgentQueueServlet.java
+++ b/src/main/java/org/apache/sling/distribution/servlet/DistributionAgentQueueServlet.java
@@ -28,7 +28,7 @@ import org.apache.sling.api.SlingHttpServletRequest;
import org.apache.sling.api.SlingHttpServletResponse;
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.api.servlets.SlingAllMethodsServlet;
-import org.apache.sling.distribution.agent.DistributionAgent;
+import org.apache.sling.distribution.agent.spi.DistributionAgent;
import org.apache.sling.distribution.common.DistributionException;
import org.apache.sling.distribution.packaging.DistributionPackage;
import org.apache.sling.distribution.packaging.DistributionPackageInfo;
diff --git a/src/main/java/org/apache/sling/distribution/servlet/DistributionAgentServlet.java b/src/main/java/org/apache/sling/distribution/servlet/DistributionAgentServlet.java
index 3121bdc..edada7c 100644
--- a/src/main/java/org/apache/sling/distribution/servlet/DistributionAgentServlet.java
+++ b/src/main/java/org/apache/sling/distribution/servlet/DistributionAgentServlet.java
@@ -28,14 +28,14 @@ import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.api.servlets.SlingAllMethodsServlet;
import org.apache.sling.distribution.DistributionRequest;
import org.apache.sling.distribution.DistributionResponse;
-import org.apache.sling.distribution.agent.DistributionAgent;
+import org.apache.sling.distribution.agent.spi.DistributionAgent;
import org.apache.sling.distribution.resources.DistributionResourceTypes;
import org.apache.sling.distribution.util.RequestUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * Servlet to ask {@link org.apache.sling.distribution.agent.DistributionAgent}s to distribute (via HTTP POST).
+ * Servlet to ask {@link DistributionAgent}s to distribute (via HTTP POST).
*/
@SuppressWarnings("serial")
@SlingServlet(resourceTypes = DistributionResourceTypes.AGENT_RESOURCE_TYPE, methods = "POST")
diff --git a/src/main/java/org/apache/sling/distribution/trigger/impl/ScheduledDistributionTrigger.java b/src/main/java/org/apache/sling/distribution/trigger/impl/ScheduledDistributionTrigger.java
index c243b14..ad0464b 100644
--- a/src/main/java/org/apache/sling/distribution/trigger/impl/ScheduledDistributionTrigger.java
+++ b/src/main/java/org/apache/sling/distribution/trigger/impl/ScheduledDistributionTrigger.java
@@ -30,6 +30,7 @@ import org.apache.sling.commons.scheduler.ScheduleOptions;
import org.apache.sling.commons.scheduler.Scheduler;
import org.apache.sling.distribution.DistributionRequestType;
import org.apache.sling.distribution.SimpleDistributionRequest;
+import org.apache.sling.distribution.agent.spi.DistributionAgent;
import org.apache.sling.distribution.common.DistributionException;
import org.apache.sling.distribution.trigger.DistributionRequestHandler;
import org.apache.sling.distribution.trigger.DistributionTrigger;
@@ -39,7 +40,7 @@ import org.slf4j.LoggerFactory;
/**
* {@link org.apache.sling.distribution.trigger.DistributionTrigger} to schedule distributions on a certain
- * {@link org.apache.sling.distribution.agent.DistributionAgent}
+ * {@link DistributionAgent}
*/
public class ScheduledDistributionTrigger implements DistributionTrigger {
private final static String SCHEDULE_NAME = "scheduledEventTrigger";
diff --git a/src/test/java/org/apache/sling/distribution/agent/impl/TriggerAgentRequestHandlerTest.java b/src/test/java/org/apache/sling/distribution/agent/impl/TriggerAgentRequestHandlerTest.java
index 9f949e4..14ba6f7 100644
--- a/src/test/java/org/apache/sling/distribution/agent/impl/TriggerAgentRequestHandlerTest.java
+++ b/src/test/java/org/apache/sling/distribution/agent/impl/TriggerAgentRequestHandlerTest.java
@@ -20,7 +20,7 @@ package org.apache.sling.distribution.agent.impl;
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.distribution.DistributionRequest;
-import org.apache.sling.distribution.agent.DistributionAgent;
+import org.apache.sling.distribution.agent.spi.DistributionAgent;
import org.apache.sling.distribution.log.impl.DefaultDistributionLog;
import org.junit.Test;
diff --git a/src/test/java/org/apache/sling/distribution/monitor/DistributionQueueHealthCheckTest.java b/src/test/java/org/apache/sling/distribution/monitor/DistributionQueueHealthCheckTest.java
index 68ce1a4..3c33bab 100644
--- a/src/test/java/org/apache/sling/distribution/monitor/DistributionQueueHealthCheckTest.java
+++ b/src/test/java/org/apache/sling/distribution/monitor/DistributionQueueHealthCheckTest.java
@@ -24,7 +24,7 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.List;
-import org.apache.sling.distribution.agent.DistributionAgent;
+import org.apache.sling.distribution.agent.spi.DistributionAgent;
import org.apache.sling.distribution.queue.DistributionQueueItemState;
import org.apache.sling.distribution.queue.spi.DistributionQueue;
import org.apache.sling.distribution.queue.DistributionQueueEntry;
diff --git a/src/test/java/org/apache/sling/distribution/monitor/impl/ForwardDistributionAgentMBeanTest.java b/src/test/java/org/apache/sling/distribution/monitor/impl/ForwardDistributionAgentMBeanTest.java
index 8372600..5f25692 100644
--- a/src/test/java/org/apache/sling/distribution/monitor/impl/ForwardDistributionAgentMBeanTest.java
+++ b/src/test/java/org/apache/sling/distribution/monitor/impl/ForwardDistributionAgentMBeanTest.java
@@ -25,7 +25,7 @@ import static org.mockito.Mockito.when;
import java.util.HashMap;
import java.util.Map;
-import org.apache.sling.distribution.agent.DistributionAgent;
+import org.apache.sling.distribution.agent.spi.DistributionAgent;
import org.apache.sling.distribution.agent.DistributionAgentState;
import org.junit.Test;
diff --git a/src/test/java/org/apache/sling/distribution/monitor/impl/QueueDistributionAgentMBeanTest.java b/src/test/java/org/apache/sling/distribution/monitor/impl/QueueDistributionAgentMBeanTest.java
index f9426e4..fe77c0f 100644
--- a/src/test/java/org/apache/sling/distribution/monitor/impl/QueueDistributionAgentMBeanTest.java
+++ b/src/test/java/org/apache/sling/distribution/monitor/impl/QueueDistributionAgentMBeanTest.java
@@ -25,7 +25,7 @@ import static org.mockito.Mockito.when;
import java.util.HashMap;
import java.util.Map;
-import org.apache.sling.distribution.agent.DistributionAgent;
+import org.apache.sling.distribution.agent.spi.DistributionAgent;
import org.apache.sling.distribution.agent.DistributionAgentState;
import org.junit.Test;
diff --git a/src/test/java/org/apache/sling/distribution/monitor/impl/ReverseDistributionAgentMBeanTest.java b/src/test/java/org/apache/sling/distribution/monitor/impl/ReverseDistributionAgentMBeanTest.java
index 3886706..1854621 100644
--- a/src/test/java/org/apache/sling/distribution/monitor/impl/ReverseDistributionAgentMBeanTest.java
+++ b/src/test/java/org/apache/sling/distribution/monitor/impl/ReverseDistributionAgentMBeanTest.java
@@ -25,7 +25,7 @@ import static org.mockito.Mockito.when;
import java.util.HashMap;
import java.util.Map;
-import org.apache.sling.distribution.agent.DistributionAgent;
+import org.apache.sling.distribution.agent.spi.DistributionAgent;
import org.apache.sling.distribution.agent.DistributionAgentState;
import org.junit.Test;
diff --git a/src/test/java/org/apache/sling/distribution/monitor/impl/SimpleDistributionAgentMBeanTest.java b/src/test/java/org/apache/sling/distribution/monitor/impl/SimpleDistributionAgentMBeanTest.java
index 7e259f5..e94336c 100644
--- a/src/test/java/org/apache/sling/distribution/monitor/impl/SimpleDistributionAgentMBeanTest.java
+++ b/src/test/java/org/apache/sling/distribution/monitor/impl/SimpleDistributionAgentMBeanTest.java
@@ -25,7 +25,7 @@ import static org.mockito.Mockito.when;
import java.util.HashMap;
import java.util.Map;
-import org.apache.sling.distribution.agent.DistributionAgent;
+import org.apache.sling.distribution.agent.spi.DistributionAgent;
import org.apache.sling.distribution.agent.DistributionAgentState;
import org.junit.Test;
diff --git a/src/test/java/org/apache/sling/distribution/monitor/impl/SyncDistributionAgentMBeanTest.java b/src/test/java/org/apache/sling/distribution/monitor/impl/SyncDistributionAgentMBeanTest.java
index 4b0ff8d..03b8a6c 100644
--- a/src/test/java/org/apache/sling/distribution/monitor/impl/SyncDistributionAgentMBeanTest.java
+++ b/src/test/java/org/apache/sling/distribution/monitor/impl/SyncDistributionAgentMBeanTest.java
@@ -25,7 +25,7 @@ import static org.mockito.Mockito.when;
import java.util.HashMap;
import java.util.Map;
-import org.apache.sling.distribution.agent.DistributionAgent;
+import org.apache.sling.distribution.agent.spi.DistributionAgent;
import org.apache.sling.distribution.agent.DistributionAgentState;
import org.junit.Test;
diff --git a/src/test/java/org/apache/sling/distribution/packaging/impl/exporter/AgentDistributionPackageExporterTest.java b/src/test/java/org/apache/sling/distribution/packaging/impl/exporter/AgentDistributionPackageExporterTest.java
index e6351c8..80582dd 100644
--- a/src/test/java/org/apache/sling/distribution/packaging/impl/exporter/AgentDistributionPackageExporterTest.java
+++ b/src/test/java/org/apache/sling/distribution/packaging/impl/exporter/AgentDistributionPackageExporterTest.java
@@ -24,7 +24,7 @@ import org.apache.sling.distribution.DistributionRequest;
import org.apache.sling.distribution.DistributionRequestType;
import org.apache.sling.distribution.DistributionResponse;
import org.apache.sling.distribution.SimpleDistributionRequest;
-import org.apache.sling.distribution.agent.DistributionAgent;
+import org.apache.sling.distribution.agent.spi.DistributionAgent;
import org.apache.sling.distribution.packaging.DistributionPackageProcessor;
import org.apache.sling.distribution.packaging.DistributionPackage;
import org.apache.sling.distribution.packaging.DistributionPackageBuilderProvider;
--
To stop receiving notification emails like this one, please contact
tmaret@apache.org.