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/10/17 09:58:46 UTC
svn commit: r1632487 [2/2] - in /sling/trunk/contrib/extensions/replication:
core/src/main/java/org/apache/sling/replication/agent/
core/src/main/java/org/apache/sling/replication/agent/impl/
core/src/main/java/org/apache/sling/replication/communicatio...
Modified: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/transport/authentication/impl/UserCredentialsTransportAuthenticationProvider.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/transport/authentication/impl/UserCredentialsTransportAuthenticationProvider.java?rev=1632487&r1=1632486&r2=1632487&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/transport/authentication/impl/UserCredentialsTransportAuthenticationProvider.java (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/transport/authentication/impl/UserCredentialsTransportAuthenticationProvider.java Fri Oct 17 07:58:45 2014
@@ -36,9 +36,6 @@ import org.slf4j.LoggerFactory;
public class UserCredentialsTransportAuthenticationProvider implements
TransportAuthenticationProvider {
- public final static String USERNAME = "username";
- public final static String PASSWORD = "password";
-
private final Logger log = LoggerFactory.getLogger(getClass());
private final String username;
@@ -46,16 +43,12 @@ public class UserCredentialsTransportAut
private final String password;
- public UserCredentialsTransportAuthenticationProvider(Map<String, Object> config) {
- username = PropertiesUtil.toString(config.get(USERNAME), "").trim();
- password = PropertiesUtil.toString(config.get(PASSWORD), "").trim();
+ public UserCredentialsTransportAuthenticationProvider(String username, String password) {
if (username.length() == 0 || password.length() == 0) {
throw new IllegalArgumentException("Username and password are required");
}
- }
- public UserCredentialsTransportAuthenticationProvider(String username, String password) {
this.username = username;
this.password = password;
}
Modified: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/transport/authentication/impl/UserCredentialsTransportAuthenticationProviderFactory.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/transport/authentication/impl/UserCredentialsTransportAuthenticationProviderFactory.java?rev=1632487&r1=1632486&r2=1632487&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/transport/authentication/impl/UserCredentialsTransportAuthenticationProviderFactory.java (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/transport/authentication/impl/UserCredentialsTransportAuthenticationProviderFactory.java Fri Oct 17 07:58:45 2014
@@ -20,10 +20,8 @@ package org.apache.sling.replication.tra
import java.util.Map;
-import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.ConfigurationPolicy;
-import org.apache.felix.scr.annotations.Property;
-import org.apache.felix.scr.annotations.Service;
+import org.apache.felix.scr.annotations.*;
+import org.apache.sling.replication.agent.ReplicationComponentFactory;
import org.apache.sling.replication.transport.authentication.TransportAuthenticationContext;
import org.apache.sling.replication.transport.authentication.TransportAuthenticationException;
import org.apache.sling.replication.transport.authentication.TransportAuthenticationProvider;
@@ -38,20 +36,26 @@ import org.slf4j.LoggerFactory;
public class UserCredentialsTransportAuthenticationProviderFactory implements
TransportAuthenticationProvider {
+ @Property(value = ReplicationComponentFactory.TRANSPORT_AUTHENTICATION_PROVIDER_USER, propertyPrivate = true)
+ private static final String TYPE = ReplicationComponentFactory.COMPONENT_TYPE;
+
@Property
- public final static String USERNAME = UserCredentialsTransportAuthenticationProvider.USERNAME;
+ public final static String USERNAME = ReplicationComponentFactory.TRANSPORT_AUTHENTICATION_PROVIDER_USER_PROPERTY_USERNAME;
@Property
- public final static String PASSWORD = UserCredentialsTransportAuthenticationProvider.PASSWORD;
+ public final static String PASSWORD = ReplicationComponentFactory.TRANSPORT_AUTHENTICATION_PROVIDER_USER_PROPERTY_PASSWORD;
private final Logger log = LoggerFactory.getLogger(getClass());
- private UserCredentialsTransportAuthenticationProvider transportAuthenticationProvider;
+ @Reference
+ ReplicationComponentFactory replicationComponentFactory;
+
+ private TransportAuthenticationProvider transportAuthenticationProvider;
public void activate(Map<String, Object> config) {
- transportAuthenticationProvider = new UserCredentialsTransportAuthenticationProvider(config);
+ transportAuthenticationProvider = replicationComponentFactory.createComponent(TransportAuthenticationProvider.class, config, null);
}
public Object authenticate(Object authenticable, TransportAuthenticationContext context)
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=1632487&r1=1632486&r2=1632487&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 Fri Oct 17 07:58:45 2014
@@ -74,53 +74,59 @@ public class SimpleHttpReplicationTransp
}
public void deliverPackage(ResourceResolver resourceResolver, ReplicationPackage replicationPackage) throws ReplicationTransportException {
- log.info("delivering package {} to {} using auth {}",
- new Object[]{
- replicationPackage.getId(),
- replicationEndpoint.getUri(),
- transportAuthenticationProvider
- });
+ 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
+ });
- try {
- Executor executor = Executor.newInstance();
-
- TransportAuthenticationContext context = new TransportAuthenticationContext();
- context.addAttribute("endpoint", replicationEndpoint);
- executor = transportAuthenticationProvider.authenticate(executor, context);
-
- Request req = Request.Post(replicationEndpoint.getUri()).useExpectContinue();
-
- InputStream inputStream = null;
- Response response = null;
try {
+ Executor executor = Executor.newInstance();
- inputStream = replicationPackage.createInputStream();
-
- if (inputStream != null) {
- req = req.bodyStream(inputStream, ContentType.APPLICATION_OCTET_STREAM);
+ TransportAuthenticationContext context = new TransportAuthenticationContext();
+ context.addAttribute("endpoint", replicationEndpoint);
+ executor = transportAuthenticationProvider.authenticate(executor, context);
+
+ Request req = Request.Post(replicationEndpoint.getUri()).useExpectContinue();
+
+ InputStream inputStream = null;
+ Response response = null;
+ try {
+
+ inputStream = replicationPackage.createInputStream();
+
+ if (inputStream != null) {
+ req = req.bodyStream(inputStream, ContentType.APPLICATION_OCTET_STREAM);
+ }
+ response = executor.execute(req);
+ } finally {
+ IOUtils.closeQuietly(inputStream);
}
- 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");
+ 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);
}
- } catch (Exception ex) {
- throw new ReplicationTransportException(ex);
}
}
- public List<ReplicationPackage> retrievePackages(ResourceResolver resourceResolver, ReplicationRequest replicationRequest) throws ReplicationTransportException {
+ public List<ReplicationPackage> retrievePackages(final ResourceResolver resourceResolver, final ReplicationRequest replicationRequest) throws ReplicationTransportException {
log.debug("polling from {}", replicationEndpoint.getUri());
try {
@@ -144,17 +150,50 @@ public class SimpleHttpReplicationTransp
while ((httpResponse = executor.execute(req).returnResponse())
.getStatusLine().getStatusCode() == 200
&& polls < maxNumberOfPackages) {
- ReplicationPackage responsePackage = packageBuilder.readPackage(resourceResolver, httpResponse.getEntity().getContent());
+ final ReplicationPackage responsePackage = packageBuilder.readPackage(resourceResolver, httpResponse.getEntity().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();
+ }
+ };
- result.add(responsePackage);
+ result.add(httpPackage);
polls++;
}
- if (polls > 0) {
- log.info("polled {} packages from {}", polls, replicationEndpoint.getUri());
- } else {
- log.debug("polled {} packages from {}", polls, replicationEndpoint.getUri());
- }
+ log.info("polled {} packages from {}", polls, replicationEndpoint.getUri());
} catch (HttpHostConnectException e) {
log.warn("could not connect to {} - skipping", replicationEndpoint.getUri());
@@ -167,4 +206,10 @@ public class SimpleHttpReplicationTransp
}
}
+
+ private interface HttpPackage extends ReplicationPackage {
+
+ String getOrigin();
+
+ }
}
Modified: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/trigger/impl/AbstractJcrEventTrigger.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/trigger/impl/AbstractJcrEventTrigger.java?rev=1632487&r1=1632486&r2=1632487&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/trigger/impl/AbstractJcrEventTrigger.java (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/trigger/impl/AbstractJcrEventTrigger.java Fri Oct 17 07:58:45 2014
@@ -40,9 +40,6 @@ import org.slf4j.LoggerFactory;
*/
public abstract class AbstractJcrEventTrigger implements ReplicationTrigger, EventListener {
- protected static final String PATH = "path";
- protected static final String SERVICENAME = "servicename";
-
private final Logger log = LoggerFactory.getLogger(getClass());
private final String path;
private final String serviceUser;
@@ -57,9 +54,6 @@ public abstract class AbstractJcrEventTr
this.serviceUser = serviceUser;
}
- public AbstractJcrEventTrigger(Map<String, Object> properties, SlingRepository repository) {
- this(repository, PropertiesUtil.toString(properties.get(PATH), null), PropertiesUtil.toString(properties.get(SERVICENAME), null));
- }
public void register(String handlerId, ReplicationTriggerRequestHandler requestHandler) {
try {
Modified: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/trigger/impl/ChainReplicateReplicationTrigger.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/trigger/impl/ChainReplicateReplicationTrigger.java?rev=1632487&r1=1632486&r2=1632487&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/trigger/impl/ChainReplicateReplicationTrigger.java (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/trigger/impl/ChainReplicateReplicationTrigger.java Fri Oct 17 07:58:45 2014
@@ -44,7 +44,6 @@ import org.slf4j.LoggerFactory;
*/
public class ChainReplicateReplicationTrigger implements ReplicationTrigger, ReplicationComponent {
- public static final String TYPE = "replicateEvent";
public static final String PATH = "path";
@@ -55,10 +54,6 @@ public class ChainReplicateReplicationTr
private final Map<String, ServiceRegistration> registrations = new ConcurrentHashMap<String, ServiceRegistration>();
- public ChainReplicateReplicationTrigger(Map<String, Object> config, BundleContext bundleContext) {
- this(PropertiesUtil.toString(config.get(PATH), null), bundleContext);
- }
-
public ChainReplicateReplicationTrigger(String pathPrefix, BundleContext bundleContext) {
this.bundleContext = bundleContext;
this.pathPrefix = pathPrefix;
Modified: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/trigger/impl/JcrEventReplicationTrigger.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/trigger/impl/JcrEventReplicationTrigger.java?rev=1632487&r1=1632486&r2=1632487&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/trigger/impl/JcrEventReplicationTrigger.java (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/trigger/impl/JcrEventReplicationTrigger.java Fri Oct 17 07:58:45 2014
@@ -35,17 +35,12 @@ import org.slf4j.LoggerFactory;
*/
public class JcrEventReplicationTrigger extends AbstractJcrEventTrigger implements ReplicationTrigger {
- public static final String TYPE = "jcrEvent";
-
private final Logger log = LoggerFactory.getLogger(this.getClass());
public JcrEventReplicationTrigger(SlingRepository repository, String path, String serviceName) {
super(repository, path, serviceName);
}
- public JcrEventReplicationTrigger(Map<String, Object> properties, SlingRepository repository) {
- this(repository, PropertiesUtil.toString(properties.get(PATH), null), PropertiesUtil.toString(properties.get(SERVICENAME), null));
- }
@Override
protected ReplicationRequest processEvent(Event event) throws RepositoryException {
Modified: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/trigger/impl/PersistingJcrEventReplicationTrigger.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/trigger/impl/PersistingJcrEventReplicationTrigger.java?rev=1632487&r1=1632486&r2=1632487&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/trigger/impl/PersistingJcrEventReplicationTrigger.java (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/trigger/impl/PersistingJcrEventReplicationTrigger.java Fri Oct 17 07:58:45 2014
@@ -42,21 +42,15 @@ public class PersistingJcrEventReplicati
private static final String NUGGETS_PATH_PROPERTY = "nuggets.path";
private static final String DEFAULT_NUGGETS_PATH = "/var/nuggets";
- public static final String TYPE = "persistedJcrEvent";
-
private final Logger log = LoggerFactory.getLogger(getClass());
private final String nuggetsPath;
public PersistingJcrEventReplicationTrigger(SlingRepository repository, String path, String servicename, String nuggetsPath) {
super(repository, path, servicename);
- this.nuggetsPath = nuggetsPath;
+ this.nuggetsPath = nuggetsPath == null? DEFAULT_NUGGETS_PATH : nuggetsPath;
}
- public PersistingJcrEventReplicationTrigger(Map<String, Object> properties, SlingRepository repository) {
- super(properties, repository);
- this.nuggetsPath = PropertiesUtil.toString(properties.get(NUGGETS_PATH_PROPERTY), DEFAULT_NUGGETS_PATH);
- }
@Override
protected ReplicationRequest processEvent(Event event) throws RepositoryException {
Modified: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/trigger/impl/RemoteEventReplicationTrigger.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/trigger/impl/RemoteEventReplicationTrigger.java?rev=1632487&r1=1632486&r2=1632487&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/trigger/impl/RemoteEventReplicationTrigger.java (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/trigger/impl/RemoteEventReplicationTrigger.java Fri Oct 17 07:58:45 2014
@@ -58,9 +58,6 @@ public class RemoteEventReplicationTrigg
private final Logger log = LoggerFactory.getLogger(getClass());
- public final static String TYPE = "remoteEvent";
- public final static String ENDPOINT = "endpoint";
-
private final ReplicationEndpoint endpoint;
private final TransportAuthenticationProvider<CredentialsProvider, CredentialsProvider> authenticationProvider;
@@ -68,12 +65,6 @@ public class RemoteEventReplicationTrigg
private Map<String, Future<HttpResponse>> requests = new ConcurrentHashMap<String, Future<HttpResponse>>();
- public RemoteEventReplicationTrigger(Map<String, Object> config, TransportAuthenticationProvider<CredentialsProvider, CredentialsProvider> authenticationProvider, Scheduler scheduler) {
- this(PropertiesUtil.toString(config.get(ENDPOINT), null),
- authenticationProvider,
- scheduler);
- }
-
public RemoteEventReplicationTrigger(String endpoint, TransportAuthenticationProvider<CredentialsProvider, CredentialsProvider> authenticationProvider, Scheduler scheduler) {
if (endpoint == null) {
throw new IllegalArgumentException("Endpoint is required");
Modified: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/trigger/impl/ResourceEventReplicationTrigger.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/trigger/impl/ResourceEventReplicationTrigger.java?rev=1632487&r1=1632486&r2=1632487&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/trigger/impl/ResourceEventReplicationTrigger.java (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/trigger/impl/ResourceEventReplicationTrigger.java Fri Oct 17 07:58:45 2014
@@ -44,8 +44,6 @@ import org.slf4j.LoggerFactory;
*/
public class ResourceEventReplicationTrigger implements ReplicationTrigger, ReplicationComponent {
- public static final String TYPE = "resourceEvent";
- public static final String PATH = "path";
private final Logger log = LoggerFactory.getLogger(getClass());
@@ -53,9 +51,6 @@ public class ResourceEventReplicationTri
private final String path;
private final Map<String, ServiceRegistration> registrations = new ConcurrentHashMap<String, ServiceRegistration>();
- public ResourceEventReplicationTrigger(Map<String, Object> config, BundleContext bundleContext) {
- this(PropertiesUtil.toString(config.get(PATH), null), bundleContext);
- }
public ResourceEventReplicationTrigger(String path, BundleContext bundleContext) {
if (bundleContext == null) {
Modified: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/trigger/impl/ScheduledReplicationTrigger.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/trigger/impl/ScheduledReplicationTrigger.java?rev=1632487&r1=1632486&r2=1632487&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/trigger/impl/ScheduledReplicationTrigger.java (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/trigger/impl/ScheduledReplicationTrigger.java Fri Oct 17 07:58:45 2014
@@ -36,12 +36,6 @@ import org.slf4j.LoggerFactory;
*/
public class ScheduledReplicationTrigger implements ReplicationTrigger {
- public static final String TYPE = "scheduledEvent";
-
- public static final String ACTION = "action";
- public static final String PATH = "path";
- public static final String SECONDS = "seconds";
-
private final Logger log = LoggerFactory.getLogger(getClass());
private final ReplicationActionType replicationAction;
@@ -50,15 +44,9 @@ public class ScheduledReplicationTrigger
private final Scheduler scheduler;
- public ScheduledReplicationTrigger(Map<String, Object> config, Scheduler scheduler) {
- this(ReplicationActionType.fromName(PropertiesUtil.toString(config.get(ACTION), ReplicationActionType.POLL.name())),
- PropertiesUtil.toString(config.get(PATH), "/"),
- PropertiesUtil.toInteger(config.get(SECONDS), 30),
- scheduler);
- }
- public ScheduledReplicationTrigger(ReplicationActionType replicationAction, String path, int secondsInterval, Scheduler scheduler) {
- this.replicationAction = replicationAction;
+ public ScheduledReplicationTrigger(String replicationActionName, String path, int secondsInterval, Scheduler scheduler) {
+ this.replicationAction = ReplicationActionType.fromName(replicationActionName);
this.path = path;
this.secondsInterval = secondsInterval;
this.scheduler = scheduler;
Modified: sling/trunk/contrib/extensions/replication/it/src/main/resources/SLING-CONTENT/libs/test/install.author/org.apache.sling.replication.agent.impl.GenericReplicationComponentFactory-trigger-test-remote-event.json
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/it/src/main/resources/SLING-CONTENT/libs/test/install.author/org.apache.sling.replication.agent.impl.GenericReplicationComponentFactory-trigger-test-remote-event.json?rev=1632487&r1=1632486&r2=1632487&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/it/src/main/resources/SLING-CONTENT/libs/test/install.author/org.apache.sling.replication.agent.impl.GenericReplicationComponentFactory-trigger-test-remote-event.json (original)
+++ sling/trunk/contrib/extensions/replication/it/src/main/resources/SLING-CONTENT/libs/test/install.author/org.apache.sling.replication.agent.impl.GenericReplicationComponentFactory-trigger-test-remote-event.json Fri Oct 17 07:58:45 2014
@@ -8,8 +8,8 @@
"type=remoteEvent",
"endpoint=http://localhost:4503/libs/sling/replication/services/triggers/content-changed.event",
- "authenticationProvider/type=service",
- "authenticationProvider/name=publishAdmin"
+ "transportAuthenticationProvider/type=service",
+ "transportAuthenticationProvider/name=publishAdmin"
]
}
\ No newline at end of file
Modified: sling/trunk/contrib/extensions/replication/it/src/main/resources/SLING-CONTENT/libs/test/install.author/org.apache.sling.replication.agent.impl.GenericReplicationComponentFactory-trigger-test-replicate-event.json
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/it/src/main/resources/SLING-CONTENT/libs/test/install.author/org.apache.sling.replication.agent.impl.GenericReplicationComponentFactory-trigger-test-replicate-event.json?rev=1632487&r1=1632486&r2=1632487&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/it/src/main/resources/SLING-CONTENT/libs/test/install.author/org.apache.sling.replication.agent.impl.GenericReplicationComponentFactory-trigger-test-replicate-event.json (original)
+++ sling/trunk/contrib/extensions/replication/it/src/main/resources/SLING-CONTENT/libs/test/install.author/org.apache.sling.replication.agent.impl.GenericReplicationComponentFactory-trigger-test-replicate-event.json Fri Oct 17 07:58:45 2014
@@ -5,7 +5,7 @@
"componentType": "trigger",
"properties": [
- "type=replicateEvent"
+ "type=replicationEvent"
]
Modified: 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/replication/it/src/test/java/org/apache/sling/replication/it/ReplicationIntegrationTestBase.java?rev=1632487&r1=1632486&r2=1632487&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/it/src/test/java/org/apache/sling/replication/it/ReplicationIntegrationTestBase.java (original)
+++ sling/trunk/contrib/extensions/replication/it/src/test/java/org/apache/sling/replication/it/ReplicationIntegrationTestBase.java Fri Oct 17 07:58:45 2014
@@ -60,10 +60,7 @@ public abstract class ReplicationIntegra
setAgentProperties(author, "publish",
"packageImporter", "type=remote",
"packageImporter", "endpoints[0]=" + remoteImporterUrl,
- "packageImporter", "authenticationProvider/type=service",
- "packageImporter", "authenticationProvider/name=publishAdmin",
- "packageImporter", "packageBuilder/type=vlt",
- "packageImporter", "packageBuilder/servicename=replicationService");
+ "packageImporter", "packageBuilder/type=vlt");
Thread.sleep(3000);
@@ -75,10 +72,8 @@ public abstract class ReplicationIntegra
setAgentProperties(author, "publish-reverse",
"packageExporter", "type=remote",
"packageExporter", "endpoints[0]=" + remoteExporterUrl,
- "packageExporter", "authenticationProvider/type=service",
- "packageExporter", "authenticationProvider/name=publishAdmin",
- "packageExporter", "packageBuilder/type=vlt",
- "packageExporter", "packageBuilder/servicename=replicationService");
+
+ "packageExporter", "packageBuilder/type=vlt");
Thread.sleep(3000);
assertExists(authorClient, agentUrl("publish-reverse"));
Modified: sling/trunk/contrib/extensions/replication/sample/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.CoordinatingReplicationAgentFactory-pubsync.json
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/sample/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.CoordinatingReplicationAgentFactory-pubsync.json?rev=1632487&r1=1632486&r2=1632487&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/sample/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.CoordinatingReplicationAgentFactory-pubsync.json (original)
+++ sling/trunk/contrib/extensions/replication/sample/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.CoordinatingReplicationAgentFactory-pubsync.json Fri Oct 17 07:58:45 2014
@@ -4,10 +4,12 @@
"serviceName" : "replicationService",
+ "requestAuthorizationStrategy" : [
+ "type=privilege",
+ "jcrPrivilege=jcr:read"
+ ],
"packageExporter": [
- "authenticationProvider/type=service",
-
"packageBuilder/type=vlt",
"endpoints[0]=http://localhost:4503/libs/sling/replication/services/exporters/reverse-pubsync",
@@ -16,14 +18,7 @@
"endpoints.strategy=All"
],
- "packageExporterStrategy" : [
- "type=privilege",
- "jcrPrivilege=jcr:read"
- ],
-
"packageImporter": [
- "authenticationProvider/type=service",
-
"packageBuilder/type=vlt",
"endpoints[0]=http://localhost:4503/libs/sling/replication/services/importers/default",
Modified: sling/trunk/contrib/extensions/replication/sample/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-publish-reverse.json
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/sample/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-publish-reverse.json?rev=1632487&r1=1632486&r2=1632487&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/sample/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-publish-reverse.json (original)
+++ sling/trunk/contrib/extensions/replication/sample/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-publish-reverse.json Fri Oct 17 07:58:45 2014
@@ -11,8 +11,6 @@
"type=remote",
"endpoints[0]=http://localhost:4503/libs/sling/replication/services/exporters/reverse",
- "authenticationProvider/type=service",
-
"packageBuilder/type=vlt"
],
@@ -23,7 +21,7 @@
"packageImporter": [
"type=local",
- "packageBuilder/type=vlt",
+ "packageBuilder/type=vlt"
],
"trigger0": [
@@ -34,9 +32,7 @@
"trigger1": [
"type=remoteEvent",
- "endpoint=http://localhost:4503/libs/sling/replication/services/triggers/content-changed.event",
-
- "authenticationProvider/type=service"
+ "endpoint=http://localhost:4503/libs/sling/replication/services/triggers/content-changed.event"
],
Modified: sling/trunk/contrib/extensions/replication/sample/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-publish.json
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/sample/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-publish.json?rev=1632487&r1=1632486&r2=1632487&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/sample/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-publish.json (original)
+++ sling/trunk/contrib/extensions/replication/sample/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-publish.json Fri Oct 17 07:58:45 2014
@@ -4,16 +4,16 @@
"serviceName" : "replicationService",
- "packageExporter": [
- "type=local",
- "packageBuilder/type=vlt"
- ],
-
"requestAuthorizationStrategy" : [
"type=privilege",
"jcrPrivilege=jcr:read"
],
+ "packageExporter": [
+ "type=local",
+ "packageBuilder/type=vlt"
+ ],
+
"packageImporter": [
"type=remote",
"endpoints[0]=http://localhost:4503/libs/sling/replication/services/importers/default",
Modified: sling/trunk/contrib/extensions/replication/sample/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.packaging.impl.exporter.AgentReplicationPackageExporterFactory-reverse.json
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/sample/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.packaging.impl.exporter.AgentReplicationPackageExporterFactory-reverse.json?rev=1632487&r1=1632486&r2=1632487&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/sample/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.packaging.impl.exporter.AgentReplicationPackageExporterFactory-reverse.json (original)
+++ sling/trunk/contrib/extensions/replication/sample/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.packaging.impl.exporter.AgentReplicationPackageExporterFactory-reverse.json Fri Oct 17 07:58:45 2014
@@ -3,7 +3,6 @@
"name": "reverse",
"packageBuilder": [ "type=vlt" ],
- "agent" : [ "type=service"],
"ReplicationAgent.target": "(name=reverse)"
}
\ No newline at end of file