Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/DefaultDistributionPackageBuilderProvider.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/DefaultDistributionPackageBuilderProvider.java?rev=1750344&r1=1750343&r2=1750344&view=diff ============================================================================== --- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/DefaultDistributionPackageBuilderProvider.java (original) +++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/DefaultDistributionPackageBuilderProvider.java Mon Jun 27 14:11:06 2016 @@ -26,8 +26,8 @@ import org.apache.felix.scr.annotations. 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.serialization.DistributionPackageBuilder; -import org.apache.sling.distribution.serialization.DistributionPackageBuilderProvider; +import org.apache.sling.distribution.packaging.DistributionPackageBuilder; +import org.apache.sling.distribution.packaging.DistributionPackageBuilderProvider; @Component @Service(DistributionPackageBuilderProvider.class)
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/DistributionPackageBuilderFactory.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/DistributionPackageBuilderFactory.java?rev=1750344&r1=1750343&r2=1750344&view=diff ============================================================================== --- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/DistributionPackageBuilderFactory.java (original) +++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/DistributionPackageBuilderFactory.java Mon Jun 27 14:11:06 2016 @@ -36,10 +36,12 @@ import org.apache.sling.distribution.Dis import org.apache.sling.distribution.common.DistributionException; import org.apache.sling.distribution.component.impl.DistributionComponentConstants; import org.apache.sling.distribution.component.impl.SettingsUtils; -import org.apache.sling.distribution.serialization.DistributionPackage; -import org.apache.sling.distribution.serialization.DistributionPackageBuilder; +import org.apache.sling.distribution.packaging.DistributionPackage; +import org.apache.sling.distribution.packaging.DistributionPackageBuilder; +import org.apache.sling.distribution.packaging.impl.FileDistributionPackageBuilder; +import org.apache.sling.distribution.packaging.impl.ResourceDistributionPackageBuilder; import org.apache.sling.distribution.serialization.DistributionContentSerializer; -import org.apache.sling.distribution.serialization.DistributionPackageInfo; +import org.apache.sling.distribution.packaging.DistributionPackageInfo; /** * A factory for package builders Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/FileVaultContentSerializer.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/FileVaultContentSerializer.java?rev=1750344&r1=1750343&r2=1750344&view=diff ============================================================================== --- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/FileVaultContentSerializer.java (original) +++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/FileVaultContentSerializer.java Mon Jun 27 14:11:06 2016 @@ -43,7 +43,7 @@ import org.apache.sling.api.resource.Res import org.apache.sling.distribution.DistributionRequest; import org.apache.sling.distribution.common.DistributionException; import org.apache.sling.distribution.serialization.DistributionContentSerializer; -import org.apache.sling.distribution.serialization.impl.FileDistributionPackage; +import org.apache.sling.distribution.packaging.impl.FileDistributionPackage; import org.apache.sling.distribution.util.DistributionJcrUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/VaultDistributionPackageBuilderFactory.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/VaultDistributionPackageBuilderFactory.java?rev=1750344&r1=1750343&r2=1750344&view=diff ============================================================================== --- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/VaultDistributionPackageBuilderFactory.java (original) +++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/VaultDistributionPackageBuilderFactory.java Mon Jun 27 14:11:06 2016 @@ -40,11 +40,11 @@ import org.apache.sling.distribution.com import org.apache.sling.distribution.component.impl.DistributionComponentConstants; import org.apache.sling.distribution.component.impl.SettingsUtils; import org.apache.sling.distribution.serialization.DistributionContentSerializer; -import org.apache.sling.distribution.serialization.DistributionPackage; -import org.apache.sling.distribution.serialization.DistributionPackageBuilder; -import org.apache.sling.distribution.serialization.DistributionPackageInfo; -import org.apache.sling.distribution.serialization.impl.FileDistributionPackageBuilder; -import org.apache.sling.distribution.serialization.impl.ResourceDistributionPackageBuilder; +import org.apache.sling.distribution.packaging.DistributionPackage; +import org.apache.sling.distribution.packaging.DistributionPackageBuilder; +import org.apache.sling.distribution.packaging.DistributionPackageInfo; +import org.apache.sling.distribution.packaging.impl.FileDistributionPackageBuilder; +import org.apache.sling.distribution.packaging.impl.ResourceDistributionPackageBuilder; /** * A package builder for Apache Jackrabbit FileVault based implementations. Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionAgentQueueServlet.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionAgentQueueServlet.java?rev=1750344&r1=1750343&r2=1750344&view=diff ============================================================================== --- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionAgentQueueServlet.java (original) +++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionAgentQueueServlet.java Mon Jun 27 14:11:06 2016 @@ -29,15 +29,15 @@ import org.apache.sling.api.resource.Res import org.apache.sling.api.servlets.SlingAllMethodsServlet; import org.apache.sling.distribution.agent.DistributionAgent; import org.apache.sling.distribution.common.DistributionException; -import org.apache.sling.distribution.serialization.DistributionPackage; -import org.apache.sling.distribution.serialization.DistributionPackageInfo; +import org.apache.sling.distribution.packaging.DistributionPackage; +import org.apache.sling.distribution.packaging.DistributionPackageInfo; import org.apache.sling.distribution.packaging.impl.DistributionPackageUtils; import org.apache.sling.distribution.queue.DistributionQueue; import org.apache.sling.distribution.queue.DistributionQueueEntry; import org.apache.sling.distribution.queue.DistributionQueueItem; import org.apache.sling.distribution.resources.DistributionResourceTypes; -import org.apache.sling.distribution.serialization.DistributionPackageBuilder; -import org.apache.sling.distribution.serialization.DistributionPackageBuilderProvider; +import org.apache.sling.distribution.packaging.DistributionPackageBuilder; +import org.apache.sling.distribution.packaging.DistributionPackageBuilderProvider; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionPackageExporterServlet.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionPackageExporterServlet.java?rev=1750344&r1=1750343&r2=1750344&view=diff ============================================================================== --- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionPackageExporterServlet.java (original) +++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionPackageExporterServlet.java Mon Jun 27 14:11:06 2016 @@ -34,10 +34,9 @@ import org.apache.sling.distribution.Dis import org.apache.sling.distribution.common.DistributionException; import org.apache.sling.distribution.packaging.DistributionPackageProcessor; import org.apache.sling.distribution.packaging.impl.DistributionPackageUtils; -import org.apache.sling.distribution.serialization.DistributionPackage; +import org.apache.sling.distribution.packaging.DistributionPackage; import org.apache.sling.distribution.packaging.DistributionPackageExporter; import org.apache.sling.distribution.resources.DistributionResourceTypes; -import org.apache.sling.distribution.transport.impl.HttpTransportUtils; import org.apache.sling.distribution.util.RequestUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionPackageImporterServlet.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionPackageImporterServlet.java?rev=1750344&r1=1750343&r2=1750344&view=diff ============================================================================== --- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionPackageImporterServlet.java (original) +++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionPackageImporterServlet.java Mon Jun 27 14:11:06 2016 @@ -28,7 +28,7 @@ import org.apache.sling.api.SlingHttpSer 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.serialization.DistributionPackageInfo; +import org.apache.sling.distribution.packaging.DistributionPackageInfo; import org.apache.sling.distribution.resources.DistributionResourceTypes; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/DefaultRemoteDistributionPackage.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/DefaultRemoteDistributionPackage.java?rev=1750344&r1=1750343&r2=1750344&view=diff ============================================================================== --- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/DefaultRemoteDistributionPackage.java (original) +++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/DefaultRemoteDistributionPackage.java Mon Jun 27 14:11:06 2016 @@ -21,7 +21,7 @@ package org.apache.sling.distribution.tr import org.apache.http.client.fluent.Executor; import org.apache.sling.distribution.packaging.impl.DistributionPackageUtils; -import org.apache.sling.distribution.serialization.DistributionPackage; +import org.apache.sling.distribution.packaging.DistributionPackage; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/DistributionTransport.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/DistributionTransport.java?rev=1750344&r1=1750343&r2=1750344&view=diff ============================================================================== --- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/DistributionTransport.java (original) +++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/DistributionTransport.java Mon Jun 27 14:11:06 2016 @@ -24,7 +24,7 @@ import javax.annotation.Nullable; 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.serialization.DistributionPackage; +import org.apache.sling.distribution.packaging.DistributionPackage; /** * A transport layer implementation to transport data between two (or eventually more) Sling instances. Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/RemoteDistributionPackage.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/RemoteDistributionPackage.java?rev=1750344&r1=1750343&r2=1750344&view=diff ============================================================================== --- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/RemoteDistributionPackage.java (original) +++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/RemoteDistributionPackage.java Mon Jun 27 14:11:06 2016 @@ -19,7 +19,7 @@ package org.apache.sling.distribution.transport.impl; -import org.apache.sling.distribution.serialization.DistributionPackage; +import org.apache.sling.distribution.packaging.DistributionPackage; public interface RemoteDistributionPackage { Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/SimpleHttpDistributionTransport.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/SimpleHttpDistributionTransport.java?rev=1750344&r1=1750343&r2=1750344&view=diff ============================================================================== --- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/SimpleHttpDistributionTransport.java (original) +++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/SimpleHttpDistributionTransport.java Mon Jun 27 14:11:06 2016 @@ -22,8 +22,6 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; import java.io.InputStream; import java.net.URI; -import java.util.ArrayList; -import java.util.List; import java.util.Map; import java.util.UUID; @@ -41,8 +39,8 @@ import org.apache.sling.distribution.com import org.apache.sling.distribution.common.RecoverableDistributionException; import org.apache.sling.distribution.log.impl.DefaultDistributionLog; import org.apache.sling.distribution.packaging.impl.DistributionPackageUtils; -import org.apache.sling.distribution.serialization.DistributionPackage; -import org.apache.sling.distribution.serialization.DistributionPackageBuilder; +import org.apache.sling.distribution.packaging.DistributionPackage; +import org.apache.sling.distribution.packaging.DistributionPackageBuilder; import org.apache.sling.distribution.transport.DistributionTransportSecret; import org.apache.sling.distribution.transport.DistributionTransportSecretProvider; import org.apache.sling.distribution.util.RequestUtils; 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=1750344&r1=1750343&r2=1750344&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 Mon Jun 27 14:11:06 2016 @@ -32,10 +32,10 @@ import org.apache.sling.distribution.Sim 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.serialization.DistributionPackage; +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.serialization.DistributionPackageInfo; +import org.apache.sling.distribution.packaging.DistributionPackageInfo; import org.apache.sling.distribution.queue.DistributionQueue; import org.apache.sling.distribution.queue.DistributionQueueItemState; import org.apache.sling.distribution.queue.impl.DistributionQueueDispatchingStrategy; Copied: sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/packaging/impl/SimpleDistributionPackageTest.java (from r1750297, sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/serialization/impl/SimpleDistributionPackageTest.java) URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/packaging/impl/SimpleDistributionPackageTest.java?p2=sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/packaging/impl/SimpleDistributionPackageTest.java&p1=sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/serialization/impl/SimpleDistributionPackageTest.java&r1=1750297&r2=1750344&rev=1750344&view=diff ============================================================================== --- sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/serialization/impl/SimpleDistributionPackageTest.java (original) +++ sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/packaging/impl/SimpleDistributionPackageTest.java Mon Jun 27 14:11:06 2016 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.distribution.serialization.impl; +package org.apache.sling.distribution.packaging.impl; import java.io.ByteArrayInputStream; import java.util.Arrays; @@ -25,6 +25,7 @@ import org.apache.commons.io.IOUtils; import org.apache.sling.distribution.DistributionRequest; import org.apache.sling.distribution.DistributionRequestType; import org.apache.sling.distribution.SimpleDistributionRequest; +import org.apache.sling.distribution.packaging.impl.SimpleDistributionPackage; import org.junit.Test; import static org.junit.Assert.assertEquals; Modified: sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/packaging/impl/exporter/AgentDistributionPackageExporterTest.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/packaging/impl/exporter/AgentDistributionPackageExporterTest.java?rev=1750344&r1=1750343&r2=1750344&view=diff ============================================================================== --- sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/packaging/impl/exporter/AgentDistributionPackageExporterTest.java (original) +++ sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/packaging/impl/exporter/AgentDistributionPackageExporterTest.java Mon Jun 27 14:11:06 2016 @@ -25,8 +25,8 @@ import org.apache.sling.distribution.Dis import org.apache.sling.distribution.SimpleDistributionRequest; import org.apache.sling.distribution.agent.DistributionAgent; import org.apache.sling.distribution.packaging.DistributionPackageProcessor; -import org.apache.sling.distribution.serialization.DistributionPackage; -import org.apache.sling.distribution.serialization.DistributionPackageBuilderProvider; +import org.apache.sling.distribution.packaging.DistributionPackage; +import org.apache.sling.distribution.packaging.DistributionPackageBuilderProvider; import org.junit.Test; import java.util.ArrayList; 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=1750344&r1=1750343&r2=1750344&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 Mon Jun 27 14:11:06 2016 @@ -26,8 +26,8 @@ import org.apache.sling.distribution.Dis import org.apache.sling.distribution.DistributionRequestType; import org.apache.sling.distribution.SimpleDistributionRequest; import org.apache.sling.distribution.packaging.DistributionPackageProcessor; -import org.apache.sling.distribution.serialization.DistributionPackage; -import org.apache.sling.distribution.serialization.DistributionPackageBuilder; +import org.apache.sling.distribution.packaging.DistributionPackage; +import org.apache.sling.distribution.packaging.DistributionPackageBuilder; import org.junit.Test; import static org.junit.Assert.assertEquals; 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=1750344&r1=1750343&r2=1750344&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 Mon Jun 27 14:11:06 2016 @@ -27,8 +27,8 @@ import org.apache.sling.distribution.Dis import org.apache.sling.distribution.SimpleDistributionRequest; import org.apache.sling.distribution.log.impl.DefaultDistributionLog; import org.apache.sling.distribution.packaging.DistributionPackageProcessor; -import org.apache.sling.distribution.serialization.DistributionPackage; -import org.apache.sling.distribution.serialization.DistributionPackageBuilder; +import org.apache.sling.distribution.packaging.DistributionPackage; +import org.apache.sling.distribution.packaging.DistributionPackageBuilder; import org.apache.sling.distribution.transport.DistributionTransportSecretProvider; import org.junit.Test; @@ -38,7 +38,6 @@ import static org.junit.Assert.assertNul import static org.junit.Assert.assertTrue; import static org.mockito.Matchers.any; import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; /** * Testcase for {@link RemoteDistributionPackageExporter} Modified: sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/packaging/impl/importer/LocalDistributionPackageImporterTest.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/packaging/impl/importer/LocalDistributionPackageImporterTest.java?rev=1750344&r1=1750343&r2=1750344&view=diff ============================================================================== --- sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/packaging/impl/importer/LocalDistributionPackageImporterTest.java (original) +++ sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/packaging/impl/importer/LocalDistributionPackageImporterTest.java Mon Jun 27 14:11:06 2016 @@ -19,8 +19,8 @@ package org.apache.sling.distribution.packaging.impl.importer; import org.apache.sling.api.resource.ResourceResolver; -import org.apache.sling.distribution.serialization.DistributionPackage; -import org.apache.sling.distribution.serialization.DistributionPackageBuilder; +import org.apache.sling.distribution.packaging.DistributionPackage; +import org.apache.sling.distribution.packaging.DistributionPackageBuilder; import org.junit.Test; import static org.mockito.Mockito.mock; Modified: sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/packaging/impl/importer/RemoteDistributionPackageImporterTest.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/packaging/impl/importer/RemoteDistributionPackageImporterTest.java?rev=1750344&r1=1750343&r2=1750344&view=diff ============================================================================== --- sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/packaging/impl/importer/RemoteDistributionPackageImporterTest.java (original) +++ sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/packaging/impl/importer/RemoteDistributionPackageImporterTest.java Mon Jun 27 14:11:06 2016 @@ -20,8 +20,8 @@ package org.apache.sling.distribution.pa import org.apache.sling.api.resource.ResourceResolver; import org.apache.sling.distribution.log.impl.DefaultDistributionLog; -import org.apache.sling.distribution.serialization.DistributionPackage; -import org.apache.sling.distribution.serialization.DistributionPackageInfo; +import org.apache.sling.distribution.packaging.DistributionPackage; +import org.apache.sling.distribution.packaging.DistributionPackageInfo; import org.apache.sling.distribution.transport.DistributionTransportSecretProvider; import org.junit.Test; Modified: sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/packaging/impl/importer/RepositoryDistributionPackageImporterTest.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/packaging/impl/importer/RepositoryDistributionPackageImporterTest.java?rev=1750344&r1=1750343&r2=1750344&view=diff ============================================================================== --- sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/packaging/impl/importer/RepositoryDistributionPackageImporterTest.java (original) +++ sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/packaging/impl/importer/RepositoryDistributionPackageImporterTest.java Mon Jun 27 14:11:06 2016 @@ -29,7 +29,7 @@ import javax.jcr.security.Privilege; import org.apache.jackrabbit.JcrConstants; import org.apache.sling.api.resource.ResourceResolver; import org.apache.sling.distribution.common.DistributionException; -import org.apache.sling.distribution.serialization.DistributionPackage; +import org.apache.sling.distribution.packaging.DistributionPackage; 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/queue/impl/PriorityQueueDispatchingStrategyTest.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/queue/impl/PriorityQueueDispatchingStrategyTest.java?rev=1750344&r1=1750343&r2=1750344&view=diff ============================================================================== --- sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/queue/impl/PriorityQueueDispatchingStrategyTest.java (original) +++ sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/queue/impl/PriorityQueueDispatchingStrategyTest.java Mon Jun 27 14:11:06 2016 @@ -20,9 +20,9 @@ package org.apache.sling.distribution.queue.impl; -import org.apache.sling.distribution.serialization.DistributionPackage; -import org.apache.sling.distribution.serialization.DistributionPackageInfo; -import org.apache.sling.distribution.serialization.impl.SharedDistributionPackage; +import org.apache.sling.distribution.packaging.DistributionPackage; +import org.apache.sling.distribution.packaging.DistributionPackageInfo; +import org.apache.sling.distribution.packaging.impl.SharedDistributionPackage; import org.apache.sling.distribution.queue.DistributionQueue; import org.apache.sling.distribution.queue.DistributionQueueProvider; import org.junit.BeforeClass; Modified: sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/queue/impl/SingleQueueDistributionStrategyTest.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/queue/impl/SingleQueueDistributionStrategyTest.java?rev=1750344&r1=1750343&r2=1750344&view=diff ============================================================================== --- sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/queue/impl/SingleQueueDistributionStrategyTest.java (original) +++ sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/queue/impl/SingleQueueDistributionStrategyTest.java Mon Jun 27 14:11:06 2016 @@ -20,7 +20,7 @@ package org.apache.sling.distribution.qu import java.util.Iterator; -import org.apache.sling.distribution.serialization.DistributionPackage; +import org.apache.sling.distribution.packaging.DistributionPackage; import org.apache.sling.distribution.queue.DistributionQueue; import org.apache.sling.distribution.queue.DistributionQueueEntry; import org.apache.sling.distribution.queue.DistributionQueueItem; 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=1750344&r1=1750343&r2=1750344&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 Mon Jun 27 14:11:06 2016 @@ -22,7 +22,7 @@ import java.util.Collections; import java.util.Map; import org.apache.sling.distribution.DistributionRequestType; -import org.apache.sling.distribution.serialization.DistributionPackageInfo; +import org.apache.sling.distribution.packaging.DistributionPackageInfo; import org.apache.sling.distribution.queue.DistributionQueue; import org.apache.sling.distribution.queue.DistributionQueueItem; import org.apache.sling.distribution.queue.DistributionQueueItemState; @@ -36,7 +36,6 @@ import org.junit.Test; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyMap; import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; 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=1750344&r1=1750343&r2=1750344&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 Mon Jun 27 14:11:06 2016 @@ -21,14 +21,13 @@ package org.apache.sling.distribution.qu import java.util.Map; import org.apache.sling.distribution.DistributionRequestType; -import org.apache.sling.distribution.serialization.DistributionPackageInfo; +import org.apache.sling.distribution.packaging.DistributionPackageInfo; import org.apache.sling.distribution.queue.DistributionQueueItem; import org.junit.Test; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; /** * Testcase for {@link JobHandlingUtils} 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=1750344&r1=1750343&r2=1750344&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 Mon Jun 27 14:11:06 2016 @@ -35,9 +35,9 @@ import org.apache.sling.distribution.Dis import org.apache.sling.distribution.DistributionRequestType; import org.apache.sling.distribution.SimpleDistributionRequest; import org.apache.sling.distribution.log.impl.DefaultDistributionLog; -import org.apache.sling.distribution.serialization.DistributionPackage; -import org.apache.sling.distribution.serialization.DistributionPackageBuilder; -import org.apache.sling.distribution.serialization.DistributionPackageInfo; +import org.apache.sling.distribution.packaging.DistributionPackage; +import org.apache.sling.distribution.packaging.DistributionPackageBuilder; +import org.apache.sling.distribution.packaging.DistributionPackageInfo; import org.apache.sling.distribution.transport.DistributionTransportSecret; import org.apache.sling.distribution.transport.DistributionTransportSecretProvider; import org.junit.Test;
