You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by mp...@apache.org on 2014/10/22 15:25:54 UTC
svn commit: r1633616 - in
/sling/trunk/contrib/extensions/replication/core/src:
main/java/org/apache/sling/replication/agent/impl/
main/java/org/apache/sling/replication/packaging/
main/java/org/apache/sling/replication/queue/ main/java/org/apache/slin...
Author: mpetria
Date: Wed Oct 22 13:25:53 2014
New Revision: 1633616
URL: http://svn.apache.org/r1633616
Log:
SLING-4072: Do not replicate a package back to its originator
Added:
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/ReplicationPackageInfo.java
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/serialization/impl/AbstractReplicationPackage.java
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/serialization/impl/SimpleReplicationPackageInfo.java
Modified:
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/agent/impl/SimpleReplicationAgent.java
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/ReplicationPackage.java
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/queue/ReplicationQueueItem.java
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/queue/impl/jobhandling/JobHandlingUtils.java
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/serialization/impl/VoidReplicationPackage.java
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/serialization/impl/vlt/FileVaultReplicationPackage.java
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/transport/impl/SimpleHttpReplicationTransportHandler.java
sling/trunk/contrib/extensions/replication/core/src/test/java/org/apache/sling/replication/transport/impl/SimpleHttpReplicationTransportHandlerTest.java
Modified: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/agent/impl/SimpleReplicationAgent.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/agent/impl/SimpleReplicationAgent.java?rev=1633616&r1=1633615&r2=1633616&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/agent/impl/SimpleReplicationAgent.java (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/agent/impl/SimpleReplicationAgent.java Wed Oct 22 13:25:53 2014
@@ -175,7 +175,8 @@ public class SimpleReplicationAgent impl
ReplicationQueueItem replicationQueueItem = new ReplicationQueueItem(replicationPackage.getId(),
replicationPackage.getPaths(),
replicationPackage.getAction(),
- replicationPackage.getType());
+ replicationPackage.getType(),
+ replicationPackage.getInfo());
// send the replication package to the queue distribution handler
try {
@@ -246,14 +247,18 @@ public class SimpleReplicationAgent impl
}
}
- private boolean processTransportQueue(ReplicationQueueItem queueItem) {
+ private boolean processQueue(ReplicationQueueItem queueItem) {
boolean success = false;
log.debug("reading package with id {}", queueItem.getId());
ResourceResolver resourceResolver = getAgentResourceResolver();
try {
ReplicationPackage replicationPackage = replicationPackageExporter.exportPackageById(resourceResolver, queueItem.getId());
+
+
if (replicationPackage != null) {
+ replicationPackage.getInfo().fillInfo(queueItem.getPackageInfo());
+
replicationPackageImporter.importPackage(resourceResolver, replicationPackage);
Dictionary<Object, Object> properties = new Properties();
@@ -282,7 +287,7 @@ public class SimpleReplicationAgent impl
try {
resourceResolver = resourceResolverFactory.getServiceResourceResolver(authenticationInfo);
} catch (LoginException e) {
- log.error("cannot obtain a resource resolver");
+ log.error("cannot obtain a resource resolver", e);
}
return resourceResolver;
@@ -290,8 +295,8 @@ public class SimpleReplicationAgent impl
class PackageQueueProcessor implements ReplicationQueueProcessor {
public boolean process(String queueName, ReplicationQueueItem packageInfo) {
- log.info("running package queue processor");
- return processTransportQueue(packageInfo);
+ log.info("running package queue processor for queue {}", queueName);
+ return processQueue(packageInfo);
}
}
Modified: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/ReplicationPackage.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/ReplicationPackage.java?rev=1633616&r1=1633615&r2=1633616&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/ReplicationPackage.java (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/ReplicationPackage.java Wed Oct 22 13:25:53 2014
@@ -72,13 +72,19 @@ public interface ReplicationPackage exte
long getLength();
/**
- * releases resources associated with this package
+ * releases all resources associated with the package id
*/
- void close();
+ void delete();
+
/**
- * releases all resources associated with the package id
+ * gets an additional info holder for this package.
+ * The additional info object contains control information rather than content information.
+ * For example info.origin can be used to skip replicating back to the originating endpoint.
+ * It should not be be serialized between instances as its main purpose is to allow
+ * inter component communication on the same instance.
+ * @return
*/
- void delete();
+ ReplicationPackageInfo getInfo();
}
Added: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/ReplicationPackageInfo.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/ReplicationPackageInfo.java?rev=1633616&view=auto
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/ReplicationPackageInfo.java (added)
+++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/packaging/ReplicationPackageInfo.java Wed Oct 22 13:25:53 2014
@@ -0,0 +1,48 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.sling.replication.packaging;
+
+
+import java.util.Map;
+
+/**
+ * Additional information about a package.
+ * Additional information is optional and components should expect every piece of it to be null.
+ */
+public interface ReplicationPackageInfo {
+
+ /**
+ * retrieves the origin of the package.
+ * @return
+ */
+ String getOrigin();
+
+ /**
+ * sets the origin of the package.
+ * @param origin
+ */
+ void setOrigin(String origin);
+
+ /**
+ * fills the current info object from the provided one.
+ * @param packageInfo
+ */
+ void fillInfo(ReplicationPackageInfo packageInfo);
+}
Modified: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/queue/ReplicationQueueItem.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/queue/ReplicationQueueItem.java?rev=1633616&r1=1633615&r2=1633616&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/queue/ReplicationQueueItem.java (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/queue/ReplicationQueueItem.java Wed Oct 22 13:25:53 2014
@@ -18,6 +18,8 @@
*/
package org.apache.sling.replication.queue;
+import org.apache.sling.replication.packaging.ReplicationPackageInfo;
+
/**
* An item in a {@link org.apache.sling.replication.queue.ReplicationQueue}
* <p/>
@@ -35,12 +37,15 @@ public class ReplicationQueueItem {
private final String type;
+ private final ReplicationPackageInfo packageInfo;
+
- public ReplicationQueueItem(String id, String[] paths, String action, String type) {
+ public ReplicationQueueItem(String id, String[] paths, String action, String type, ReplicationPackageInfo packageInfo) {
this.id = id;
this.paths = paths;
this.action = action;
this.type = type;
+ this.packageInfo = packageInfo;
}
public String getId() {
@@ -58,4 +63,8 @@ public class ReplicationQueueItem {
public String getType() {
return type;
}
+
+ public ReplicationPackageInfo getPackageInfo() {
+ return packageInfo;
+ }
}
Modified: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/queue/impl/jobhandling/JobHandlingUtils.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/queue/impl/jobhandling/JobHandlingUtils.java?rev=1633616&r1=1633615&r2=1633616&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/queue/impl/jobhandling/JobHandlingUtils.java (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/queue/impl/jobhandling/JobHandlingUtils.java Wed Oct 22 13:25:53 2014
@@ -22,7 +22,9 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.sling.event.jobs.Job;
+import org.apache.sling.replication.packaging.ReplicationPackageInfo;
import org.apache.sling.replication.queue.ReplicationQueueItem;
+import org.apache.sling.replication.serialization.impl.SimpleReplicationPackageInfo;
public class JobHandlingUtils {
@@ -34,11 +36,16 @@ public class JobHandlingUtils {
protected static final String ACTION = "replication.package.action";
+ protected static final String ORIGIN = "replication.package.origin";
+
public static ReplicationQueueItem getPackage(final Job job) {
+ ReplicationPackageInfo packageInfo = new SimpleReplicationPackageInfo();
+ packageInfo.setOrigin((String) job.getProperty(ORIGIN));
+
return new ReplicationQueueItem((String) job.getProperty(ID),
(String[]) job.getProperty(PATHS),
String.valueOf(job.getProperty(ACTION)),
- String.valueOf(job.getProperty(TYPE)));
+ String.valueOf(job.getProperty(TYPE)), packageInfo);
}
public static Map<String, Object> createFullProperties(
@@ -50,6 +57,11 @@ public class JobHandlingUtils {
properties.put(ACTION, replicationQueueItem.getAction());
properties.put(TYPE, replicationQueueItem.getType());
+ ReplicationPackageInfo packageInfo = replicationQueueItem.getPackageInfo();
+ if (packageInfo != null && packageInfo.getOrigin() != null) {
+ properties.put(ORIGIN, packageInfo.getOrigin());
+ }
+
return properties;
}
@@ -59,24 +71,6 @@ public class JobHandlingUtils {
return properties;
}
-// public static Byte[] box(byte[] bytes) {
-// if (bytes == null) return null;
-// Byte[] result = new Byte[bytes.length];
-// for (int i = 0; i < bytes.length; i++) {
-// result[i] = bytes[i];
-// }
-// return result;
-// }
-//
-// public static byte[] unBox(Byte[] bytes) {
-// if (bytes == null) return null;
-// byte[] result = new byte[bytes.length];
-// for (int i = 0; i < bytes.length; i++) {
-// result[i] = bytes[i];
-// }
-// return result;
-// }
-
public static String getQueueName(Job job) {
String topic = job.getTopic();
Added: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/serialization/impl/AbstractReplicationPackage.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/serialization/impl/AbstractReplicationPackage.java?rev=1633616&view=auto
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/serialization/impl/AbstractReplicationPackage.java (added)
+++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/serialization/impl/AbstractReplicationPackage.java Wed Oct 22 13:25:53 2014
@@ -0,0 +1,14 @@
+package org.apache.sling.replication.serialization.impl;
+
+import org.apache.sling.replication.packaging.ReplicationPackage;
+import org.apache.sling.replication.packaging.ReplicationPackageInfo;
+
+public abstract class AbstractReplicationPackage implements ReplicationPackage {
+ private final ReplicationPackageInfo info = new SimpleReplicationPackageInfo();
+
+ public ReplicationPackageInfo getInfo() {
+ return info;
+ }
+
+
+}
Added: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/serialization/impl/SimpleReplicationPackageInfo.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/serialization/impl/SimpleReplicationPackageInfo.java?rev=1633616&view=auto
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/serialization/impl/SimpleReplicationPackageInfo.java (added)
+++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/serialization/impl/SimpleReplicationPackageInfo.java Wed Oct 22 13:25:53 2014
@@ -0,0 +1,40 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.sling.replication.serialization.impl;
+
+import org.apache.sling.replication.packaging.ReplicationPackageInfo;
+
+public class SimpleReplicationPackageInfo implements ReplicationPackageInfo {
+ private String origin;
+
+ public String getOrigin() {
+ return origin;
+ }
+
+ public void setOrigin(String origin) {
+ this.origin = origin;
+ }
+
+ public void fillInfo(ReplicationPackageInfo newInfo) {
+ if (newInfo != null) {
+ this.setOrigin(newInfo.getOrigin());
+ }
+ }
+}
Modified: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/serialization/impl/VoidReplicationPackage.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/serialization/impl/VoidReplicationPackage.java?rev=1633616&r1=1633615&r2=1633616&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/serialization/impl/VoidReplicationPackage.java (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/serialization/impl/VoidReplicationPackage.java Wed Oct 22 13:25:53 2014
@@ -29,11 +29,12 @@ import org.apache.jackrabbit.vault.util.
import org.apache.sling.replication.communication.ReplicationActionType;
import org.apache.sling.replication.communication.ReplicationRequest;
import org.apache.sling.replication.packaging.ReplicationPackage;
+import org.apache.sling.replication.packaging.ReplicationPackageInfo;
/**
* A void {@link ReplicationPackage}Â is used for deletion of certain paths on the target instance
*/
-public class VoidReplicationPackage implements ReplicationPackage {
+public class VoidReplicationPackage extends AbstractReplicationPackage implements ReplicationPackage {
private static final String TYPE = "VOID";
@@ -45,6 +46,7 @@ public class VoidReplicationPackage impl
private final String action;
+
public VoidReplicationPackage(ReplicationRequest request) {
this(request, TYPE);
}
@@ -117,13 +119,12 @@ public class VoidReplicationPackage impl
return action;
}
- public void close() {
- }
public void delete() {
}
+
@Override
public String toString() {
return "VoidReplicationPackage{" +
Modified: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/serialization/impl/vlt/FileVaultReplicationPackage.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/serialization/impl/vlt/FileVaultReplicationPackage.java?rev=1633616&r1=1633615&r2=1633616&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/serialization/impl/vlt/FileVaultReplicationPackage.java (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/serialization/impl/vlt/FileVaultReplicationPackage.java Wed Oct 22 13:25:53 2014
@@ -32,11 +32,12 @@ import org.apache.jackrabbit.vault.fs.co
import org.apache.jackrabbit.vault.packaging.VaultPackage;
import org.apache.sling.replication.communication.ReplicationActionType;
import org.apache.sling.replication.packaging.ReplicationPackage;
+import org.apache.sling.replication.serialization.impl.AbstractReplicationPackage;
/**
* a FileVault {@link ReplicationPackage}
*/
-public class FileVaultReplicationPackage implements ReplicationPackage {
+public class FileVaultReplicationPackage extends AbstractReplicationPackage implements ReplicationPackage {
private static final long serialVersionUID = 1L;
Modified: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/transport/impl/SimpleHttpReplicationTransportHandler.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/transport/impl/SimpleHttpReplicationTransportHandler.java?rev=1633616&r1=1633615&r2=1633616&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/transport/impl/SimpleHttpReplicationTransportHandler.java (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/transport/impl/SimpleHttpReplicationTransportHandler.java Wed Oct 22 13:25:53 2014
@@ -75,54 +75,55 @@ public class SimpleHttpReplicationTransp
}
public void deliverPackage(ResourceResolver resourceResolver, ReplicationPackage replicationPackage) throws ReplicationTransportException {
- String host = replicationEndpoint.getUri().getHost();
- if (replicationPackage instanceof HttpPackage && host.equals(
- ((HttpPackage) replicationPackage).getOrigin())) {
- log.info("skipping replication of package {}Â to same origin {}", replicationPackage.getId(), host);
- } else {
- log.info("delivering package {} to {} using auth {}",
- new Object[]{
- replicationPackage.getId(),
- replicationEndpoint.getUri(),
- transportAuthenticationProvider
- });
+ String hostAndPort = getHostAndPort(replicationEndpoint.getUri());
- try {
- Executor executor = Executor.newInstance();
+ if (hostAndPort.equals(replicationPackage.getInfo().getOrigin())) {
+ log.info("skipping replication of package {}Â to same origin {}", replicationPackage.getId(), hostAndPort);
+ return;
+ }
- TransportAuthenticationContext context = new TransportAuthenticationContext();
- context.addAttribute("endpoint", replicationEndpoint);
- executor = transportAuthenticationProvider.authenticate(executor, context);
- Request req = Request.Post(replicationEndpoint.getUri()).useExpectContinue();
+ log.info("delivering package {} to {} using auth {}", new Object[]{
+ replicationPackage.getId(),
+ replicationEndpoint.getUri(),
+ transportAuthenticationProvider
+ });
- InputStream inputStream = null;
- Response response = null;
- try {
+ try {
+ Executor executor = Executor.newInstance();
- inputStream = replicationPackage.createInputStream();
+ TransportAuthenticationContext context = new TransportAuthenticationContext();
+ context.addAttribute("endpoint", replicationEndpoint);
+ executor = transportAuthenticationProvider.authenticate(executor, context);
- if (inputStream != null) {
- req = req.bodyStream(inputStream, ContentType.APPLICATION_OCTET_STREAM);
- }
- response = executor.execute(req);
- } finally {
- IOUtils.closeQuietly(inputStream);
- }
+ Request req = Request.Post(replicationEndpoint.getUri()).useExpectContinue();
- if (response != null) {
- Content content = response.returnContent();
- log.info("Replication content of type {} for {} delivered: {}", new Object[]{
- replicationPackage.getType(),
- Arrays.toString(replicationPackage.getPaths()),
- content
- });
- } else {
- throw new IOException("response is empty");
+ InputStream inputStream = null;
+ Response response = null;
+ try {
+
+ inputStream = replicationPackage.createInputStream();
+
+ if (inputStream != null) {
+ req = req.bodyStream(inputStream, ContentType.APPLICATION_OCTET_STREAM);
}
- } catch (Exception ex) {
- throw new ReplicationTransportException(ex);
+ response = executor.execute(req);
+ } finally {
+ IOUtils.closeQuietly(inputStream);
}
+
+ if (response != null) {
+ Content content = response.returnContent();
+ log.info("Replication content of type {} for {} delivered: {}", new Object[]{
+ replicationPackage.getType(),
+ Arrays.toString(replicationPackage.getPaths()),
+ content
+ });
+ } else {
+ throw new IOException("response is empty");
+ }
+ } catch (Exception ex) {
+ throw new ReplicationTransportException(ex);
}
}
@@ -154,45 +155,15 @@ public class SimpleHttpReplicationTransp
HttpEntity entity = httpResponse.getEntity();
if (entity != null) {
final ReplicationPackage responsePackage = packageBuilder.readPackage(resourceResolver, entity.getContent());
- HttpPackage httpPackage = new HttpPackage() {
- public String getOrigin() {
- return replicationEndpoint.getUri().getHost();
- }
-
- public String getId() {
- return responsePackage.getId();
- }
-
- public String[] getPaths() {
- return responsePackage.getPaths();
- }
-
- public String getAction() {
- return responsePackage.getAction();
- }
-
- public String getType() {
- return responsePackage.getType();
- }
-
- public InputStream createInputStream() throws IOException {
- return responsePackage.createInputStream();
- }
-
- public long getLength() {
- return responsePackage.getLength();
- }
-
- public void close() {
- responsePackage.close();
- }
-
- public void delete() {
- responsePackage.delete();
- }
- };
+ if (responsePackage != null) {
+ String origin = getHostAndPort(replicationURI);
+ responsePackage.getInfo().setOrigin(origin);
+ result.add(responsePackage);
+ }
+ else {
+ log.warn("responsePackage is null");
+ }
- result.add(httpPackage);
polls++;
} else {
log.info("");
@@ -214,9 +185,8 @@ public class SimpleHttpReplicationTransp
}
- private interface HttpPackage extends ReplicationPackage {
-
- String getOrigin();
-
+ private String getHostAndPort(URI uri) {
+ return uri.getHost() + ":" + uri.getPort();
}
+
}
Modified: 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/replication/core/src/test/java/org/apache/sling/replication/transport/impl/SimpleHttpReplicationTransportHandlerTest.java?rev=1633616&r1=1633615&r2=1633616&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/test/java/org/apache/sling/replication/transport/impl/SimpleHttpReplicationTransportHandlerTest.java (original)
+++ sling/trunk/contrib/extensions/replication/core/src/test/java/org/apache/sling/replication/transport/impl/SimpleHttpReplicationTransportHandlerTest.java Wed Oct 22 13:25:53 2014
@@ -33,6 +33,7 @@ import org.apache.sling.replication.comm
import org.apache.sling.replication.communication.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;
@@ -44,6 +45,7 @@ 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;
/**
@@ -66,6 +68,7 @@ public class SimpleHttpReplicationTransp
authProvider, endpoint, packageBuilder, maxNoOfPackages);
ResourceResolver resourceResolver = mock(ResourceResolver.class);
ReplicationPackage replicationPackage = mock(ReplicationPackage.class);
+ when(replicationPackage.getInfo()).thenReturn(mock(ReplicationPackageInfo.class));
simpleHttpReplicationTransportHandler.deliverPackage(resourceResolver, replicationPackage);
}
@@ -113,6 +116,9 @@ public class SimpleHttpReplicationTransp
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);
int maxNoOfPackages = 1;
SimpleHttpReplicationTransportHandler simpleHttpReplicationTransportHandler = new SimpleHttpReplicationTransportHandler(
authProvider, endpoint, packageBuilder, maxNoOfPackages);