SLING-9075 - Move precondition classes to their own package
diff --git a/src/main/java/org/apache/sling/distribution/journal/impl/subscriber/DefaultPrecondition.java b/src/main/java/org/apache/sling/distribution/journal/impl/precondition/DefaultPrecondition.java
similarity index 94%
rename from src/main/java/org/apache/sling/distribution/journal/impl/subscriber/DefaultPrecondition.java
rename to src/main/java/org/apache/sling/distribution/journal/impl/precondition/DefaultPrecondition.java
index e335ffe..dceed02 100644
--- a/src/main/java/org/apache/sling/distribution/journal/impl/subscriber/DefaultPrecondition.java
+++ b/src/main/java/org/apache/sling/distribution/journal/impl/precondition/DefaultPrecondition.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.distribution.journal.impl.subscriber;
+package org.apache.sling.distribution.journal.impl.precondition;
import org.osgi.service.component.annotations.Component;
diff --git a/src/main/java/org/apache/sling/distribution/journal/impl/subscriber/PackageStatusWatcher.java b/src/main/java/org/apache/sling/distribution/journal/impl/precondition/PackageStatusWatcher.java
similarity index 97%
rename from src/main/java/org/apache/sling/distribution/journal/impl/subscriber/PackageStatusWatcher.java
rename to src/main/java/org/apache/sling/distribution/journal/impl/precondition/PackageStatusWatcher.java
index 9b64177..0408e0d 100644
--- a/src/main/java/org/apache/sling/distribution/journal/impl/subscriber/PackageStatusWatcher.java
+++ b/src/main/java/org/apache/sling/distribution/journal/impl/precondition/PackageStatusWatcher.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.distribution.journal.impl.subscriber;
+package org.apache.sling.distribution.journal.impl.precondition;
import static org.apache.sling.distribution.journal.HandlerAdapter.create;
diff --git a/src/main/java/org/apache/sling/distribution/journal/impl/subscriber/Precondition.java b/src/main/java/org/apache/sling/distribution/journal/impl/precondition/Precondition.java
similarity index 95%
rename from src/main/java/org/apache/sling/distribution/journal/impl/subscriber/Precondition.java
rename to src/main/java/org/apache/sling/distribution/journal/impl/precondition/Precondition.java
index c219466..3730475 100644
--- a/src/main/java/org/apache/sling/distribution/journal/impl/subscriber/Precondition.java
+++ b/src/main/java/org/apache/sling/distribution/journal/impl/precondition/Precondition.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.distribution.journal.impl.subscriber;
+package org.apache.sling.distribution.journal.impl.precondition;
import java.util.concurrent.TimeoutException;
diff --git a/src/main/java/org/apache/sling/distribution/journal/impl/subscriber/StagingPrecondition.java b/src/main/java/org/apache/sling/distribution/journal/impl/precondition/StagingPrecondition.java
similarity index 98%
rename from src/main/java/org/apache/sling/distribution/journal/impl/subscriber/StagingPrecondition.java
rename to src/main/java/org/apache/sling/distribution/journal/impl/precondition/StagingPrecondition.java
index ef1c595..2272888 100644
--- a/src/main/java/org/apache/sling/distribution/journal/impl/subscriber/StagingPrecondition.java
+++ b/src/main/java/org/apache/sling/distribution/journal/impl/precondition/StagingPrecondition.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.distribution.journal.impl.subscriber;
+package org.apache.sling.distribution.journal.impl.precondition;
import static org.apache.sling.commons.scheduler.Scheduler.PROPERTY_SCHEDULER_CONCURRENT;
import static org.apache.sling.commons.scheduler.Scheduler.PROPERTY_SCHEDULER_PERIOD;
diff --git a/src/main/java/org/apache/sling/distribution/journal/impl/subscriber/DistributionSubscriber.java b/src/main/java/org/apache/sling/distribution/journal/impl/subscriber/DistributionSubscriber.java
index ce215cf..934cacf 100644
--- a/src/main/java/org/apache/sling/distribution/journal/impl/subscriber/DistributionSubscriber.java
+++ b/src/main/java/org/apache/sling/distribution/journal/impl/subscriber/DistributionSubscriber.java
@@ -65,6 +65,7 @@
import org.apache.sling.distribution.journal.MessageSender;
import org.apache.sling.distribution.journal.MessagingProvider;
import org.apache.sling.distribution.journal.Reset;
+import org.apache.sling.distribution.journal.impl.precondition.Precondition;
import org.apache.sling.distribution.journal.impl.queue.QueueItemFactory;
import org.apache.sling.distribution.journal.impl.queue.impl.SubQueue;
import org.apache.sling.distribution.journal.impl.shared.AgentState;
diff --git a/src/test/java/org/apache/sling/distribution/journal/impl/subscriber/DefaultPreconditionTest.java b/src/test/java/org/apache/sling/distribution/journal/impl/precondition/DefaultPreconditionTest.java
similarity index 88%
rename from src/test/java/org/apache/sling/distribution/journal/impl/subscriber/DefaultPreconditionTest.java
rename to src/test/java/org/apache/sling/distribution/journal/impl/precondition/DefaultPreconditionTest.java
index da2ce66..f279265 100644
--- a/src/test/java/org/apache/sling/distribution/journal/impl/subscriber/DefaultPreconditionTest.java
+++ b/src/test/java/org/apache/sling/distribution/journal/impl/precondition/DefaultPreconditionTest.java
@@ -16,11 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.distribution.journal.impl.subscriber;
+package org.apache.sling.distribution.journal.impl.precondition;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.junit.Assert.assertThat;
+import org.apache.sling.distribution.journal.impl.precondition.DefaultPrecondition;
import org.junit.Test;
public class DefaultPreconditionTest {
diff --git a/src/test/java/org/apache/sling/distribution/journal/impl/subscriber/PackageStatusWatcherTest.java b/src/test/java/org/apache/sling/distribution/journal/impl/precondition/PackageStatusWatcherTest.java
similarity index 96%
rename from src/test/java/org/apache/sling/distribution/journal/impl/subscriber/PackageStatusWatcherTest.java
rename to src/test/java/org/apache/sling/distribution/journal/impl/precondition/PackageStatusWatcherTest.java
index 8ab19f3..571d98a 100644
--- a/src/test/java/org/apache/sling/distribution/journal/impl/subscriber/PackageStatusWatcherTest.java
+++ b/src/test/java/org/apache/sling/distribution/journal/impl/precondition/PackageStatusWatcherTest.java
@@ -16,8 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.distribution.journal.impl.subscriber;
+package org.apache.sling.distribution.journal.impl.precondition;
+import org.apache.sling.distribution.journal.impl.precondition.PackageStatusWatcher;
import org.apache.sling.distribution.journal.impl.shared.TestMessageInfo;
import org.apache.sling.distribution.journal.impl.shared.Topics;
import org.apache.sling.distribution.journal.messages.Messages.PackageStatusMessage;
diff --git a/src/test/java/org/apache/sling/distribution/journal/impl/subscriber/StagingPreconditionTest.java b/src/test/java/org/apache/sling/distribution/journal/impl/precondition/StagingPreconditionTest.java
similarity index 97%
rename from src/test/java/org/apache/sling/distribution/journal/impl/subscriber/StagingPreconditionTest.java
rename to src/test/java/org/apache/sling/distribution/journal/impl/precondition/StagingPreconditionTest.java
index b050526..eab0479 100644
--- a/src/test/java/org/apache/sling/distribution/journal/impl/subscriber/StagingPreconditionTest.java
+++ b/src/test/java/org/apache/sling/distribution/journal/impl/precondition/StagingPreconditionTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.distribution.journal.impl.subscriber;
+package org.apache.sling.distribution.journal.impl.precondition;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.instanceOf;
@@ -35,6 +35,7 @@
import org.apache.sling.distribution.journal.MessageHandler;
import org.apache.sling.distribution.journal.MessagingProvider;
import org.apache.sling.distribution.journal.Reset;
+import org.apache.sling.distribution.journal.impl.precondition.StagingPrecondition;
import org.apache.sling.distribution.journal.impl.shared.TestMessageInfo;
import org.apache.sling.distribution.journal.impl.shared.Topics;
import org.apache.sling.distribution.journal.messages.Messages.PackageStatusMessage;
diff --git a/src/test/java/org/apache/sling/distribution/journal/impl/subscriber/SubscriberTest.java b/src/test/java/org/apache/sling/distribution/journal/impl/subscriber/SubscriberTest.java
index ba8ea9a..1d47520 100644
--- a/src/test/java/org/apache/sling/distribution/journal/impl/subscriber/SubscriberTest.java
+++ b/src/test/java/org/apache/sling/distribution/journal/impl/subscriber/SubscriberTest.java
@@ -48,6 +48,7 @@
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
+import org.apache.sling.distribution.journal.impl.precondition.Precondition;
import org.apache.sling.distribution.journal.impl.shared.DistributionMetricsService;
import org.apache.sling.distribution.journal.impl.shared.TestMessageInfo;
import org.apache.sling.distribution.journal.impl.shared.Topics;
