Author: tommaso
Date: Mon Sep 29 20:34:42 2014
New Revision: 1628299
URL: http://svn.apache.org/r1628299
Log:
SLING-3976 - added missing TAP initialization via generic component provider
Modified:
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/agent/impl/DefaultReplicationComponentProvider.java
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/trigger/impl/ResourceEventReplicationTrigger.java
Modified:
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/agent/impl/DefaultReplicationComponentProvider.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/agent/impl/DefaultReplicationComponentProvider.java?rev=1628299&r1=1628298&r2=1628299&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/agent/impl/DefaultReplicationComponentProvider.java
(original)
+++
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/agent/impl/DefaultReplicationComponentProvider.java
Mon Sep 29 20:34:42 2014
@@ -108,7 +108,10 @@ public class DefaultReplicationComponent
return (ComponentType) createAgent(properties, this);
} else if (type.isAssignableFrom(ReplicationTrigger.class)) {
return (ComponentType) createTrigger(properties, this);
+ } else if
(type.isAssignableFrom(TransportAuthenticationProvider.class)) {
+ return (ComponentType)
createTransportAuthenticationProvider(properties, this);
}
+
} catch (Throwable t) {
log.error("Cannot create agent", t);
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=1628299&r1=1628298&r2=1628299&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
Mon Sep 29 20:34:42 2014
@@ -51,7 +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);
}
@@ -111,7 +110,8 @@ public class ResourceEventReplicationTri
}
public void handleEvent(Event event) {
- ReplicationActionType action =
SlingConstants.TOPIC_RESOURCE_REMOVED.equals(event.getTopic()) ?
ReplicationActionType.DELETE : ReplicationActionType.ADD;
+ ReplicationActionType action =
SlingConstants.TOPIC_RESOURCE_REMOVED.equals(event.getTopic()) ?
+ ReplicationActionType.DELETE : ReplicationActionType.ADD;
log.info("triggering replication from event {}", event);
Object eventProperty = event.getProperty("path");