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 <tma...@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
tma...@apache.org.
