Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/AbstractJcrEventTrigger.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/AbstractJcrEventTrigger.java?rev=1645902&r1=1645901&r2=1645902&view=diff ============================================================================== --- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/AbstractJcrEventTrigger.java (original) +++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/AbstractJcrEventTrigger.java Tue Dec 16 10:40:49 2014 @@ -27,7 +27,7 @@ import javax.jcr.observation.EventListen import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.apache.sling.distribution.communication.DistributionRequest; +import org.apache.sling.distribution.DistributionRequest; import org.apache.sling.distribution.trigger.DistributionRequestHandler; import org.apache.sling.distribution.trigger.DistributionTrigger; import org.apache.sling.distribution.trigger.DistributionTriggerException; @@ -38,7 +38,7 @@ import org.slf4j.LoggerFactory; /** * Abstract implementation of a {@link org.apache.sling.distribution.trigger.DistributionTrigger} that listens for 'safe' - * events and triggers a {@link org.apache.sling.distribution.communication.DistributionRequest} from that. + * events and triggers a {@link org.apache.sling.distribution.DistributionRequest} from that. */ public abstract class AbstractJcrEventTrigger implements DistributionTrigger { @@ -125,7 +125,7 @@ public abstract class AbstractJcrEventTr * process the received event and generates a distribution request * * @param event an {@link javax.jcr.observation.Event} to be processed - * @return the {@link org.apache.sling.distribution.communication.DistributionRequest} originated by processing the event, + * @return the {@link org.apache.sling.distribution.DistributionRequest} originated by processing the event, * or <code>null</code> if no request could be generated * @throws RepositoryException */
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/ChainDistributeDistributionTrigger.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/ChainDistributeDistributionTrigger.java?rev=1645902&r1=1645901&r2=1645902&view=diff ============================================================================== --- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/ChainDistributeDistributionTrigger.java (original) +++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/ChainDistributeDistributionTrigger.java Tue Dec 16 10:40:49 2014 @@ -24,9 +24,9 @@ import java.util.Hashtable; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.apache.sling.distribution.communication.DistributionRequest; -import org.apache.sling.distribution.communication.DistributionRequestType; -import org.apache.sling.distribution.communication.SimpleDistributionRequest; +import org.apache.sling.distribution.DistributionRequest; +import org.apache.sling.distribution.DistributionRequestType; +import org.apache.sling.distribution.SimpleDistributionRequest; import org.apache.sling.distribution.event.DistributionEventType; import org.apache.sling.distribution.trigger.DistributionRequestHandler; import org.apache.sling.distribution.trigger.DistributionTrigger; Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/JcrEventDistributionTrigger.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/JcrEventDistributionTrigger.java?rev=1645902&r1=1645901&r2=1645902&view=diff ============================================================================== --- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/JcrEventDistributionTrigger.java (original) +++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/JcrEventDistributionTrigger.java Tue Dec 16 10:40:49 2014 @@ -21,9 +21,9 @@ package org.apache.sling.distribution.tr import javax.jcr.RepositoryException; import javax.jcr.observation.Event; -import org.apache.sling.distribution.communication.DistributionRequest; -import org.apache.sling.distribution.communication.DistributionRequestType; -import org.apache.sling.distribution.communication.SimpleDistributionRequest; +import org.apache.sling.distribution.DistributionRequest; +import org.apache.sling.distribution.DistributionRequestType; +import org.apache.sling.distribution.SimpleDistributionRequest; import org.apache.sling.distribution.trigger.DistributionTrigger; import org.apache.sling.jcr.api.SlingRepository; import org.slf4j.Logger; Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/LocalDistributionTriggerFactory.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/LocalDistributionTriggerFactory.java?rev=1645902&r1=1645901&r2=1645902&view=diff ============================================================================== --- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/LocalDistributionTriggerFactory.java (original) +++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/LocalDistributionTriggerFactory.java Tue Dec 16 10:40:49 2014 @@ -29,7 +29,7 @@ import org.apache.felix.scr.annotations. import org.apache.felix.scr.annotations.Service; import org.apache.sling.commons.osgi.PropertiesUtil; import org.apache.sling.commons.scheduler.Scheduler; -import org.apache.sling.distribution.communication.DistributionRequestType; +import org.apache.sling.distribution.DistributionRequestType; import org.apache.sling.distribution.component.impl.DistributionComponentUtils; import org.apache.sling.distribution.trigger.DistributionRequestHandler; import org.apache.sling.distribution.trigger.DistributionTrigger; Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/PersistingJcrEventDistributionTrigger.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/PersistingJcrEventDistributionTrigger.java?rev=1645902&r1=1645901&r2=1645902&view=diff ============================================================================== --- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/PersistingJcrEventDistributionTrigger.java (original) +++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/PersistingJcrEventDistributionTrigger.java Tue Dec 16 10:40:49 2014 @@ -27,9 +27,9 @@ import java.util.Collection; import java.util.Map; import java.util.Set; -import org.apache.sling.distribution.communication.DistributionRequest; -import org.apache.sling.distribution.communication.DistributionRequestType; -import org.apache.sling.distribution.communication.SimpleDistributionRequest; +import org.apache.sling.distribution.DistributionRequest; +import org.apache.sling.distribution.DistributionRequestType; +import org.apache.sling.distribution.SimpleDistributionRequest; import org.apache.sling.distribution.trigger.DistributionTrigger; import org.apache.sling.jcr.api.SlingRepository; import org.slf4j.Logger; Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/RemoteEventDistributionTrigger.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/RemoteEventDistributionTrigger.java?rev=1645902&r1=1645901&r2=1645902&view=diff ============================================================================== --- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/RemoteEventDistributionTrigger.java (original) +++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/RemoteEventDistributionTrigger.java Tue Dec 16 10:40:49 2014 @@ -42,9 +42,9 @@ import org.apache.http.nio.protocol.Basi import org.apache.http.nio.protocol.BasicAsyncResponseConsumer; import org.apache.sling.commons.scheduler.ScheduleOptions; import org.apache.sling.commons.scheduler.Scheduler; -import org.apache.sling.distribution.communication.DistributionRequest; -import org.apache.sling.distribution.communication.DistributionRequestType; -import org.apache.sling.distribution.communication.SimpleDistributionRequest; +import org.apache.sling.distribution.DistributionRequest; +import org.apache.sling.distribution.DistributionRequestType; +import org.apache.sling.distribution.SimpleDistributionRequest; import org.apache.sling.distribution.transport.DistributionTransportSecretProvider; import org.apache.sling.distribution.transport.impl.DistributionEndpoint; import org.apache.sling.distribution.trigger.DistributionRequestHandler; Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/ResourceEventDistributionTrigger.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/ResourceEventDistributionTrigger.java?rev=1645902&r1=1645901&r2=1645902&view=diff ============================================================================== --- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/ResourceEventDistributionTrigger.java (original) +++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/ResourceEventDistributionTrigger.java Tue Dec 16 10:40:49 2014 @@ -25,9 +25,9 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import org.apache.sling.api.SlingConstants; -import org.apache.sling.distribution.communication.DistributionRequest; -import org.apache.sling.distribution.communication.DistributionRequestType; -import org.apache.sling.distribution.communication.SimpleDistributionRequest; +import org.apache.sling.distribution.DistributionRequest; +import org.apache.sling.distribution.DistributionRequestType; +import org.apache.sling.distribution.SimpleDistributionRequest; import org.apache.sling.distribution.trigger.DistributionRequestHandler; import org.apache.sling.distribution.trigger.DistributionTrigger; import org.apache.sling.distribution.trigger.DistributionTriggerException; Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/ScheduledDistributionTrigger.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/ScheduledDistributionTrigger.java?rev=1645902&r1=1645901&r2=1645902&view=diff ============================================================================== --- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/ScheduledDistributionTrigger.java (original) +++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/trigger/impl/ScheduledDistributionTrigger.java Tue Dec 16 10:40:49 2014 @@ -22,9 +22,9 @@ import javax.annotation.Nonnull; import org.apache.sling.commons.scheduler.ScheduleOptions; import org.apache.sling.commons.scheduler.Scheduler; -import org.apache.sling.distribution.communication.DistributionRequest; -import org.apache.sling.distribution.communication.DistributionRequestType; -import org.apache.sling.distribution.communication.SimpleDistributionRequest; +import org.apache.sling.distribution.DistributionRequest; +import org.apache.sling.distribution.DistributionRequestType; +import org.apache.sling.distribution.SimpleDistributionRequest; import org.apache.sling.distribution.trigger.DistributionRequestHandler; import org.apache.sling.distribution.trigger.DistributionTrigger; import org.apache.sling.distribution.trigger.DistributionTriggerException; Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/util/RequestUtils.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/util/RequestUtils.java?rev=1645902&r1=1645901&r2=1645902&view=diff ============================================================================== --- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/util/RequestUtils.java (original) +++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/util/RequestUtils.java Tue Dec 16 10:40:49 2014 @@ -23,10 +23,10 @@ import java.net.URI; import java.net.URISyntaxException; import org.apache.http.client.utils.URIBuilder; -import org.apache.sling.distribution.communication.SimpleDistributionRequest; -import org.apache.sling.distribution.communication.impl.DistributionParameter; -import org.apache.sling.distribution.communication.DistributionRequest; -import org.apache.sling.distribution.communication.DistributionRequestType; +import org.apache.sling.distribution.SimpleDistributionRequest; +import org.apache.sling.distribution.impl.DistributionParameter; +import org.apache.sling.distribution.DistributionRequest; +import org.apache.sling.distribution.DistributionRequestType; /** * Utility class for HTTP / distribution request related operations. Modified: sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgentTest.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgentTest.java?rev=1645902&r1=1645901&r2=1645902&view=diff ============================================================================== --- sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgentTest.java (original) +++ sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgentTest.java Tue Dec 16 10:40:49 2014 @@ -22,11 +22,11 @@ import java.util.Arrays; import org.apache.sling.api.resource.ResourceResolver; import org.apache.sling.api.resource.ResourceResolverFactory; -import org.apache.sling.distribution.communication.DistributionRequest; -import org.apache.sling.distribution.communication.DistributionRequestState; -import org.apache.sling.distribution.communication.DistributionRequestType; -import org.apache.sling.distribution.communication.DistributionResponse; -import org.apache.sling.distribution.communication.SimpleDistributionRequest; +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.SimpleDistributionRequest; import org.apache.sling.distribution.event.impl.DistributionEventFactory; import org.apache.sling.distribution.packaging.DistributionPackage; import org.apache.sling.distribution.packaging.DistributionPackageExporter; Modified: sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/packaging/impl/exporter/LocalDistributionPackageExporterTest.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/packaging/impl/exporter/LocalDistributionPackageExporterTest.java?rev=1645902&r1=1645901&r2=1645902&view=diff ============================================================================== --- sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/packaging/impl/exporter/LocalDistributionPackageExporterTest.java (original) +++ sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/packaging/impl/exporter/LocalDistributionPackageExporterTest.java Tue Dec 16 10:40:49 2014 @@ -21,9 +21,9 @@ package org.apache.sling.distribution.pa import java.util.List; import org.apache.sling.api.resource.ResourceResolver; -import org.apache.sling.distribution.communication.DistributionRequest; -import org.apache.sling.distribution.communication.DistributionRequestType; -import org.apache.sling.distribution.communication.SimpleDistributionRequest; +import org.apache.sling.distribution.DistributionRequest; +import org.apache.sling.distribution.DistributionRequestType; +import org.apache.sling.distribution.SimpleDistributionRequest; import org.apache.sling.distribution.packaging.DistributionPackage; import org.apache.sling.distribution.serialization.DistributionPackageBuilder; import org.junit.Test; Modified: sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/packaging/impl/exporter/RemoteDistributionPackageExporterTest.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/packaging/impl/exporter/RemoteDistributionPackageExporterTest.java?rev=1645902&r1=1645901&r2=1645902&view=diff ============================================================================== --- sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/packaging/impl/exporter/RemoteDistributionPackageExporterTest.java (original) +++ sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/packaging/impl/exporter/RemoteDistributionPackageExporterTest.java Tue Dec 16 10:40:49 2014 @@ -21,9 +21,9 @@ package org.apache.sling.distribution.pa import java.util.List; import org.apache.sling.api.resource.ResourceResolver; -import org.apache.sling.distribution.communication.DistributionRequest; -import org.apache.sling.distribution.communication.DistributionRequestType; -import org.apache.sling.distribution.communication.SimpleDistributionRequest; +import org.apache.sling.distribution.DistributionRequest; +import org.apache.sling.distribution.DistributionRequestType; +import org.apache.sling.distribution.SimpleDistributionRequest; import org.apache.sling.distribution.packaging.DistributionPackage; import org.apache.sling.distribution.serialization.DistributionPackageBuilder; import org.apache.sling.distribution.transport.DistributionTransportSecretProvider; Modified: sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingDistributionQueueTest.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingDistributionQueueTest.java?rev=1645902&r1=1645901&r2=1645902&view=diff ============================================================================== --- sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingDistributionQueueTest.java (original) +++ sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingDistributionQueueTest.java Tue Dec 16 10:40:49 2014 @@ -21,7 +21,7 @@ package org.apache.sling.distribution.qu import java.util.Collections; import java.util.Map; -import org.apache.sling.distribution.communication.DistributionRequestType; +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.DistributionQueueItem; Modified: sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingUtilsTest.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingUtilsTest.java?rev=1645902&r1=1645901&r2=1645902&view=diff ============================================================================== --- sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingUtilsTest.java (original) +++ sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingUtilsTest.java Tue Dec 16 10:40:49 2014 @@ -20,7 +20,7 @@ package org.apache.sling.distribution.qu import java.util.Map; -import org.apache.sling.distribution.communication.DistributionRequestType; +import org.apache.sling.distribution.DistributionRequestType; import org.apache.sling.distribution.packaging.DistributionPackageInfo; import org.apache.sling.distribution.queue.DistributionQueueItem; import org.junit.Test; Modified: sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/serialization/impl/VoidDistributionPackageBuilderTest.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/serialization/impl/VoidDistributionPackageBuilderTest.java?rev=1645902&r1=1645901&r2=1645902&view=diff ============================================================================== --- sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/serialization/impl/VoidDistributionPackageBuilderTest.java (original) +++ sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/serialization/impl/VoidDistributionPackageBuilderTest.java Tue Dec 16 10:40:49 2014 @@ -22,9 +22,9 @@ import java.io.ByteArrayInputStream; import java.io.InputStream; import org.apache.sling.api.resource.ResourceResolver; -import org.apache.sling.distribution.communication.DistributionRequest; -import org.apache.sling.distribution.communication.DistributionRequestType; -import org.apache.sling.distribution.communication.SimpleDistributionRequest; +import org.apache.sling.distribution.DistributionRequest; +import org.apache.sling.distribution.DistributionRequestType; +import org.apache.sling.distribution.SimpleDistributionRequest; import org.apache.sling.distribution.packaging.DistributionPackage; import org.apache.sling.distribution.serialization.DistributionPackageReadingException; import org.junit.Test; Modified: sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/serialization/impl/VoidDistributionPackageTest.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/serialization/impl/VoidDistributionPackageTest.java?rev=1645902&r1=1645901&r2=1645902&view=diff ============================================================================== --- sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/serialization/impl/VoidDistributionPackageTest.java (original) +++ sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/serialization/impl/VoidDistributionPackageTest.java Tue Dec 16 10:40:49 2014 @@ -22,9 +22,9 @@ import java.io.ByteArrayInputStream; import java.util.Arrays; import org.apache.commons.io.IOUtils; -import org.apache.sling.distribution.communication.DistributionRequest; -import org.apache.sling.distribution.communication.DistributionRequestType; -import org.apache.sling.distribution.communication.SimpleDistributionRequest; +import org.apache.sling.distribution.DistributionRequest; +import org.apache.sling.distribution.DistributionRequestType; +import org.apache.sling.distribution.SimpleDistributionRequest; import org.junit.Test; import static org.junit.Assert.assertEquals; Modified: sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/serialization/impl/vlt/FileVaultDistributionPackageBuilderTest.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/serialization/impl/vlt/FileVaultDistributionPackageBuilderTest.java?rev=1645902&r1=1645901&r2=1645902&view=diff ============================================================================== --- sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/serialization/impl/vlt/FileVaultDistributionPackageBuilderTest.java (original) +++ sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/serialization/impl/vlt/FileVaultDistributionPackageBuilderTest.java Tue Dec 16 10:40:49 2014 @@ -33,9 +33,9 @@ import org.apache.jackrabbit.vault.packa import org.apache.jackrabbit.vault.packaging.Packaging; import org.apache.jackrabbit.vault.packaging.VaultPackage; import org.apache.sling.api.resource.ResourceResolver; -import org.apache.sling.distribution.communication.DistributionRequest; -import org.apache.sling.distribution.communication.DistributionRequestType; -import org.apache.sling.distribution.communication.SimpleDistributionRequest; +import org.apache.sling.distribution.DistributionRequest; +import org.apache.sling.distribution.DistributionRequestType; +import org.apache.sling.distribution.SimpleDistributionRequest; import org.apache.sling.distribution.event.impl.DistributionEventFactory; import org.apache.sling.distribution.packaging.DistributionPackage; import org.apache.sling.distribution.packaging.DistributionPackageInfo; Modified: sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/transport/impl/MultipleEndpointDistributionTransportTest.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/transport/impl/MultipleEndpointDistributionTransportTest.java?rev=1645902&r1=1645901&r2=1645902&view=diff ============================================================================== --- sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/transport/impl/MultipleEndpointDistributionTransportTest.java (original) +++ sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/transport/impl/MultipleEndpointDistributionTransportTest.java Tue Dec 16 10:40:49 2014 @@ -23,9 +23,9 @@ import java.util.Collections; import java.util.List; import org.apache.sling.api.resource.ResourceResolver; -import org.apache.sling.distribution.communication.DistributionRequest; -import org.apache.sling.distribution.communication.DistributionRequestType; -import org.apache.sling.distribution.communication.SimpleDistributionRequest; +import org.apache.sling.distribution.DistributionRequest; +import org.apache.sling.distribution.DistributionRequestType; +import org.apache.sling.distribution.SimpleDistributionRequest; import org.apache.sling.distribution.packaging.DistributionPackage; import org.apache.sling.distribution.transport.core.DistributionTransport; import org.apache.sling.distribution.transport.DistributionTransportSecret; Modified: sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/transport/impl/SimpleHttpDistributionTransportTest.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/transport/impl/SimpleHttpDistributionTransportTest.java?rev=1645902&r1=1645901&r2=1645902&view=diff ============================================================================== --- sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/transport/impl/SimpleHttpDistributionTransportTest.java (original) +++ sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/transport/impl/SimpleHttpDistributionTransportTest.java Tue Dec 16 10:40:49 2014 @@ -31,9 +31,9 @@ import org.apache.http.client.fluent.Exe import org.apache.http.client.fluent.Request; import org.apache.http.client.fluent.Response; import org.apache.sling.api.resource.ResourceResolver; -import org.apache.sling.distribution.communication.DistributionRequest; -import org.apache.sling.distribution.communication.DistributionRequestType; -import org.apache.sling.distribution.communication.SimpleDistributionRequest; +import org.apache.sling.distribution.DistributionRequest; +import org.apache.sling.distribution.DistributionRequestType; +import org.apache.sling.distribution.SimpleDistributionRequest; import org.apache.sling.distribution.packaging.DistributionPackage; import org.apache.sling.distribution.packaging.DistributionPackageInfo; import org.apache.sling.distribution.serialization.DistributionPackageBuilder; Modified: sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/trigger/impl/JcrEventDistributionTriggerTest.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/trigger/impl/JcrEventDistributionTriggerTest.java?rev=1645902&r1=1645901&r2=1645902&view=diff ============================================================================== --- sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/trigger/impl/JcrEventDistributionTriggerTest.java (original) +++ sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/trigger/impl/JcrEventDistributionTriggerTest.java Tue Dec 16 10:40:49 2014 @@ -20,7 +20,7 @@ package org.apache.sling.distribution.tr import javax.jcr.observation.Event; -import org.apache.sling.distribution.communication.DistributionRequest; +import org.apache.sling.distribution.DistributionRequest; import org.apache.sling.jcr.api.SlingRepository; import org.junit.Test; Modified: sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/trigger/impl/PersistingJcrEventDistributionTriggerTest.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/trigger/impl/PersistingJcrEventDistributionTriggerTest.java?rev=1645902&r1=1645901&r2=1645902&view=diff ============================================================================== --- sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/trigger/impl/PersistingJcrEventDistributionTriggerTest.java (original) +++ sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/trigger/impl/PersistingJcrEventDistributionTriggerTest.java Tue Dec 16 10:40:49 2014 @@ -24,7 +24,7 @@ import javax.jcr.Workspace; import javax.jcr.observation.Event; import javax.jcr.observation.ObservationManager; -import org.apache.sling.distribution.communication.DistributionRequest; +import org.apache.sling.distribution.DistributionRequest; import org.apache.sling.distribution.trigger.DistributionRequestHandler; import org.apache.sling.jcr.api.SlingRepository; import org.junit.Test; Modified: sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/trigger/impl/ScheduledDistributionTriggerTest.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/trigger/impl/ScheduledDistributionTriggerTest.java?rev=1645902&r1=1645901&r2=1645902&view=diff ============================================================================== --- sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/trigger/impl/ScheduledDistributionTriggerTest.java (original) +++ sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/trigger/impl/ScheduledDistributionTriggerTest.java Tue Dec 16 10:40:49 2014 @@ -20,7 +20,7 @@ package org.apache.sling.distribution.tr import org.apache.sling.commons.scheduler.ScheduleOptions; import org.apache.sling.commons.scheduler.Scheduler; -import org.apache.sling.distribution.communication.DistributionRequestType; +import org.apache.sling.distribution.DistributionRequestType; import org.apache.sling.distribution.trigger.DistributionRequestHandler; import org.junit.Test;
