You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by to...@apache.org on 2014/11/07 11:28:08 UTC
svn commit: r1637333 [11/12] - in /sling/trunk/contrib/extensions:
distribution/ distribution/core/
distribution/core/src/main/java/org/apache/sling/distribution/
distribution/core/src/main/java/org/apache/sling/distribution/agent/
distribution/core/sr...
Copied: sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/transport/impl/MultipleEndpointDistributionTransportHandlerTest.java (from r1637123, sling/trunk/contrib/extensions/replication/core/src/test/java/org/apache/sling/replication/transport/impl/MultipleEndpointReplicationTransportHandlerTest.java)
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/transport/impl/MultipleEndpointDistributionTransportHandlerTest.java?p2=sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/transport/impl/MultipleEndpointDistributionTransportHandlerTest.java&p1=sling/trunk/contrib/extensions/replication/core/src/test/java/org/apache/sling/replication/transport/impl/MultipleEndpointReplicationTransportHandlerTest.java&r1=1637123&r2=1637333&rev=1637333&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/test/java/org/apache/sling/replication/transport/impl/MultipleEndpointReplicationTransportHandlerTest.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/transport/impl/MultipleEndpointDistributionTransportHandlerTest.java Fri Nov 7 10:28:02 2014
@@ -16,15 +16,15 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.replication.transport.impl;
+package org.apache.sling.distribution.transport.impl;
import java.util.ArrayList;
import java.util.List;
import org.apache.sling.api.resource.ResourceResolver;
-import org.apache.sling.replication.communication.ReplicationRequest;
-import org.apache.sling.replication.packaging.ReplicationPackage;
-import org.apache.sling.replication.transport.ReplicationTransportHandler;
+import org.apache.sling.distribution.communication.DistributionRequest;
+import org.apache.sling.distribution.packaging.DistributionPackage;
+import org.apache.sling.distribution.transport.DistributionTransportHandler;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
@@ -35,154 +35,154 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
/**
- * Testcase for {@link org.apache.sling.replication.transport.impl.MultipleEndpointReplicationTransportHandler}
+ * Testcase for {@link MultipleEndpointDistributionTransportHandler}
*/
-public class MultipleEndpointReplicationTransportHandlerTest {
+public class MultipleEndpointDistributionTransportHandlerTest {
@Test
public void testDeliverPackageWithoutSubHandlers() throws Exception {
- List<ReplicationTransportHandler> subHandlers = new ArrayList<ReplicationTransportHandler>();
+ List<DistributionTransportHandler> subHandlers = new ArrayList<DistributionTransportHandler>();
ResourceResolver resourceResolver = mock(ResourceResolver.class);
- ReplicationPackage replicationPackage = mock(ReplicationPackage.class);
+ DistributionPackage distributionPackage = mock(DistributionPackage.class);
for (TransportEndpointStrategyType strategy : TransportEndpointStrategyType.values()) {
- MultipleEndpointReplicationTransportHandler multipleEndpointReplicationTransportHandler = new MultipleEndpointReplicationTransportHandler(subHandlers, strategy);
- multipleEndpointReplicationTransportHandler.deliverPackage(resourceResolver, replicationPackage);
+ MultipleEndpointDistributionTransportHandler multipleEndpointdistributionTransportHandler = new MultipleEndpointDistributionTransportHandler(subHandlers, strategy);
+ multipleEndpointdistributionTransportHandler.deliverPackage(resourceResolver, distributionPackage);
}
}
@Test
public void testRetrievePackagesWithoutSubHandlers() throws Exception {
- List<ReplicationTransportHandler> subHandlers = new ArrayList<ReplicationTransportHandler>();
+ List<DistributionTransportHandler> subHandlers = new ArrayList<DistributionTransportHandler>();
ResourceResolver resourceResolver = mock(ResourceResolver.class);
- ReplicationRequest replicationRequest = mock(ReplicationRequest.class);
+ DistributionRequest distributionRequest = mock(DistributionRequest.class);
for (TransportEndpointStrategyType strategy : TransportEndpointStrategyType.values()) {
- MultipleEndpointReplicationTransportHandler multipleEndpointReplicationTransportHandler = new MultipleEndpointReplicationTransportHandler(subHandlers, strategy);
- List<ReplicationPackage> replicationPackages = multipleEndpointReplicationTransportHandler.retrievePackages(resourceResolver, replicationRequest);
- assertNotNull(replicationPackages);
- assertTrue(replicationPackages.isEmpty());
+ MultipleEndpointDistributionTransportHandler multipleEndpointdistributionTransportHandler = new MultipleEndpointDistributionTransportHandler(subHandlers, strategy);
+ List<DistributionPackage> distributionPackages = multipleEndpointdistributionTransportHandler.retrievePackages(resourceResolver, distributionRequest);
+ assertNotNull(distributionPackages);
+ assertTrue(distributionPackages.isEmpty());
}
}
@Test
public void testDeliverPackageWithSubHandlers() throws Exception {
- List<ReplicationTransportHandler> subHandlers = new ArrayList<ReplicationTransportHandler>();
- subHandlers.add(mock(ReplicationTransportHandler.class));
- subHandlers.add(mock(ReplicationTransportHandler.class));
+ List<DistributionTransportHandler> subHandlers = new ArrayList<DistributionTransportHandler>();
+ subHandlers.add(mock(DistributionTransportHandler.class));
+ subHandlers.add(mock(DistributionTransportHandler.class));
ResourceResolver resourceResolver = mock(ResourceResolver.class);
- ReplicationPackage replicationPackage = mock(ReplicationPackage.class);
+ DistributionPackage distributionPackage = mock(DistributionPackage.class);
for (TransportEndpointStrategyType strategy : TransportEndpointStrategyType.values()) {
- MultipleEndpointReplicationTransportHandler multipleEndpointReplicationTransportHandler = new MultipleEndpointReplicationTransportHandler(subHandlers, strategy);
- multipleEndpointReplicationTransportHandler.deliverPackage(resourceResolver, replicationPackage);
+ MultipleEndpointDistributionTransportHandler multipleEndpointdistributionTransportHandler = new MultipleEndpointDistributionTransportHandler(subHandlers, strategy);
+ multipleEndpointdistributionTransportHandler.deliverPackage(resourceResolver, distributionPackage);
}
}
@Test
public void testRetrievePackagesWithSubHandlers() throws Exception {
- List<ReplicationTransportHandler> subHandlers = new ArrayList<ReplicationTransportHandler>();
- subHandlers.add(mock(ReplicationTransportHandler.class));
- subHandlers.add(mock(ReplicationTransportHandler.class));
+ List<DistributionTransportHandler> subHandlers = new ArrayList<DistributionTransportHandler>();
+ subHandlers.add(mock(DistributionTransportHandler.class));
+ subHandlers.add(mock(DistributionTransportHandler.class));
ResourceResolver resourceResolver = mock(ResourceResolver.class);
- ReplicationRequest replicationRequest = mock(ReplicationRequest.class);
+ DistributionRequest distributionRequest = mock(DistributionRequest.class);
for (TransportEndpointStrategyType strategy : TransportEndpointStrategyType.values()) {
- MultipleEndpointReplicationTransportHandler multipleEndpointReplicationTransportHandler = new MultipleEndpointReplicationTransportHandler(subHandlers, strategy);
- List<ReplicationPackage> replicationPackages = multipleEndpointReplicationTransportHandler.retrievePackages(resourceResolver, replicationRequest);
- assertNotNull(replicationPackages);
- assertTrue(replicationPackages.isEmpty());
+ MultipleEndpointDistributionTransportHandler multipleEndpointdistributionTransportHandler = new MultipleEndpointDistributionTransportHandler(subHandlers, strategy);
+ List<DistributionPackage> distributionPackages = multipleEndpointdistributionTransportHandler.retrievePackages(resourceResolver, distributionRequest);
+ assertNotNull(distributionPackages);
+ assertTrue(distributionPackages.isEmpty());
}
}
@Test
public void testRetrievePackagesWithOneReturningSubHandlerAndAllStrategy() throws Exception {
- ReplicationRequest replicationRequest = mock(ReplicationRequest.class);
+ DistributionRequest distributionRequest = mock(DistributionRequest.class);
ResourceResolver resourceResolver = mock(ResourceResolver.class);
- List<ReplicationTransportHandler> subHandlers = new ArrayList<ReplicationTransportHandler>();
- ReplicationTransportHandler handler1 = mock(ReplicationTransportHandler.class);
- List<ReplicationPackage> packages1 = new ArrayList<ReplicationPackage>();
- packages1.add(mock(ReplicationPackage.class));
- packages1.add(mock(ReplicationPackage.class));
- when(handler1.retrievePackages(resourceResolver, replicationRequest)).thenReturn(packages1);
+ List<DistributionTransportHandler> subHandlers = new ArrayList<DistributionTransportHandler>();
+ DistributionTransportHandler handler1 = mock(DistributionTransportHandler.class);
+ List<DistributionPackage> packages1 = new ArrayList<DistributionPackage>();
+ packages1.add(mock(DistributionPackage.class));
+ packages1.add(mock(DistributionPackage.class));
+ when(handler1.retrievePackages(resourceResolver, distributionRequest)).thenReturn(packages1);
subHandlers.add(handler1);
- subHandlers.add(mock(ReplicationTransportHandler.class));
- MultipleEndpointReplicationTransportHandler multipleEndpointReplicationTransportHandler = new MultipleEndpointReplicationTransportHandler(
+ subHandlers.add(mock(DistributionTransportHandler.class));
+ MultipleEndpointDistributionTransportHandler multipleEndpointdistributionTransportHandler = new MultipleEndpointDistributionTransportHandler(
subHandlers, TransportEndpointStrategyType.All);
- List<ReplicationPackage> replicationPackages = multipleEndpointReplicationTransportHandler.retrievePackages(resourceResolver, replicationRequest);
- assertNotNull(replicationPackages);
- assertFalse(replicationPackages.isEmpty());
- assertEquals(2, replicationPackages.size());
+ List<DistributionPackage> distributionPackages = multipleEndpointdistributionTransportHandler.retrievePackages(resourceResolver, distributionRequest);
+ assertNotNull(distributionPackages);
+ assertFalse(distributionPackages.isEmpty());
+ assertEquals(2, distributionPackages.size());
}
@Test
public void testRetrievePackagesWithOneEmptyOneReturningSubHandlerAndOneStrategy() throws Exception {
- ReplicationRequest replicationRequest = mock(ReplicationRequest.class);
+ DistributionRequest distributionRequest = mock(DistributionRequest.class);
ResourceResolver resourceResolver = mock(ResourceResolver.class);
- List<ReplicationTransportHandler> subHandlers = new ArrayList<ReplicationTransportHandler>();
- subHandlers.add(mock(ReplicationTransportHandler.class));
- ReplicationTransportHandler handler2 = mock(ReplicationTransportHandler.class);
- List<ReplicationPackage> packages2 = new ArrayList<ReplicationPackage>();
- packages2.add(mock(ReplicationPackage.class));
- packages2.add(mock(ReplicationPackage.class));
- when(handler2.retrievePackages(resourceResolver, replicationRequest)).thenReturn(packages2);
+ List<DistributionTransportHandler> subHandlers = new ArrayList<DistributionTransportHandler>();
+ subHandlers.add(mock(DistributionTransportHandler.class));
+ DistributionTransportHandler handler2 = mock(DistributionTransportHandler.class);
+ List<DistributionPackage> packages2 = new ArrayList<DistributionPackage>();
+ packages2.add(mock(DistributionPackage.class));
+ packages2.add(mock(DistributionPackage.class));
+ when(handler2.retrievePackages(resourceResolver, distributionRequest)).thenReturn(packages2);
subHandlers.add(handler2);
- MultipleEndpointReplicationTransportHandler multipleEndpointReplicationTransportHandler = new MultipleEndpointReplicationTransportHandler(
+ MultipleEndpointDistributionTransportHandler multipleEndpointdistributionTransportHandler = new MultipleEndpointDistributionTransportHandler(
subHandlers, TransportEndpointStrategyType.One);
- List<ReplicationPackage> replicationPackages = multipleEndpointReplicationTransportHandler.retrievePackages(resourceResolver, replicationRequest);
- assertNotNull(replicationPackages);
- assertTrue(replicationPackages.isEmpty());
+ List<DistributionPackage> distributionPackages = multipleEndpointdistributionTransportHandler.retrievePackages(resourceResolver, distributionRequest);
+ assertNotNull(distributionPackages);
+ assertTrue(distributionPackages.isEmpty());
}
@Test
public void testRetrievePackagesWithTwoReturningSubHandlersAndAllStrategy() throws Exception {
- ReplicationRequest replicationRequest = mock(ReplicationRequest.class);
+ DistributionRequest distributionRequest = mock(DistributionRequest.class);
ResourceResolver resourceResolver = mock(ResourceResolver.class);
- List<ReplicationTransportHandler> subHandlers = new ArrayList<ReplicationTransportHandler>();
- ReplicationTransportHandler handler1 = mock(ReplicationTransportHandler.class);
- List<ReplicationPackage> packages1 = new ArrayList<ReplicationPackage>();
- packages1.add(mock(ReplicationPackage.class));
- packages1.add(mock(ReplicationPackage.class));
- when(handler1.retrievePackages(resourceResolver, replicationRequest)).thenReturn(packages1);
+ List<DistributionTransportHandler> subHandlers = new ArrayList<DistributionTransportHandler>();
+ DistributionTransportHandler handler1 = mock(DistributionTransportHandler.class);
+ List<DistributionPackage> packages1 = new ArrayList<DistributionPackage>();
+ packages1.add(mock(DistributionPackage.class));
+ packages1.add(mock(DistributionPackage.class));
+ when(handler1.retrievePackages(resourceResolver, distributionRequest)).thenReturn(packages1);
subHandlers.add(handler1);
- ReplicationTransportHandler handler2 = mock(ReplicationTransportHandler.class);
- List<ReplicationPackage> packages2 = new ArrayList<ReplicationPackage>();
- packages2.add(mock(ReplicationPackage.class));
- packages2.add(mock(ReplicationPackage.class));
- packages2.add(mock(ReplicationPackage.class));
- when(handler2.retrievePackages(resourceResolver, replicationRequest)).thenReturn(packages2);
+ DistributionTransportHandler handler2 = mock(DistributionTransportHandler.class);
+ List<DistributionPackage> packages2 = new ArrayList<DistributionPackage>();
+ packages2.add(mock(DistributionPackage.class));
+ packages2.add(mock(DistributionPackage.class));
+ packages2.add(mock(DistributionPackage.class));
+ when(handler2.retrievePackages(resourceResolver, distributionRequest)).thenReturn(packages2);
subHandlers.add(handler2);
- MultipleEndpointReplicationTransportHandler multipleEndpointReplicationTransportHandler = new MultipleEndpointReplicationTransportHandler(
+ MultipleEndpointDistributionTransportHandler multipleEndpointdistributionTransportHandler = new MultipleEndpointDistributionTransportHandler(
subHandlers, TransportEndpointStrategyType.All);
- List<ReplicationPackage> replicationPackages = multipleEndpointReplicationTransportHandler.retrievePackages(resourceResolver, replicationRequest);
- assertNotNull(replicationPackages);
- assertFalse(replicationPackages.isEmpty());
- assertEquals(5, replicationPackages.size());
+ List<DistributionPackage> distributionPackages = multipleEndpointdistributionTransportHandler.retrievePackages(resourceResolver, distributionRequest);
+ assertNotNull(distributionPackages);
+ assertFalse(distributionPackages.isEmpty());
+ assertEquals(5, distributionPackages.size());
}
@Test
public void testRetrievePackagesWithTwoReturningSubHandlersAndOneStrategy() throws Exception {
- ReplicationRequest replicationRequest = mock(ReplicationRequest.class);
+ DistributionRequest distributionRequest = mock(DistributionRequest.class);
ResourceResolver resourceResolver = mock(ResourceResolver.class);
- List<ReplicationTransportHandler> subHandlers = new ArrayList<ReplicationTransportHandler>();
- ReplicationTransportHandler handler1 = mock(ReplicationTransportHandler.class);
- List<ReplicationPackage> packages1 = new ArrayList<ReplicationPackage>();
- packages1.add(mock(ReplicationPackage.class));
- packages1.add(mock(ReplicationPackage.class));
- when(handler1.retrievePackages(resourceResolver, replicationRequest)).thenReturn(packages1);
+ List<DistributionTransportHandler> subHandlers = new ArrayList<DistributionTransportHandler>();
+ DistributionTransportHandler handler1 = mock(DistributionTransportHandler.class);
+ List<DistributionPackage> packages1 = new ArrayList<DistributionPackage>();
+ packages1.add(mock(DistributionPackage.class));
+ packages1.add(mock(DistributionPackage.class));
+ when(handler1.retrievePackages(resourceResolver, distributionRequest)).thenReturn(packages1);
subHandlers.add(handler1);
- ReplicationTransportHandler handler2 = mock(ReplicationTransportHandler.class);
- List<ReplicationPackage> packages2 = new ArrayList<ReplicationPackage>();
- packages2.add(mock(ReplicationPackage.class));
- packages2.add(mock(ReplicationPackage.class));
- packages2.add(mock(ReplicationPackage.class));
- when(handler2.retrievePackages(resourceResolver, replicationRequest)).thenReturn(packages2);
+ DistributionTransportHandler handler2 = mock(DistributionTransportHandler.class);
+ List<DistributionPackage> packages2 = new ArrayList<DistributionPackage>();
+ packages2.add(mock(DistributionPackage.class));
+ packages2.add(mock(DistributionPackage.class));
+ packages2.add(mock(DistributionPackage.class));
+ when(handler2.retrievePackages(resourceResolver, distributionRequest)).thenReturn(packages2);
subHandlers.add(handler2);
- MultipleEndpointReplicationTransportHandler multipleEndpointReplicationTransportHandler = new MultipleEndpointReplicationTransportHandler(
+ MultipleEndpointDistributionTransportHandler multipleEndpointdistributionTransportHandler = new MultipleEndpointDistributionTransportHandler(
subHandlers, TransportEndpointStrategyType.One);
- List<ReplicationPackage> replicationPackages = multipleEndpointReplicationTransportHandler.retrievePackages(resourceResolver, replicationRequest);
- assertNotNull(replicationPackages);
- assertFalse(replicationPackages.isEmpty());
- assertEquals(2, replicationPackages.size());
+ List<DistributionPackage> distributionPackages = multipleEndpointdistributionTransportHandler.retrievePackages(resourceResolver, distributionRequest);
+ assertNotNull(distributionPackages);
+ assertFalse(distributionPackages.isEmpty());
+ assertEquals(2, distributionPackages.size());
}
}
\ No newline at end of file
Copied: sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/transport/impl/SimpleHttpDistributionTransportHandlerTest.java (from r1637123, sling/trunk/contrib/extensions/replication/core/src/test/java/org/apache/sling/replication/transport/impl/SimpleHttpReplicationTransportHandlerTest.java)
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/transport/impl/SimpleHttpDistributionTransportHandlerTest.java?p2=sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/transport/impl/SimpleHttpDistributionTransportHandlerTest.java&p1=sling/trunk/contrib/extensions/replication/core/src/test/java/org/apache/sling/replication/transport/impl/SimpleHttpReplicationTransportHandlerTest.java&r1=1637123&r2=1637333&rev=1637333&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/test/java/org/apache/sling/replication/transport/impl/SimpleHttpReplicationTransportHandlerTest.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/transport/impl/SimpleHttpDistributionTransportHandlerTest.java Fri Nov 7 10:28:02 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.replication.transport.impl;
+package org.apache.sling.distribution.transport.impl;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
@@ -29,14 +29,13 @@ 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.replication.communication.ReplicationActionType;
-import org.apache.sling.replication.transport.impl.ReplicationEndpoint;
-import org.apache.sling.replication.communication.ReplicationRequest;
-import org.apache.sling.replication.packaging.ReplicationPackage;
-import org.apache.sling.replication.packaging.ReplicationPackageInfo;
-import org.apache.sling.replication.serialization.ReplicationPackageBuilder;
-import org.apache.sling.replication.transport.authentication.TransportAuthenticationContext;
-import org.apache.sling.replication.transport.authentication.TransportAuthenticationProvider;
+import org.apache.sling.distribution.communication.DistributionActionType;
+import org.apache.sling.distribution.communication.DistributionRequest;
+import org.apache.sling.distribution.packaging.DistributionPackage;
+import org.apache.sling.distribution.packaging.DistributionPackageInfo;
+import org.apache.sling.distribution.serialization.DistributionPackageBuilder;
+import org.apache.sling.distribution.transport.authentication.TransportAuthenticationContext;
+import org.apache.sling.distribution.transport.authentication.TransportAuthenticationProvider;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
@@ -45,13 +44,12 @@ import static org.junit.Assert.assertNot
import static org.junit.Assert.assertTrue;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.mockingDetails;
import static org.mockito.Mockito.when;
/**
- * Testcase for {@link org.apache.sling.replication.transport.impl.SimpleHttpReplicationTransportHandler}
+ * Testcase for {@link SimpleHttpDistributionTransportHandler}
*/
-public class SimpleHttpReplicationTransportHandlerTest {
+public class SimpleHttpDistributionTransportHandlerTest {
@Test
public void testDeliverPackage() throws Exception {
@@ -61,17 +59,17 @@ public class SimpleHttpReplicationTransp
Response response = mock(Response.class);
when(executor.execute(any(Request.class))).thenReturn(response);
when(authProvider.authenticate(any(Executor.class), any(TransportAuthenticationContext.class))).thenReturn(executor);
- ReplicationEndpoint endpoint = new ReplicationEndpoint("http://127.0.0.1:8080/some/resource");
- ReplicationPackageBuilder packageBuilder = mock(ReplicationPackageBuilder.class);
+ DistributionEndpoint endpoint = new DistributionEndpoint("http://127.0.0.1:8080/some/resource");
+ DistributionPackageBuilder packageBuilder = mock(DistributionPackageBuilder.class);
int maxNoOfPackages = Integer.MAX_VALUE;
- SimpleHttpReplicationTransportHandler simpleHttpReplicationTransportHandler = new SimpleHttpReplicationTransportHandler(
+ SimpleHttpDistributionTransportHandler simpleHttpdistributionTransportHandler = new SimpleHttpDistributionTransportHandler(
authProvider, endpoint, packageBuilder, maxNoOfPackages);
ResourceResolver resourceResolver = mock(ResourceResolver.class);
- ReplicationPackage replicationPackage = mock(ReplicationPackage.class);
- when(replicationPackage.getInfo()).thenReturn(mock(ReplicationPackageInfo.class));
+ DistributionPackage distributionPackage = mock(DistributionPackage.class);
+ when(distributionPackage.getInfo()).thenReturn(mock(DistributionPackageInfo.class));
InputStream stream = mock(InputStream.class);
- when(replicationPackage.createInputStream()).thenReturn(stream);
- simpleHttpReplicationTransportHandler.deliverPackage(resourceResolver, replicationPackage);
+ when(distributionPackage.createInputStream()).thenReturn(stream);
+ simpleHttpdistributionTransportHandler.deliverPackage(resourceResolver, distributionPackage);
}
@Test
@@ -87,14 +85,14 @@ public class SimpleHttpReplicationTransp
when(response.returnResponse()).thenReturn(httpResponse);
when(executor.execute(any(Request.class))).thenReturn(response);
when(authProvider.authenticate(any(Executor.class), any(TransportAuthenticationContext.class))).thenReturn(executor);
- ReplicationEndpoint endpoint = new ReplicationEndpoint("http://127.0.0.1:8080/some/resource");
- ReplicationPackageBuilder packageBuilder = mock(ReplicationPackageBuilder.class);
+ DistributionEndpoint endpoint = new DistributionEndpoint("http://127.0.0.1:8080/some/resource");
+ DistributionPackageBuilder packageBuilder = mock(DistributionPackageBuilder.class);
int maxNoOfPackages = 1;
- SimpleHttpReplicationTransportHandler simpleHttpReplicationTransportHandler = new SimpleHttpReplicationTransportHandler(
+ SimpleHttpDistributionTransportHandler simpleHttpdistributionTransportHandler = new SimpleHttpDistributionTransportHandler(
authProvider, endpoint, packageBuilder, maxNoOfPackages);
ResourceResolver resourceResolver = mock(ResourceResolver.class);
- ReplicationRequest replicationRequest = new ReplicationRequest(ReplicationActionType.ADD, new String[]{"/"});
- List<ReplicationPackage> packages = simpleHttpReplicationTransportHandler.retrievePackages(resourceResolver, replicationRequest);
+ DistributionRequest distributionRequest = new DistributionRequest(DistributionActionType.ADD, new String[]{"/"});
+ List<DistributionPackage> packages = simpleHttpdistributionTransportHandler.retrievePackages(resourceResolver, distributionRequest);
assertNotNull(packages);
assertTrue(packages.isEmpty());
}
@@ -116,17 +114,17 @@ public class SimpleHttpReplicationTransp
when(response.returnResponse()).thenReturn(httpResponse);
when(executor.execute(any(Request.class))).thenReturn(response);
when(authProvider.authenticate(any(Executor.class), any(TransportAuthenticationContext.class))).thenReturn(executor);
- ReplicationEndpoint endpoint = new ReplicationEndpoint("http://127.0.0.1:8080/some/resource");
- ReplicationPackageBuilder packageBuilder = mock(ReplicationPackageBuilder.class);
- ReplicationPackage replicationPackage = mock(ReplicationPackage.class);
- when(replicationPackage.getInfo()).thenReturn(mock(ReplicationPackageInfo.class));
- when(packageBuilder.readPackage(any(ResourceResolver.class), any(InputStream.class))).thenReturn(replicationPackage);
+ DistributionEndpoint endpoint = new DistributionEndpoint("http://127.0.0.1:8080/some/resource");
+ DistributionPackageBuilder packageBuilder = mock(DistributionPackageBuilder.class);
+ DistributionPackage distributionPackage = mock(DistributionPackage.class);
+ when(distributionPackage.getInfo()).thenReturn(mock(DistributionPackageInfo.class));
+ when(packageBuilder.readPackage(any(ResourceResolver.class), any(InputStream.class))).thenReturn(distributionPackage);
int maxNoOfPackages = 1;
- SimpleHttpReplicationTransportHandler simpleHttpReplicationTransportHandler = new SimpleHttpReplicationTransportHandler(
+ SimpleHttpDistributionTransportHandler simpleHttpdistributionTransportHandler = new SimpleHttpDistributionTransportHandler(
authProvider, endpoint, packageBuilder, maxNoOfPackages);
ResourceResolver resourceResolver = mock(ResourceResolver.class);
- ReplicationRequest replicationRequest = new ReplicationRequest(ReplicationActionType.ADD, new String[]{"/"});
- List<ReplicationPackage> packages = simpleHttpReplicationTransportHandler.retrievePackages(resourceResolver, replicationRequest);
+ DistributionRequest distributionRequest = new DistributionRequest(DistributionActionType.ADD, new String[]{"/"});
+ List<DistributionPackage> packages = simpleHttpdistributionTransportHandler.retrievePackages(resourceResolver, distributionRequest);
assertNotNull(packages);
assertFalse(packages.isEmpty());
assertEquals(1, packages.size());
Copied: sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/trigger/impl/ChainDistributionTriggerTest.java (from r1637123, sling/trunk/contrib/extensions/replication/core/src/test/java/org/apache/sling/replication/trigger/impl/ChainReplicateReplicationTriggerTest.java)
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/trigger/impl/ChainDistributionTriggerTest.java?p2=sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/trigger/impl/ChainDistributionTriggerTest.java&p1=sling/trunk/contrib/extensions/replication/core/src/test/java/org/apache/sling/replication/trigger/impl/ChainReplicateReplicationTriggerTest.java&r1=1637123&r2=1637333&rev=1637333&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/test/java/org/apache/sling/replication/trigger/impl/ChainReplicateReplicationTriggerTest.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/trigger/impl/ChainDistributionTriggerTest.java Fri Nov 7 10:28:02 2014
@@ -16,50 +16,50 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.replication.trigger.impl;
+package org.apache.sling.distribution.trigger.impl;
-import org.apache.sling.replication.trigger.ReplicationRequestHandler;
+import org.apache.sling.distribution.trigger.DistributionRequestHandler;
import org.junit.Test;
import org.osgi.framework.BundleContext;
import static org.mockito.Mockito.mock;
/**
- * Testcase for {@link org.apache.sling.replication.trigger.impl.ChainReplicateReplicationTrigger}
+ * Testcase for {@link ChainDistributeDistributionTrigger}
*/
-public class ChainReplicateReplicationTriggerTest {
+public class ChainDistributionTriggerTest {
@Test
public void testRegister() throws Exception {
String pathPrefix = "/prefix";
BundleContext bundleContext = mock(BundleContext.class);
- ChainReplicateReplicationTrigger chainReplicateReplicationTrigger = new ChainReplicateReplicationTrigger(pathPrefix, bundleContext);
- ReplicationRequestHandler handler = mock(ReplicationRequestHandler.class);
- chainReplicateReplicationTrigger.register(handler);
+ ChainDistributeDistributionTrigger chainReplicatedistributionTrigger = new ChainDistributeDistributionTrigger(pathPrefix, bundleContext);
+ DistributionRequestHandler handler = mock(DistributionRequestHandler.class);
+ chainReplicatedistributionTrigger.register(handler);
}
@Test
public void testUnregister() throws Exception {
String pathPrefix = "/prefix";
BundleContext bundleContext = mock(BundleContext.class);
- ChainReplicateReplicationTrigger chainReplicateReplicationTrigger = new ChainReplicateReplicationTrigger(pathPrefix, bundleContext);
- ReplicationRequestHandler handler = mock(ReplicationRequestHandler.class);
- chainReplicateReplicationTrigger.unregister(handler);
+ ChainDistributeDistributionTrigger chainReplicatedistributionTrigger = new ChainDistributeDistributionTrigger(pathPrefix, bundleContext);
+ DistributionRequestHandler handler = mock(DistributionRequestHandler.class);
+ chainReplicatedistributionTrigger.unregister(handler);
}
@Test
public void testEnable() throws Exception {
String pathPrefix = "/prefix";
BundleContext bundleContext = mock(BundleContext.class);
- ChainReplicateReplicationTrigger chainReplicateReplicationTrigger = new ChainReplicateReplicationTrigger(pathPrefix, bundleContext);
- chainReplicateReplicationTrigger.enable();
+ ChainDistributeDistributionTrigger chainReplicatedistributionTrigger = new ChainDistributeDistributionTrigger(pathPrefix, bundleContext);
+ chainReplicatedistributionTrigger.enable();
}
@Test
public void testDisable() throws Exception {
String pathPrefix = "/prefix";
BundleContext bundleContext = mock(BundleContext.class);
- ChainReplicateReplicationTrigger chainReplicateReplicationTrigger = new ChainReplicateReplicationTrigger(pathPrefix, bundleContext);
- chainReplicateReplicationTrigger.disable();
+ ChainDistributeDistributionTrigger chainReplicatedistributionTrigger = new ChainDistributeDistributionTrigger(pathPrefix, bundleContext);
+ chainReplicatedistributionTrigger.disable();
}
}
\ No newline at end of file
Copied: sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/trigger/impl/JcrEventDistributionTriggerTest.java (from r1637123, sling/trunk/contrib/extensions/replication/core/src/test/java/org/apache/sling/replication/trigger/impl/JcrEventReplicationTriggerTest.java)
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/trigger/impl/JcrEventDistributionTriggerTest.java?p2=sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/trigger/impl/JcrEventDistributionTriggerTest.java&p1=sling/trunk/contrib/extensions/replication/core/src/test/java/org/apache/sling/replication/trigger/impl/JcrEventReplicationTriggerTest.java&r1=1637123&r2=1637333&rev=1637333&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/test/java/org/apache/sling/replication/trigger/impl/JcrEventReplicationTriggerTest.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/trigger/impl/JcrEventDistributionTriggerTest.java Fri Nov 7 10:28:02 2014
@@ -16,12 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.replication.trigger.impl;
+package org.apache.sling.distribution.trigger.impl;
import javax.jcr.observation.Event;
import org.apache.sling.jcr.api.SlingRepository;
-import org.apache.sling.replication.communication.ReplicationRequest;
+import org.apache.sling.distribution.communication.DistributionRequest;
import org.junit.Test;
import static org.junit.Assert.assertNotNull;
@@ -30,19 +30,19 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
/**
- * Testcase for {@link org.apache.sling.replication.trigger.impl.JcrEventReplicationTrigger}
+ * Testcase for {@link JcrEventDistributionTrigger}
*/
-public class JcrEventReplicationTriggerTest {
+public class JcrEventDistributionTriggerTest {
@Test
public void testProcessEventWithoutPathProperty() throws Exception {
SlingRepository repository = mock(SlingRepository.class);
String path = "/some/path";
String serviceName = "serviceId";
- JcrEventReplicationTrigger jcrEventReplicationTrigger = new JcrEventReplicationTrigger(repository, path, serviceName);
+ JcrEventDistributionTrigger jcrEventdistributionTrigger = new JcrEventDistributionTrigger(repository, path, serviceName);
Event event = mock(Event.class);
- ReplicationRequest replicationRequest = jcrEventReplicationTrigger.processEvent(event);
- assertNull(replicationRequest);
+ DistributionRequest distributionRequest = jcrEventdistributionTrigger.processEvent(event);
+ assertNull(distributionRequest);
}
@Test
@@ -50,10 +50,10 @@ public class JcrEventReplicationTriggerT
SlingRepository repository = mock(SlingRepository.class);
String path = "/some/path";
String serviceName = "serviceId";
- JcrEventReplicationTrigger jcrEventReplicationTrigger = new JcrEventReplicationTrigger(repository, path, serviceName);
+ JcrEventDistributionTrigger jcrEventdistributionTrigger = new JcrEventDistributionTrigger(repository, path, serviceName);
Event event = mock(Event.class);
when(event.getPath()).thenReturn("/some/path/generating/event");
- ReplicationRequest replicationRequest = jcrEventReplicationTrigger.processEvent(event);
- assertNotNull(replicationRequest);
+ DistributionRequest distributionRequest = jcrEventdistributionTrigger.processEvent(event);
+ assertNotNull(distributionRequest);
}
}
\ No newline at end of file
Copied: sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/trigger/impl/PersistingJcrEventDistributionTriggerTest.java (from r1637123, sling/trunk/contrib/extensions/replication/core/src/test/java/org/apache/sling/replication/trigger/impl/PersistingJcrEventReplicationTriggerTest.java)
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/trigger/impl/PersistingJcrEventDistributionTriggerTest.java?p2=sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/trigger/impl/PersistingJcrEventDistributionTriggerTest.java&p1=sling/trunk/contrib/extensions/replication/core/src/test/java/org/apache/sling/replication/trigger/impl/PersistingJcrEventReplicationTriggerTest.java&r1=1637123&r2=1637333&rev=1637333&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/test/java/org/apache/sling/replication/trigger/impl/PersistingJcrEventReplicationTriggerTest.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/trigger/impl/PersistingJcrEventDistributionTriggerTest.java Fri Nov 7 10:28:02 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.replication.trigger.impl;
+package org.apache.sling.distribution.trigger.impl;
import javax.jcr.Node;
import javax.jcr.Session;
@@ -25,8 +25,8 @@ import javax.jcr.observation.Event;
import javax.jcr.observation.ObservationManager;
import org.apache.sling.jcr.api.SlingRepository;
-import org.apache.sling.replication.communication.ReplicationRequest;
-import org.apache.sling.replication.trigger.ReplicationRequestHandler;
+import org.apache.sling.distribution.communication.DistributionRequest;
+import org.apache.sling.distribution.trigger.DistributionRequestHandler;
import org.junit.Test;
import static org.junit.Assert.assertNotNull;
@@ -37,9 +37,9 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
/**
- * Testcase for {@link org.apache.sling.replication.trigger.impl.PersistingJcrEventReplicationTrigger}
+ * Testcase for {@link PersistingJcrEventDistributionTrigger}
*/
-public class PersistingJcrEventReplicationTriggerTest {
+public class PersistingJcrEventDistributionTriggerTest {
@Test
public void testProcessEventWithoutPrivileges() throws Exception {
@@ -50,11 +50,11 @@ public class PersistingJcrEventReplicati
when(repository.loginService(serviceName, null)).thenReturn(session);
String path = "/some/path";
String nuggetsPath = "/var/nuggets";
- PersistingJcrEventReplicationTrigger persistingJcrEventReplicationTrigger = new PersistingJcrEventReplicationTrigger(
+ PersistingJcrEventDistributionTrigger persistingJcrEventdistributionTrigger = new PersistingJcrEventDistributionTrigger(
repository, path, serviceName, nuggetsPath);
Event event = mock(Event.class);
- ReplicationRequest replicationRequest = persistingJcrEventReplicationTrigger.processEvent(event);
- assertNull(replicationRequest);
+ DistributionRequest distributionRequest = persistingJcrEventdistributionTrigger.processEvent(event);
+ assertNull(distributionRequest);
}
@Test
@@ -75,11 +75,11 @@ public class PersistingJcrEventReplicati
when(repository.loginService(serviceName, null)).thenReturn(session);
String path = "/some/path";
String nuggetsPath = "/var/nuggets";
- PersistingJcrEventReplicationTrigger persistingJcrEventReplicationTrigger = new PersistingJcrEventReplicationTrigger(
+ PersistingJcrEventDistributionTrigger persistingJcrEventdistributionTrigger = new PersistingJcrEventDistributionTrigger(
repository, path, serviceName, nuggetsPath);
Event event = mock(Event.class);
- ReplicationRequest replicationRequest = persistingJcrEventReplicationTrigger.processEvent(event);
- assertNull(replicationRequest);
+ DistributionRequest distributionRequest = persistingJcrEventdistributionTrigger.processEvent(event);
+ assertNull(distributionRequest);
}
@Test
@@ -98,10 +98,10 @@ public class PersistingJcrEventReplicati
when(repository.loginService(serviceName, null)).thenReturn(session);
String path = "/some/path";
- PersistingJcrEventReplicationTrigger persistingJcrEventReplicationTrigger = new PersistingJcrEventReplicationTrigger(
+ PersistingJcrEventDistributionTrigger persistingJcrEventdistributionTrigger = new PersistingJcrEventDistributionTrigger(
repository, path, serviceName, nuggetsPath);
- ReplicationRequestHandler handler = mock(ReplicationRequestHandler.class);
- persistingJcrEventReplicationTrigger.register(handler);
+ DistributionRequestHandler handler = mock(DistributionRequestHandler.class);
+ persistingJcrEventdistributionTrigger.register(handler);
Node nuggetsNode = mock(Node.class);
Node eventNode = mock(Node.class);
@@ -109,8 +109,8 @@ public class PersistingJcrEventReplicati
when(session.getNode(nuggetsPath)).thenReturn(nuggetsNode);
Event event = mock(Event.class);
when(event.getPath()).thenReturn("/some/path/generating/event");
- ReplicationRequest replicationRequest = persistingJcrEventReplicationTrigger.processEvent(event);
- assertNotNull(replicationRequest);
+ DistributionRequest distributionRequest = persistingJcrEventdistributionTrigger.processEvent(event);
+ assertNotNull(distributionRequest);
}
@Test
@@ -136,17 +136,17 @@ public class PersistingJcrEventReplicati
when(repository.loginService(serviceName, null)).thenReturn(session);
String path = "/some/path";
- PersistingJcrEventReplicationTrigger persistingJcrEventReplicationTrigger = new PersistingJcrEventReplicationTrigger(
+ PersistingJcrEventDistributionTrigger persistingJcrEventdistributionTrigger = new PersistingJcrEventDistributionTrigger(
repository, path, serviceName, nuggetsPath);
- ReplicationRequestHandler handler = mock(ReplicationRequestHandler.class);
- persistingJcrEventReplicationTrigger.register(handler);
+ DistributionRequestHandler handler = mock(DistributionRequestHandler.class);
+ persistingJcrEventdistributionTrigger.register(handler);
Node eventNode = mock(Node.class);
when(nuggetsNode.addNode(any(String.class), any(String.class))).thenReturn(eventNode);
when(session.getNode(nuggetsPath)).thenReturn(nuggetsNode);
Event event = mock(Event.class);
when(event.getPath()).thenReturn("/some/path/generating/event");
- ReplicationRequest replicationRequest = persistingJcrEventReplicationTrigger.processEvent(event);
- assertNotNull(replicationRequest);
+ DistributionRequest distributionRequest = persistingJcrEventdistributionTrigger.processEvent(event);
+ assertNotNull(distributionRequest);
}
}
\ No newline at end of file
Copied: sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/trigger/impl/RemoteEventDistributionTriggerTest.java (from r1637123, sling/trunk/contrib/extensions/replication/core/src/test/java/org/apache/sling/replication/trigger/impl/RemoteEventReplicationTriggerTest.java)
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/trigger/impl/RemoteEventDistributionTriggerTest.java?p2=sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/trigger/impl/RemoteEventDistributionTriggerTest.java&p1=sling/trunk/contrib/extensions/replication/core/src/test/java/org/apache/sling/replication/trigger/impl/RemoteEventReplicationTriggerTest.java&r1=1637123&r2=1637333&rev=1637333&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/test/java/org/apache/sling/replication/trigger/impl/RemoteEventReplicationTriggerTest.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/trigger/impl/RemoteEventDistributionTriggerTest.java Fri Nov 7 10:28:02 2014
@@ -16,26 +16,26 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.replication.trigger.impl;
+package org.apache.sling.distribution.trigger.impl;
import org.apache.http.client.CredentialsProvider;
import org.apache.sling.commons.scheduler.ScheduleOptions;
import org.apache.sling.commons.scheduler.Scheduler;
-import org.apache.sling.replication.transport.authentication.TransportAuthenticationProvider;
-import org.apache.sling.replication.trigger.ReplicationRequestHandler;
+import org.apache.sling.distribution.transport.authentication.TransportAuthenticationProvider;
+import org.apache.sling.distribution.trigger.DistributionRequestHandler;
import org.junit.Test;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
/**
- * Testcase for {@link org.apache.sling.replication.trigger.impl.RemoteEventReplicationTrigger}
+ * Testcase for {@link RemoteEventDistributionTrigger}
*/
-public class RemoteEventReplicationTriggerTest {
+public class RemoteEventDistributionTriggerTest {
@Test
public void testRegister() throws Exception {
- ReplicationRequestHandler handler = mock(ReplicationRequestHandler.class);
+ DistributionRequestHandler handler = mock(DistributionRequestHandler.class);
String endpoint = "";
TransportAuthenticationProvider<CredentialsProvider, CredentialsProvider> authProvider = mock(TransportAuthenticationProvider.class);
when(authProvider.canAuthenticate(CredentialsProvider.class)).thenReturn(true);
@@ -43,9 +43,9 @@ public class RemoteEventReplicationTrigg
ScheduleOptions options = mock(ScheduleOptions.class);
when(options.name(handler.toString())).thenReturn(options);
when(scheduler.NOW()).thenReturn(options);
- RemoteEventReplicationTrigger remoteEventReplicationTrigger = new RemoteEventReplicationTrigger(
+ RemoteEventDistributionTrigger remoteEventdistributionTrigger = new RemoteEventDistributionTrigger(
endpoint, authProvider, scheduler);
- remoteEventReplicationTrigger.register(handler);
+ remoteEventdistributionTrigger.register(handler);
}
@Test
@@ -55,9 +55,9 @@ public class RemoteEventReplicationTrigg
TransportAuthenticationProvider<CredentialsProvider, CredentialsProvider> authProvider = mock(TransportAuthenticationProvider.class);
when(authProvider.canAuthenticate(CredentialsProvider.class)).thenReturn(true);
Scheduler scheduler = mock(Scheduler.class);
- RemoteEventReplicationTrigger remoteEventReplicationTrigger = new RemoteEventReplicationTrigger(
+ RemoteEventDistributionTrigger remoteEventdistributionTrigger = new RemoteEventDistributionTrigger(
endpoint, authProvider, scheduler);
- ReplicationRequestHandler handler = mock(ReplicationRequestHandler.class);
- remoteEventReplicationTrigger.unregister(handler);
+ DistributionRequestHandler handler = mock(DistributionRequestHandler.class);
+ remoteEventdistributionTrigger.unregister(handler);
}
}
\ No newline at end of file
Copied: sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/trigger/impl/ResourceEventDistributionTriggerTest.java (from r1637123, sling/trunk/contrib/extensions/replication/core/src/test/java/org/apache/sling/replication/trigger/impl/ResourceEventReplicationTriggerTest.java)
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/trigger/impl/ResourceEventDistributionTriggerTest.java?p2=sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/trigger/impl/ResourceEventDistributionTriggerTest.java&p1=sling/trunk/contrib/extensions/replication/core/src/test/java/org/apache/sling/replication/trigger/impl/ResourceEventReplicationTriggerTest.java&r1=1637123&r2=1637333&rev=1637333&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/test/java/org/apache/sling/replication/trigger/impl/ResourceEventReplicationTriggerTest.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/trigger/impl/ResourceEventDistributionTriggerTest.java Fri Nov 7 10:28:02 2014
@@ -16,11 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.replication.trigger.impl;
+package org.apache.sling.distribution.trigger.impl;
import java.util.Dictionary;
-import org.apache.sling.replication.trigger.ReplicationRequestHandler;
+import org.apache.sling.distribution.trigger.DistributionRequestHandler;
import org.junit.Test;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceRegistration;
@@ -30,9 +30,9 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
/**
- * Testcase for {@link org.apache.sling.replication.trigger.impl.ResourceEventReplicationTrigger}
+ * Testcase for {@link ResourceEventDistributionTrigger}
*/
-public class ResourceEventReplicationTriggerTest {
+public class ResourceEventDistributionTriggerTest {
@Test
public void testRegister() throws Exception {
@@ -40,33 +40,33 @@ public class ResourceEventReplicationTri
BundleContext bundleContext = mock(BundleContext.class);
ServiceRegistration registration = mock(ServiceRegistration.class);
when(bundleContext.registerService(any(String.class), any(Object.class), any(Dictionary.class))).thenReturn(registration);
- ResourceEventReplicationTrigger resourceEventReplicationTrigger = new ResourceEventReplicationTrigger(path, bundleContext);
- ReplicationRequestHandler handler = mock(ReplicationRequestHandler.class);
- resourceEventReplicationTrigger.register(handler);
+ ResourceEventDistributionTrigger resourceEventdistributionTrigger = new ResourceEventDistributionTrigger(path, bundleContext);
+ DistributionRequestHandler handler = mock(DistributionRequestHandler.class);
+ resourceEventdistributionTrigger.register(handler);
}
@Test
public void testUnregister() throws Exception {
String path = "/some/path";
BundleContext bundleContext = mock(BundleContext.class);
- ResourceEventReplicationTrigger resourceEventReplicationTrigger = new ResourceEventReplicationTrigger(path, bundleContext);
- ReplicationRequestHandler handler = mock(ReplicationRequestHandler.class);
- resourceEventReplicationTrigger.unregister(handler);
+ ResourceEventDistributionTrigger resourceEventdistributionTrigger = new ResourceEventDistributionTrigger(path, bundleContext);
+ DistributionRequestHandler handler = mock(DistributionRequestHandler.class);
+ resourceEventdistributionTrigger.unregister(handler);
}
@Test
public void testEnable() throws Exception {
String path = "/some/path";
BundleContext bundleContext = mock(BundleContext.class);
- ResourceEventReplicationTrigger resourceEventReplicationTrigger = new ResourceEventReplicationTrigger(path, bundleContext);
- resourceEventReplicationTrigger.enable();
+ ResourceEventDistributionTrigger resourceEventdistributionTrigger = new ResourceEventDistributionTrigger(path, bundleContext);
+ resourceEventdistributionTrigger.enable();
}
@Test
public void testDisable() throws Exception {
String path = "/some/path";
BundleContext bundleContext = mock(BundleContext.class);
- ResourceEventReplicationTrigger resourceEventReplicationTrigger = new ResourceEventReplicationTrigger(path, bundleContext);
- resourceEventReplicationTrigger.disable();
+ ResourceEventDistributionTrigger resourceEventdistributionTrigger = new ResourceEventDistributionTrigger(path, bundleContext);
+ resourceEventdistributionTrigger.disable();
}
}
\ No newline at end of file
Copied: sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/trigger/impl/ScheduledDistributionTriggerTest.java (from r1637123, sling/trunk/contrib/extensions/replication/core/src/test/java/org/apache/sling/replication/trigger/impl/ScheduledReplicationTriggerTest.java)
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/trigger/impl/ScheduledDistributionTriggerTest.java?p2=sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/trigger/impl/ScheduledDistributionTriggerTest.java&p1=sling/trunk/contrib/extensions/replication/core/src/test/java/org/apache/sling/replication/trigger/impl/ScheduledReplicationTriggerTest.java&r1=1637123&r2=1637333&rev=1637333&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/test/java/org/apache/sling/replication/trigger/impl/ScheduledReplicationTriggerTest.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/trigger/impl/ScheduledDistributionTriggerTest.java Fri Nov 7 10:28:02 2014
@@ -16,46 +16,46 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.replication.trigger.impl;
+package org.apache.sling.distribution.trigger.impl;
import org.apache.sling.commons.scheduler.ScheduleOptions;
import org.apache.sling.commons.scheduler.Scheduler;
-import org.apache.sling.replication.communication.ReplicationActionType;
-import org.apache.sling.replication.trigger.ReplicationRequestHandler;
+import org.apache.sling.distribution.communication.DistributionActionType;
+import org.apache.sling.distribution.trigger.DistributionRequestHandler;
import org.junit.Test;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
/**
- * Testcase for {@link org.apache.sling.replication.trigger.impl.ScheduledReplicationTrigger}
+ * Testcase for {@link ScheduledDistributionTrigger}
*/
-public class ScheduledReplicationTriggerTest {
+public class ScheduledDistributionTriggerTest {
@Test
public void testRegister() throws Exception {
- for (ReplicationActionType action : ReplicationActionType.values()) {
+ for (DistributionActionType action : DistributionActionType.values()) {
String path = "/path/to/somewhere";
int interval = 10;
- ReplicationRequestHandler handler = mock(ReplicationRequestHandler.class);
+ DistributionRequestHandler handler = mock(DistributionRequestHandler.class);
Scheduler scheduler = mock(Scheduler.class);
ScheduleOptions options = mock(ScheduleOptions.class);
when(scheduler.NOW(-1, interval)).thenReturn(options);
when(options.name(handler.toString())).thenReturn(options);
- ScheduledReplicationTrigger scheduledReplicationTrigger = new ScheduledReplicationTrigger(action.name(), path, interval, scheduler);
- scheduledReplicationTrigger.register(handler);
+ ScheduledDistributionTrigger scheduleddistributionTrigger = new ScheduledDistributionTrigger(action.name(), path, interval, scheduler);
+ scheduleddistributionTrigger.register(handler);
}
}
@Test
public void testUnregister() throws Exception {
- for (ReplicationActionType action : ReplicationActionType.values()) {
+ for (DistributionActionType action : DistributionActionType.values()) {
String path = "/path/to/somewhere";
int interval = 10;
Scheduler scheduler = mock(Scheduler.class);
- ScheduledReplicationTrigger scheduledReplicationTrigger = new ScheduledReplicationTrigger(action.name(), path, interval, scheduler);
- ReplicationRequestHandler handlerId = mock(ReplicationRequestHandler.class);
- scheduledReplicationTrigger.unregister(handlerId);
+ ScheduledDistributionTrigger scheduleddistributionTrigger = new ScheduledDistributionTrigger(action.name(), path, interval, scheduler);
+ DistributionRequestHandler handlerId = mock(DistributionRequestHandler.class);
+ scheduleddistributionTrigger.unregister(handlerId);
}
}
}
\ No newline at end of file
Modified: sling/trunk/contrib/extensions/distribution/it/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/it/pom.xml?rev=1637333&r1=1637123&r2=1637333&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/it/pom.xml (original)
+++ sling/trunk/contrib/extensions/distribution/it/pom.xml Fri Nov 7 10:28:02 2014
@@ -27,13 +27,13 @@
<version>22</version>
</parent>
- <artifactId>org.apache.sling.replication.it</artifactId>
+ <artifactId>org.apache.sling.distribution.it</artifactId>
<version>0.0.1-SNAPSHOT</version>
<packaging>bundle</packaging>
- <name>Apache Sling Replication Integration Tests</name>
+ <name>Apache Sling Distribution Integration Tests</name>
<description>
- Project tests functionality for org.apache.sling.replication bundle
+ Project tests functionality for org.apache.sling.distribution bundle
</description>
<!--
@@ -89,9 +89,9 @@
</properties>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/replication/it</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/replication/it</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/it</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/distribution/it</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/distribution/it</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/it</url>
</scm>
<build>
@@ -110,12 +110,12 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Bundle-SymbolicName>org.apache.sling.replication.it</Bundle-SymbolicName>
+ <Bundle-SymbolicName>org.apache.sling.distribution.it</Bundle-SymbolicName>
<Sling-Initial-Content>SLING-CONTENT/content/test;path:=/content/test;overwrite:=true,
SLING-CONTENT/libs/test;path:=/libs/test;overwrite:=true
</Sling-Initial-Content>
<Export-Package>
- org.apache.sling.replication.it
+ org.apache.sling.distribution.it
</Export-Package>
</instructions>
</configuration>
@@ -273,8 +273,8 @@
<sling.additional.bundle.3>org.apache.sling.discovery.impl</sling.additional.bundle.3>
<sling.additional.bundle.4>org.apache.sling.hc.core</sling.additional.bundle.4>
<sling.additional.bundle.5>org.apache.jackrabbit.vault</sling.additional.bundle.5>
- <sling.additional.bundle.6>org.apache.sling.replication.core</sling.additional.bundle.6>
- <sling.additional.bundle.7>org.apache.sling.replication.sample</sling.additional.bundle.7>
+ <sling.additional.bundle.6>org.apache.sling.distribution.core</sling.additional.bundle.6>
+ <sling.additional.bundle.7>org.apache.sling.distribution.sample</sling.additional.bundle.7>
<sling.additional.bundle.8>${project.build.finalName}.jar</sling.additional.bundle.8>
</systemPropertyVariables>
</configuration>
@@ -391,12 +391,12 @@
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.replication.core</artifactId>
+ <artifactId>org.apache.sling.distribution.core</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.replication.sample</artifactId>
+ <artifactId>org.apache.sling.distribution.sample</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>
</dependencies>
Copied: sling/trunk/contrib/extensions/distribution/it/src/main/resources/SLING-CONTENT/libs/test/install.author/org.apache.sling.distribution.component.impl.GenericDistributionComponentFactory-trigger-test-content-event.json (from r1637123, sling/trunk/contrib/extensions/replication/it/src/main/resources/SLING-CONTENT/libs/test/install.author/org.apache.sling.replication.component.impl.GenericReplicationComponentFactory-trigger-test-content-event.json)
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/it/src/main/resources/SLING-CONTENT/libs/test/install.author/org.apache.sling.distribution.component.impl.GenericDistributionComponentFactory-trigger-test-content-event.json?p2=sling/trunk/contrib/extensions/distribution/it/src/main/resources/SLING-CONTENT/libs/test/install.author/org.apache.sling.distribution.component.impl.GenericDistributionComponentFactory-trigger-test-content-event.json&p1=sling/trunk/contrib/extensions/replication/it/src/main/resources/SLING-CONTENT/libs/test/install.author/org.apache.sling.replication.component.impl.GenericReplicationComponentFactory-trigger-test-content-event.json&r1=1637123&r2=1637333&rev=1637333&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/it/src/main/resources/SLING-CONTENT/libs/test/install.author/org.apache.sling.replication.component.impl.GenericReplicationComponentFactory-trigger-test-content-event.json (original)
+++ sling/trunk/contrib/extensions/distribution/it/src/main/resources/SLING-CONTENT/libs/test/install.author/org.apache.sling.distribution.component.impl.GenericDistributionComponentFactory-trigger-test-content-event.json Fri Nov 7 10:28:02 2014
@@ -6,8 +6,8 @@
"properties": [
"type=jcrEvent",
- "path=/content"
-
+ "path=/content",
+ "servicename=distributionService"
]
}
\ No newline at end of file
Copied: sling/trunk/contrib/extensions/distribution/it/src/main/resources/SLING-CONTENT/libs/test/install.author/org.apache.sling.distribution.component.impl.GenericDistributionComponentFactory-trigger-test-distribute-event.json (from r1637123, sling/trunk/contrib/extensions/replication/it/src/main/resources/SLING-CONTENT/libs/test/install.author/org.apache.sling.replication.component.impl.GenericReplicationComponentFactory-trigger-test-replicate-event.json)
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/it/src/main/resources/SLING-CONTENT/libs/test/install.author/org.apache.sling.distribution.component.impl.GenericDistributionComponentFactory-trigger-test-distribute-event.json?p2=sling/trunk/contrib/extensions/distribution/it/src/main/resources/SLING-CONTENT/libs/test/install.author/org.apache.sling.distribution.component.impl.GenericDistributionComponentFactory-trigger-test-distribute-event.json&p1=sling/trunk/contrib/extensions/replication/it/src/main/resources/SLING-CONTENT/libs/test/install.author/org.apache.sling.replication.component.impl.GenericReplicationComponentFactory-trigger-test-replicate-event.json&r1=1637123&r2=1637333&rev=1637333&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/it/src/main/resources/SLING-CONTENT/libs/test/install.author/org.apache.sling.replication.component.impl.GenericReplicationComponentFactory-trigger-test-replicate-event.json (original)
+++ sling/trunk/contrib/extensions/distribution/it/src/main/resources/SLING-CONTENT/libs/test/install.author/org.apache.sling.distribution.component.impl.GenericDistributionComponentFactory-trigger-test-distribute-event.json Fri Nov 7 10:28:02 2014
@@ -1,12 +1,11 @@
{
"jcr:primaryType": "sling:OsgiConfig",
- "name": "test-replicate-event",
+ "name": "test-distribute-event",
"componentType": "trigger",
"properties": [
- "type=replicationEvent"
-
+ "type=distributionEvent"
]
}
\ No newline at end of file
Copied: sling/trunk/contrib/extensions/distribution/it/src/main/resources/SLING-CONTENT/libs/test/install.author/org.apache.sling.distribution.component.impl.GenericDistributionComponentFactory-trigger-test-persisting-event.json (from r1637123, sling/trunk/contrib/extensions/replication/it/src/main/resources/SLING-CONTENT/libs/test/install.author/org.apache.sling.replication.component.impl.GenericReplicationComponentFactory-trigger-test-persisting-event.json)
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/it/src/main/resources/SLING-CONTENT/libs/test/install.author/org.apache.sling.distribution.component.impl.GenericDistributionComponentFactory-trigger-test-persisting-event.json?p2=sling/trunk/contrib/extensions/distribution/it/src/main/resources/SLING-CONTENT/libs/test/install.author/org.apache.sling.distribution.component.impl.GenericDistributionComponentFactory-trigger-test-persisting-event.json&p1=sling/trunk/contrib/extensions/replication/it/src/main/resources/SLING-CONTENT/libs/test/install.author/org.apache.sling.replication.component.impl.GenericReplicationComponentFactory-trigger-test-persisting-event.json&r1=1637123&r2=1637333&rev=1637333&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/it/src/main/resources/SLING-CONTENT/libs/test/install.author/org.apache.sling.replication.component.impl.GenericReplicationComponentFactory-trigger-test-persisting-event.json (original)
+++ sling/trunk/contrib/extensions/distribution/it/src/main/resources/SLING-CONTENT/libs/test/install.author/org.apache.sling.distribution.component.impl.GenericDistributionComponentFactory-trigger-test-persisting-event.json Fri Nov 7 10:28:02 2014
@@ -7,7 +7,7 @@
"properties": [
"type=persistedJcrEvent",
"path=/content/persistedEvents",
- "servicename=replicationService"
+ "servicename=distributionService"
]
}
\ No newline at end of file
Copied: sling/trunk/contrib/extensions/distribution/it/src/main/resources/SLING-CONTENT/libs/test/install.author/org.apache.sling.distribution.component.impl.GenericDistributionComponentFactory-trigger-test-remote-event.json (from r1637123, sling/trunk/contrib/extensions/replication/it/src/main/resources/SLING-CONTENT/libs/test/install.author/org.apache.sling.replication.component.impl.GenericReplicationComponentFactory-trigger-test-remote-event.json)
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/it/src/main/resources/SLING-CONTENT/libs/test/install.author/org.apache.sling.distribution.component.impl.GenericDistributionComponentFactory-trigger-test-remote-event.json?p2=sling/trunk/contrib/extensions/distribution/it/src/main/resources/SLING-CONTENT/libs/test/install.author/org.apache.sling.distribution.component.impl.GenericDistributionComponentFactory-trigger-test-remote-event.json&p1=sling/trunk/contrib/extensions/replication/it/src/main/resources/SLING-CONTENT/libs/test/install.author/org.apache.sling.replication.component.impl.GenericReplicationComponentFactory-trigger-test-remote-event.json&r1=1637123&r2=1637333&rev=1637333&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/it/src/main/resources/SLING-CONTENT/libs/test/install.author/org.apache.sling.replication.component.impl.GenericReplicationComponentFactory-trigger-test-remote-event.json (original)
+++ sling/trunk/contrib/extensions/distribution/it/src/main/resources/SLING-CONTENT/libs/test/install.author/org.apache.sling.distribution.component.impl.GenericDistributionComponentFactory-trigger-test-remote-event.json Fri Nov 7 10:28:02 2014
@@ -6,7 +6,7 @@
"properties": [
"type=remoteEvent",
- "endpoint=http://localhost:4503/libs/sling/replication/services/triggers/content-changed.event",
+ "endpoint=http://localhost:4503/libs/sling/distribution/services/triggers/content-changed.event",
"transportAuthenticationProvider/type=service",
"transportAuthenticationProvider/name=publishAdmin"
Copied: sling/trunk/contrib/extensions/distribution/it/src/test/java/org/apache/sling/distribution/it/DistributionAgentResourcesIntegrationTest.java (from r1637123, sling/trunk/contrib/extensions/replication/it/src/test/java/org/apache/sling/replication/it/ReplicationAgentResourcesIntegrationTest.java)
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/it/src/test/java/org/apache/sling/distribution/it/DistributionAgentResourcesIntegrationTest.java?p2=sling/trunk/contrib/extensions/distribution/it/src/test/java/org/apache/sling/distribution/it/DistributionAgentResourcesIntegrationTest.java&p1=sling/trunk/contrib/extensions/replication/it/src/test/java/org/apache/sling/replication/it/ReplicationAgentResourcesIntegrationTest.java&r1=1637123&r2=1637333&rev=1637333&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/it/src/test/java/org/apache/sling/replication/it/ReplicationAgentResourcesIntegrationTest.java (original)
+++ sling/trunk/contrib/extensions/distribution/it/src/test/java/org/apache/sling/distribution/it/DistributionAgentResourcesIntegrationTest.java Fri Nov 7 10:28:02 2014
@@ -16,25 +16,25 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.replication.it;
+package org.apache.sling.distribution.it;
import java.util.UUID;
import org.junit.Test;
-import static org.apache.sling.replication.it.ReplicationUtils.agentConfigUrl;
-import static org.apache.sling.replication.it.ReplicationUtils.agentRootUrl;
-import static org.apache.sling.replication.it.ReplicationUtils.agentUrl;
-import static org.apache.sling.replication.it.ReplicationUtils.assertExists;
-import static org.apache.sling.replication.it.ReplicationUtils.assertNotExists;
-import static org.apache.sling.replication.it.ReplicationUtils.assertResponseContains;
-import static org.apache.sling.replication.it.ReplicationUtils.deleteNode;
-import static org.apache.sling.replication.it.ReplicationUtils.queueUrl;
+import static org.apache.sling.distribution.it.DistributionUtils.agentConfigUrl;
+import static org.apache.sling.distribution.it.DistributionUtils.agentRootUrl;
+import static org.apache.sling.distribution.it.DistributionUtils.agentUrl;
+import static org.apache.sling.distribution.it.DistributionUtils.assertExists;
+import static org.apache.sling.distribution.it.DistributionUtils.assertNotExists;
+import static org.apache.sling.distribution.it.DistributionUtils.assertResponseContains;
+import static org.apache.sling.distribution.it.DistributionUtils.deleteNode;
+import static org.apache.sling.distribution.it.DistributionUtils.queueUrl;
/**
- * Integration test for {@link org.apache.sling.replication.agent.ReplicationAgent} resources
+ * Integration test for {@link org.apache.sling.distribution.agent.DistributionAgent} resources
*/
-public class ReplicationAgentResourcesIntegrationTest extends ReplicationIntegrationTestBase {
+public class DistributionAgentResourcesIntegrationTest extends DistributionIntegrationTestBase {
@Test
public void testDefaultAgentConfigurationResourcesOnAuthor() throws Exception {
@@ -113,7 +113,7 @@ public class ReplicationAgentResourcesIn
public void testDefaultAgentsRootResource() throws Exception {
assertExists(authorClient, agentRootUrl());
assertResponseContains(author, agentRootUrl(),
- "sling:resourceType", "sling/replication/service/agent/list",
+ "sling:resourceType", "sling/distribution/service/agent/list",
"items", "publish-reverse", "publish");
}
@@ -125,7 +125,7 @@ public class ReplicationAgentResourcesIn
authorClient.createNode(newConfigResource, "name", agentName);
assertExists(authorClient, newConfigResource);
assertResponseContains(author, newConfigResource,
- "sling:resourceType", "sling/replication/setting/agent",
+ "sling:resourceType", "sling/distribution/setting/agent",
"name", agentName);
}
@@ -150,7 +150,7 @@ public class ReplicationAgentResourcesIn
assertExists(authorClient, newConfigResource);
authorClient.setProperties(newConfigResource, "packageExporter", "exporters/remote/updated");
assertResponseContains(author, newConfigResource,
- "sling:resourceType", "sling/replication/setting/agent",
+ "sling:resourceType", "sling/distribution/setting/agent",
"name", agentName,
"packageExporter", "updated");
}
Copied: sling/trunk/contrib/extensions/distribution/it/src/test/java/org/apache/sling/distribution/it/DistributionIntegrationTestBase.java (from r1637123, sling/trunk/contrib/extensions/replication/it/src/test/java/org/apache/sling/replication/it/ReplicationIntegrationTestBase.java)
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/it/src/test/java/org/apache/sling/distribution/it/DistributionIntegrationTestBase.java?p2=sling/trunk/contrib/extensions/distribution/it/src/test/java/org/apache/sling/distribution/it/DistributionIntegrationTestBase.java&p1=sling/trunk/contrib/extensions/replication/it/src/test/java/org/apache/sling/replication/it/ReplicationIntegrationTestBase.java&r1=1637123&r2=1637333&rev=1637333&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/it/src/test/java/org/apache/sling/replication/it/ReplicationIntegrationTestBase.java (original)
+++ sling/trunk/contrib/extensions/distribution/it/src/test/java/org/apache/sling/distribution/it/DistributionIntegrationTestBase.java Fri Nov 7 10:28:02 2014
@@ -16,24 +16,24 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.replication.it;
+package org.apache.sling.distribution.it;
import org.apache.sling.testing.tools.sling.SlingClient;
import org.apache.sling.testing.tools.sling.SlingInstance;
import org.apache.sling.testing.tools.sling.SlingInstanceManager;
import org.junit.BeforeClass;
-import static org.apache.sling.replication.it.ReplicationUtils.agentConfigUrl;
-import static org.apache.sling.replication.it.ReplicationUtils.agentUrl;
-import static org.apache.sling.replication.it.ReplicationUtils.assertExists;
-import static org.apache.sling.replication.it.ReplicationUtils.exporterUrl;
-import static org.apache.sling.replication.it.ReplicationUtils.importerUrl;
-import static org.apache.sling.replication.it.ReplicationUtils.setAgentProperties;
+import static org.apache.sling.distribution.it.DistributionUtils.agentConfigUrl;
+import static org.apache.sling.distribution.it.DistributionUtils.agentUrl;
+import static org.apache.sling.distribution.it.DistributionUtils.assertExists;
+import static org.apache.sling.distribution.it.DistributionUtils.exporterUrl;
+import static org.apache.sling.distribution.it.DistributionUtils.importerUrl;
+import static org.apache.sling.distribution.it.DistributionUtils.setAgentProperties;
/**
- * Integration test base class for replication
+ * Integration test base class for distribution
*/
-public abstract class ReplicationIntegrationTestBase {
+public abstract class DistributionIntegrationTestBase {
protected static SlingInstance author;
protected static SlingInstance publish;
Copied: sling/trunk/contrib/extensions/distribution/it/src/test/java/org/apache/sling/distribution/it/DistributionPackageExporterImporterTest.java (from r1637123, sling/trunk/contrib/extensions/replication/it/src/test/java/org/apache/sling/replication/it/ReplicationPackageExporterImporterTest.java)
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/it/src/test/java/org/apache/sling/distribution/it/DistributionPackageExporterImporterTest.java?p2=sling/trunk/contrib/extensions/distribution/it/src/test/java/org/apache/sling/distribution/it/DistributionPackageExporterImporterTest.java&p1=sling/trunk/contrib/extensions/replication/it/src/test/java/org/apache/sling/replication/it/ReplicationPackageExporterImporterTest.java&r1=1637123&r2=1637333&rev=1637333&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/it/src/test/java/org/apache/sling/replication/it/ReplicationPackageExporterImporterTest.java (original)
+++ sling/trunk/contrib/extensions/distribution/it/src/test/java/org/apache/sling/distribution/it/DistributionPackageExporterImporterTest.java Fri Nov 7 10:28:02 2014
@@ -16,26 +16,26 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.replication.it;
+package org.apache.sling.distribution.it;
import org.apache.http.protocol.HTTP;
-import org.apache.sling.replication.communication.ReplicationActionType;
+import org.apache.sling.distribution.communication.DistributionActionType;
import org.junit.Test;
-import static org.apache.sling.replication.it.ReplicationUtils.assertExists;
-import static org.apache.sling.replication.it.ReplicationUtils.assertNotExists;
-import static org.apache.sling.replication.it.ReplicationUtils.createRandomNode;
-import static org.apache.sling.replication.it.ReplicationUtils.doExport;
-import static org.apache.sling.replication.it.ReplicationUtils.doImport;
+import static org.apache.sling.distribution.it.DistributionUtils.assertExists;
+import static org.apache.sling.distribution.it.DistributionUtils.assertNotExists;
+import static org.apache.sling.distribution.it.DistributionUtils.createRandomNode;
+import static org.apache.sling.distribution.it.DistributionUtils.doExport;
+import static org.apache.sling.distribution.it.DistributionUtils.doImport;
-public class ReplicationPackageExporterImporterTest extends ReplicationIntegrationTestBase {
+public class DistributionPackageExporterImporterTest extends DistributionIntegrationTestBase {
@Test
public void testAddExportImport() throws Exception {
String nodePath = createRandomNode(publishClient, "/content/export_" + System.nanoTime());
assertExists(publishClient, nodePath);
- String content = doExport(publish, "default", ReplicationActionType.ADD, nodePath);
+ String content = doExport(publish, "default", DistributionActionType.ADD, nodePath);
publishClient.delete(nodePath);
assertNotExists(publishClient, nodePath);
@@ -50,7 +50,7 @@ public class ReplicationPackageExporterI
String nodePath = createRandomNode(publishClient, "/content/export_" + System.nanoTime());
assertExists(publishClient, nodePath);
- String content = doExport(publish, "default", ReplicationActionType.DELETE, nodePath);
+ String content = doExport(publish, "default", DistributionActionType.DELETE, nodePath);
doImport(publish, "default", content.getBytes(HTTP.DEFAULT_CONTENT_CHARSET));
assertNotExists(publishClient, nodePath);
Copied: sling/trunk/contrib/extensions/distribution/it/src/test/java/org/apache/sling/distribution/it/DistributionPackageImporterResourcesIntegrationTest.java (from r1637123, sling/trunk/contrib/extensions/replication/it/src/test/java/org/apache/sling/replication/it/ReplicationPackageImporterResourcesIntegrationTest.java)
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/it/src/test/java/org/apache/sling/distribution/it/DistributionPackageImporterResourcesIntegrationTest.java?p2=sling/trunk/contrib/extensions/distribution/it/src/test/java/org/apache/sling/distribution/it/DistributionPackageImporterResourcesIntegrationTest.java&p1=sling/trunk/contrib/extensions/replication/it/src/test/java/org/apache/sling/replication/it/ReplicationPackageImporterResourcesIntegrationTest.java&r1=1637123&r2=1637333&rev=1637333&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/it/src/test/java/org/apache/sling/replication/it/ReplicationPackageImporterResourcesIntegrationTest.java (original)
+++ sling/trunk/contrib/extensions/distribution/it/src/test/java/org/apache/sling/distribution/it/DistributionPackageImporterResourcesIntegrationTest.java Fri Nov 7 10:28:02 2014
@@ -16,26 +16,26 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.replication.it;
+package org.apache.sling.distribution.it;
import org.junit.Test;
-import static org.apache.sling.replication.it.ReplicationUtils.assertExists;
-import static org.apache.sling.replication.it.ReplicationUtils.assertResponseContains;
-import static org.apache.sling.replication.it.ReplicationUtils.importerRootUrl;
-import static org.apache.sling.replication.it.ReplicationUtils.importerUrl;
+import static org.apache.sling.distribution.it.DistributionUtils.assertExists;
+import static org.apache.sling.distribution.it.DistributionUtils.assertResponseContains;
+import static org.apache.sling.distribution.it.DistributionUtils.importerRootUrl;
+import static org.apache.sling.distribution.it.DistributionUtils.importerUrl;
/**
- * Integration test for {@link org.apache.sling.replication.packaging.ReplicationPackageImporter} resources
+ * Integration test for {@link org.apache.sling.distribution.packaging.DistributionPackageImporter} resources
*/
-public class ReplicationPackageImporterResourcesIntegrationTest extends ReplicationIntegrationTestBase {
+public class DistributionPackageImporterResourcesIntegrationTest extends DistributionIntegrationTestBase {
@Test
public void testImporterRootResource() throws Exception {
String rootResource = importerRootUrl();
assertExists(publishClient, rootResource);
assertResponseContains(publish, rootResource,
- "sling:resourceType", "sling/replication/service/importer/list",
+ "sling:resourceType", "sling/distribution/service/importer/list",
"items", "default");
}
@@ -44,7 +44,7 @@ public class ReplicationPackageImporterR
String rootResource = importerUrl("default");
assertExists(publishClient, rootResource);
assertResponseContains(publish, rootResource,
- "sling:resourceType", "sling/replication/service/importer",
+ "sling:resourceType", "sling/distribution/service/importer",
"name", "default");
}
}