Author: tommaso
Date: Sat Feb 22 07:40:46 2014
New Revision: 1570808
URL: http://svn.apache.org/r1570808
Log:
SLING-3408 - ReplicationAgent runMode should be controlled by configuration
properties
Added:
sling/trunk/contrib/extensions/replication/src/main/resources/SLING-CONTENT/libs/sling/replication/config/org.apache.sling.replication.agent.impl.ReplicationAgentServiceFactory-author.json
- copied, changed from r1570192,
sling/trunk/contrib/extensions/replication/src/main/resources/SLING-CONTENT/libs/sling/replication/config.publish/org.apache.sling.replication.agent.impl.ReplicationAgentServiceFactory-author.json
sling/trunk/contrib/extensions/replication/src/main/resources/SLING-CONTENT/libs/sling/replication/config/org.apache.sling.replication.agent.impl.ReplicationAgentServiceFactory-cache-flush.json
- copied, changed from r1570192,
sling/trunk/contrib/extensions/replication/src/main/resources/SLING-CONTENT/libs/sling/replication/config.publish/org.apache.sling.replication.agent.impl.ReplicationAgentServiceFactory-cache-flush.json
sling/trunk/contrib/extensions/replication/src/main/resources/SLING-CONTENT/libs/sling/replication/config/org.apache.sling.replication.agent.impl.ReplicationAgentServiceFactory-publish-reverse.json
- copied, changed from r1570484,
sling/trunk/contrib/extensions/replication/src/main/resources/SLING-CONTENT/libs/sling/replication/config.author/org.apache.sling.replication.agent.impl.ReplicationAgentServiceFactory-publish-reverse.json
sling/trunk/contrib/extensions/replication/src/main/resources/SLING-CONTENT/libs/sling/replication/config/org.apache.sling.replication.agent.impl.ReplicationAgentServiceFactory-publish.json
- copied, changed from r1570192,
sling/trunk/contrib/extensions/replication/src/main/resources/SLING-CONTENT/libs/sling/replication/config.author/org.apache.sling.replication.agent.impl.ReplicationAgentServiceFactory-publish.json
sling/trunk/contrib/extensions/replication/src/main/resources/SLING-CONTENT/libs/sling/replication/config/org.apache.sling.replication.agent.impl.ReplicationAgentServiceFactory-reverserepo.json
- copied, changed from r1570192,
sling/trunk/contrib/extensions/replication/src/main/resources/SLING-CONTENT/libs/sling/replication/config.publish/org.apache.sling.replication.agent.impl.ReplicationAgentServiceFactory-reverserepo.json
sling/trunk/contrib/extensions/replication/src/main/resources/SLING-CONTENT/libs/sling/replication/config/org.apache.sling.replication.transport.impl.HttpTransportHandlerFactory-http-author-receive.json
- copied unchanged from r1570192,
sling/trunk/contrib/extensions/replication/src/main/resources/SLING-CONTENT/libs/sling/replication/config.publish/org.apache.sling.replication.transport.impl.HttpTransportHandlerFactory-http-author-receive.json
sling/trunk/contrib/extensions/replication/src/main/resources/SLING-CONTENT/libs/sling/replication/config/org.apache.sling.replication.transport.impl.HttpTransportHandlerFactory-http-cache-flush.json
- copied unchanged from r1570192,
sling/trunk/contrib/extensions/replication/src/main/resources/SLING-CONTENT/libs/sling/replication/config.publish/org.apache.sling.replication.transport.impl.HttpTransportHandlerFactory-http-cache-flush.json
sling/trunk/contrib/extensions/replication/src/main/resources/SLING-CONTENT/libs/sling/replication/config/org.apache.sling.replication.transport.impl.HttpTransportHandlerFactory-http-publish-receive.json
- copied unchanged from r1570192,
sling/trunk/contrib/extensions/replication/src/main/resources/SLING-CONTENT/libs/sling/replication/config.author/org.apache.sling.replication.transport.impl.HttpTransportHandlerFactory-http-publish-receive.json
sling/trunk/contrib/extensions/replication/src/main/resources/SLING-CONTENT/libs/sling/replication/config/org.apache.sling.replication.transport.impl.PollingTransportHandlerFactory-http-publish-poll.json
- copied unchanged from r1570192,
sling/trunk/contrib/extensions/replication/src/main/resources/SLING-CONTENT/libs/sling/replication/config.author/org.apache.sling.replication.transport.impl.PollingTransportHandlerFactory-http-publish-poll.json
Removed:
sling/trunk/contrib/extensions/replication/src/main/resources/SLING-CONTENT/libs/sling/replication/config.author/
sling/trunk/contrib/extensions/replication/src/main/resources/SLING-CONTENT/libs/sling/replication/config.publish/
Modified:
sling/trunk/contrib/extensions/replication/pom.xml
sling/trunk/contrib/extensions/replication/src/main/java/org/apache/sling/replication/agent/ReplicationAgent.java
sling/trunk/contrib/extensions/replication/src/main/java/org/apache/sling/replication/agent/ReplicationAgentConfiguration.java
sling/trunk/contrib/extensions/replication/src/main/java/org/apache/sling/replication/agent/impl/ReplicationAgentServiceFactory.java
sling/trunk/contrib/extensions/replication/src/test/java/org/apache/sling/replication/agent/impl/ReplicationAgentServiceFactoryTest.java
Modified: sling/trunk/contrib/extensions/replication/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/pom.xml?rev=1570808&r1=1570807&r2=1570808&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/pom.xml (original)
+++ sling/trunk/contrib/extensions/replication/pom.xml Sat Feb 22 07:40:46 2014
@@ -138,7 +138,13 @@
<artifactId>org.apache.sling.hc.core</artifactId>
<version>1.0.6</version>
<scope>provided</scope>
- </dependency>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.settings</artifactId>
+ <version>1.3.0</version>
+ <scope>provided</scope>
+ </dependency>
<!-- LOGGING -->
<dependency>
<groupId>org.slf4j</groupId>
Modified:
sling/trunk/contrib/extensions/replication/src/main/java/org/apache/sling/replication/agent/ReplicationAgent.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/src/main/java/org/apache/sling/replication/agent/ReplicationAgent.java?rev=1570808&r1=1570807&r2=1570808&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/replication/src/main/java/org/apache/sling/replication/agent/ReplicationAgent.java
(original)
+++
sling/trunk/contrib/extensions/replication/src/main/java/org/apache/sling/replication/agent/ReplicationAgent.java
Sat Feb 22 07:40:46 2014
@@ -65,8 +65,8 @@ public interface ReplicationAgent {
/**
* removes a package from the top of the queue
* @param queueName
- * the name of a {@link ReplicationQueue} bound tothis agent
- * @return
+ * the name of a {@link ReplicationQueue} bound to this agent
+ * @return the <code>ReplicationPackage</code> popped from the underlying
<code>ReplicationQueue</code>
* @throws ReplicationQueueException
*/
ReplicationPackage removeHead(String queueName) throws
ReplicationQueueException;
Modified:
sling/trunk/contrib/extensions/replication/src/main/java/org/apache/sling/replication/agent/ReplicationAgentConfiguration.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/src/main/java/org/apache/sling/replication/agent/ReplicationAgentConfiguration.java?rev=1570808&r1=1570807&r2=1570808&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/replication/src/main/java/org/apache/sling/replication/agent/ReplicationAgentConfiguration.java
(original)
+++
sling/trunk/contrib/extensions/replication/src/main/java/org/apache/sling/replication/agent/ReplicationAgentConfiguration.java
Sat Feb 22 07:40:46 2014
@@ -51,7 +51,9 @@ public class ReplicationAgentConfigurati
public static final String USE_AGGREGATE_PATHS = "useAggregatePaths";
- public static final String[] COMPONENTS = { TRANSPORT, PACKAGING };
+ public static final String[] COMPONENTS = {TRANSPORT, PACKAGING};
+
+ public static final String RUNMODES = "runModes";
private final boolean enabled;
@@ -75,6 +77,8 @@ public class ReplicationAgentConfigurati
private final boolean useAggregatePaths;
+ private final String[] runModes;
+
private final Dictionary<String, Dictionary> componentConfiguration;
public ReplicationAgentConfiguration(Dictionary<?, ?> dictionary,
Dictionary<String, Dictionary> componentConfiguration) {
@@ -92,6 +96,7 @@ public class ReplicationAgentConfigurati
this.authenticationProperties = ap != null ? ap : new String[0];
this.rules = PropertiesUtil.toStringArray(dictionary.get(RULES), new
String[0]);
this.useAggregatePaths =
PropertiesUtil.toBoolean(dictionary.get(USE_AGGREGATE_PATHS), true);
+ this.runModes = PropertiesUtil.toStringArray(dictionary.get(RUNMODES),
new String[0]);
this.componentConfiguration = componentConfiguration;
}
@@ -109,6 +114,8 @@ public class ReplicationAgentConfigurati
return name;
}
+ public String[] getRules() { return rules; }
+
public String getTargetAuthenticationHandlerFactory() {
return targetAuthenticationHandlerFactory;
}
@@ -129,6 +136,8 @@ public class ReplicationAgentConfigurati
return targetReplicationQueueDistributionStrategy;
}
+ public String[] getRunModes() { return runModes; }
+
@Override
public String toString() {
String result = "{\"";
@@ -145,7 +154,9 @@ public class ReplicationAgentConfigurati
result += toComponentString();
- result += RULES + "\":\"" + Arrays.toString(rules) + "\"}";
+ result += RULES + "\":\"" + Arrays.toString(rules);
+ result += RUNMODES +"\":\"" + Arrays.toString(runModes);
+ result += "\"}";
return result;
}
Modified:
sling/trunk/contrib/extensions/replication/src/main/java/org/apache/sling/replication/agent/impl/ReplicationAgentServiceFactory.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/src/main/java/org/apache/sling/replication/agent/impl/ReplicationAgentServiceFactory.java?rev=1570808&r1=1570807&r2=1570808&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/replication/src/main/java/org/apache/sling/replication/agent/impl/ReplicationAgentServiceFactory.java
(original)
+++
sling/trunk/contrib/extensions/replication/src/main/java/org/apache/sling/replication/agent/impl/ReplicationAgentServiceFactory.java
Sat Feb 22 07:40:46 2014
@@ -22,8 +22,14 @@ import java.util.Dictionary;
import java.util.Hashtable;
import java.util.Map;
import java.util.Random;
-
-import org.apache.felix.scr.annotations.*;
+import java.util.Set;
+import org.apache.felix.scr.annotations.Activate;
+import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.ConfigurationPolicy;
+import org.apache.felix.scr.annotations.Deactivate;
+import org.apache.felix.scr.annotations.Property;
+import org.apache.felix.scr.annotations.Reference;
+import org.apache.felix.scr.annotations.ReferencePolicy;
import org.apache.sling.commons.osgi.PropertiesUtil;
import org.apache.sling.replication.agent.AgentConfigurationException;
import org.apache.sling.replication.agent.ReplicationAgent;
@@ -38,6 +44,7 @@ import org.apache.sling.replication.seri
import
org.apache.sling.replication.serialization.impl.vlt.FileVaultReplicationPackageBuilder;
import org.apache.sling.replication.transport.TransportHandler;
import org.apache.sling.replication.transport.impl.NopTransportHandler;
+import org.apache.sling.settings.SlingSettingsService;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
import org.osgi.framework.ServiceRegistration;
@@ -97,18 +104,21 @@ public class ReplicationAgentServiceFact
@Reference(name = "TransportHandler", target = "(name=" +
NopTransportHandler.NAME + ")", policy = ReferencePolicy.DYNAMIC)
private TransportHandler transportHandler;
- @Property(label = "Target ReplicationPackageBuilder",name = PACKAGING,
value = DEFAULT_PACKAGING)
+ @Property(label = "Target ReplicationPackageBuilder", name = PACKAGING,
value = DEFAULT_PACKAGING)
@Reference(name = "ReplicationPackageBuilder", target = DEFAULT_PACKAGING,
policy = ReferencePolicy.DYNAMIC)
private ReplicationPackageBuilder packageBuilder;
- @Property(label = "Target ReplicationQueueProvider",name = QUEUEPROVIDER,
value = DEFAULT_QUEUEPROVIDER)
+ @Property(label = "Target ReplicationQueueProvider", name = QUEUEPROVIDER,
value = DEFAULT_QUEUEPROVIDER)
@Reference(name = "ReplicationQueueProvider", target =
DEFAULT_QUEUEPROVIDER, policy = ReferencePolicy.DYNAMIC)
private ReplicationQueueProvider queueProvider;
- @Property(label = "Target QueueDistributionStrategy",name =
QUEUE_DISTRIBUTION, value = DEFAULT_DISTRIBUTION)
+ @Property(label = "Target QueueDistributionStrategy", name =
QUEUE_DISTRIBUTION, value = DEFAULT_DISTRIBUTION)
@Reference(name = "ReplicationQueueDistributionStrategy", target =
DEFAULT_DISTRIBUTION, policy = ReferencePolicy.DYNAMIC)
private ReplicationQueueDistributionStrategy queueDistributionStrategy;
+ @Property(label = "Runmodes")
+ private static final String RUNMODES =
ReplicationAgentConfiguration.RUNMODES;
+
private ServiceRegistration agentReg;
@Reference
@@ -117,6 +127,8 @@ public class ReplicationAgentServiceFact
@Reference
private ReplicationEventFactory replicationEventFactory;
+ @Reference
+ private SlingSettingsService settingsService;
@Activate
public void activate(BundleContext context, Map<String, ?> config) throws
Exception {
@@ -125,9 +137,13 @@ public class ReplicationAgentServiceFact
Dictionary<String, Object> props = new Hashtable<String, Object>();
boolean enabled = PropertiesUtil.toBoolean(config.get(ENABLED), true);
+
if (enabled) {
props.put(ENABLED, true);
+ String[] runModes =
PropertiesUtil.toStringArray(config.get(RUNMODES), new String[0]);
+ props.put(RUNMODES, runModes);
+
String name = PropertiesUtil
.toString(config.get(NAME), String.valueOf(new
Random().nextInt(1000)));
props.put(NAME, name);
@@ -165,22 +181,40 @@ public class ReplicationAgentServiceFact
ReplicationAgent agent = new SimpleReplicationAgent(name, rules,
useAggregatePaths,
transportHandler, packageBuilder, queueProvider,
queueDistributionStrategy, replicationEventFactory, replicationRuleEngine);
- // register agent service
- agentReg =
context.registerService(ReplicationAgent.class.getName(), agent, props);
- agent.enable();
+ // only enable if instance runmodes match configured ones
+ if (matchRunmodes(runModes)) {
+ // register agent service
+ agentReg =
context.registerService(ReplicationAgent.class.getName(), agent, props);
+ agent.enable();
+ }
}
}
+ private boolean matchRunmodes(String[] configuredRunModes) {
+ boolean match = configuredRunModes == null ||
configuredRunModes.length == 0;
+ if (!match) {
+ Set<String> activeRunModes = settingsService.getRunModes();
+ for (String activeRunMode : activeRunModes) {
+ for (String configuredRunMode : configuredRunModes) {
+ if (activeRunMode.equals(configuredRunMode)) {
+ match = true;
+ break;
+ }
+ }
+ }
+ }
+ return match;
+ }
+
@Deactivate
private void deactivate(BundleContext context) throws Exception {
if (agentReg != null) {
ServiceReference reference = agentReg.getReference();
ReplicationAgent replicationAgent = (ReplicationAgent)
context.getService(reference);
-
replicationAgent.disable();
-
agentReg.unregister();
}
+
}
}
Copied:
sling/trunk/contrib/extensions/replication/src/main/resources/SLING-CONTENT/libs/sling/replication/config/org.apache.sling.replication.agent.impl.ReplicationAgentServiceFactory-author.json
(from r1570192,
sling/trunk/contrib/extensions/replication/src/main/resources/SLING-CONTENT/libs/sling/replication/config.publish/org.apache.sling.replication.agent.impl.ReplicationAgentServiceFactory-author.json)
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/src/main/resources/SLING-CONTENT/libs/sling/replication/config/org.apache.sling.replication.agent.impl.ReplicationAgentServiceFactory-author.json?p2=sling/trunk/contrib/extensions/replication/src/main/resources/SLING-CONTENT/libs/sling/replication/config/org.apache.sling.replication.agent.impl.ReplicationAgentServiceFactory-author.json&p1=sling/trunk/contrib/extensions/replication/src/main/resources/SLING-CONTENT/libs/sling/replication/config.publish/org.apache.sling.replication.agent.impl.ReplicationAgentServiceFactory-author.json&r1=1570192&r2=1570808&rev=1570808&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/replication/src/main/resources/SLING-CONTENT/libs/sling/replication/config.publish/org.apache.sling.replication.agent.impl.ReplicationAgentServiceFactory-author.json
(original)
+++
sling/trunk/contrib/extensions/replication/src/main/resources/SLING-CONTENT/libs/sling/replication/config/org.apache.sling.replication.agent.impl.ReplicationAgentServiceFactory-author.json
Sat Feb 22 07:40:46 2014
@@ -6,5 +6,6 @@
"ReplicationQueueProvider.target" : "(name=sjh)",
"ReplicationQueueDistributionStrategy.target" : "(name=error)",
"rules" : ["trigger on path: /content/usergenerated"],
- "enabled" : false
+ "enabled" : false,
+ "runModes" : ["publish"]
}
Copied:
sling/trunk/contrib/extensions/replication/src/main/resources/SLING-CONTENT/libs/sling/replication/config/org.apache.sling.replication.agent.impl.ReplicationAgentServiceFactory-cache-flush.json
(from r1570192,
sling/trunk/contrib/extensions/replication/src/main/resources/SLING-CONTENT/libs/sling/replication/config.publish/org.apache.sling.replication.agent.impl.ReplicationAgentServiceFactory-cache-flush.json)
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/src/main/resources/SLING-CONTENT/libs/sling/replication/config/org.apache.sling.replication.agent.impl.ReplicationAgentServiceFactory-cache-flush.json?p2=sling/trunk/contrib/extensions/replication/src/main/resources/SLING-CONTENT/libs/sling/replication/config/org.apache.sling.replication.agent.impl.ReplicationAgentServiceFactory-cache-flush.json&p1=sling/trunk/contrib/extensions/replication/src/main/resources/SLING-CONTENT/libs/sling/replication/config.publish/org.apache.sling.replication.agent.impl.ReplicationAgentServiceFactory-cache-flush.json&r1=1570192&r2=1570808&rev=1570808&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/replication/src/main/resources/SLING-CONTENT/libs/sling/replication/config.publish/org.apache.sling.replication.agent.impl.ReplicationAgentServiceFactory-cache-flush.json
(original)
+++
sling/trunk/contrib/extensions/replication/src/main/resources/SLING-CONTENT/libs/sling/replication/config/org.apache.sling.replication.agent.impl.ReplicationAgentServiceFactory-cache-flush.json
Sat Feb 22 07:40:46 2014
@@ -7,5 +7,6 @@
"ReplicationQueueProvider.target" : "(name=simple)",
"ReplicationQueueDistributionStrategy.target" : "(name=single)",
"rules" : ["trigger on path: /content/usergenerated"],
- "enabled" : false
+ "enabled" : false,
+ "runModes" : ["publish"]
}
Copied:
sling/trunk/contrib/extensions/replication/src/main/resources/SLING-CONTENT/libs/sling/replication/config/org.apache.sling.replication.agent.impl.ReplicationAgentServiceFactory-publish-reverse.json
(from r1570484,
sling/trunk/contrib/extensions/replication/src/main/resources/SLING-CONTENT/libs/sling/replication/config.author/org.apache.sling.replication.agent.impl.ReplicationAgentServiceFactory-publish-reverse.json)
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/src/main/resources/SLING-CONTENT/libs/sling/replication/config/org.apache.sling.replication.agent.impl.ReplicationAgentServiceFactory-publish-reverse.json?p2=sling/trunk/contrib/extensions/replication/src/main/resources/SLING-CONTENT/libs/sling/replication/config/org.apache.sling.replication.agent.impl.ReplicationAgentServiceFactory-publish-reverse.json&p1=sling/trunk/contrib/extensions/replication/src/main/resources/SLING-CONTENT/libs/sling/replication/config.author/org.apache.sling.replication.agent.impl.ReplicationAgentServiceFactory-publish-reverse.json&r1=1570484&r2=1570808&rev=1570808&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/replication/src/main/resources/SLING-CONTENT/libs/sling/replication/config.author/org.apache.sling.replication.agent.impl.ReplicationAgentServiceFactory-publish-reverse.json
(original)
+++
sling/trunk/contrib/extensions/replication/src/main/resources/SLING-CONTENT/libs/sling/replication/config/org.apache.sling.replication.agent.impl.ReplicationAgentServiceFactory-publish-reverse.json
Sat Feb 22 07:40:46 2014
@@ -5,5 +5,6 @@
"ReplicationPackageBuilder.target" : "(name=vlt)",
"ReplicationQueueProvider.target" : "(name=sjh)",
"ReplicationQueueDistributionStrategy.target" : "(name=error)",
- "rules" : ["scheduled poll every 30 sec"]
+ "rules" : ["scheduled poll every 30 sec"],
+ "runModes" : ["author"]
}
Copied:
sling/trunk/contrib/extensions/replication/src/main/resources/SLING-CONTENT/libs/sling/replication/config/org.apache.sling.replication.agent.impl.ReplicationAgentServiceFactory-publish.json
(from r1570192,
sling/trunk/contrib/extensions/replication/src/main/resources/SLING-CONTENT/libs/sling/replication/config.author/org.apache.sling.replication.agent.impl.ReplicationAgentServiceFactory-publish.json)
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/src/main/resources/SLING-CONTENT/libs/sling/replication/config/org.apache.sling.replication.agent.impl.ReplicationAgentServiceFactory-publish.json?p2=sling/trunk/contrib/extensions/replication/src/main/resources/SLING-CONTENT/libs/sling/replication/config/org.apache.sling.replication.agent.impl.ReplicationAgentServiceFactory-publish.json&p1=sling/trunk/contrib/extensions/replication/src/main/resources/SLING-CONTENT/libs/sling/replication/config.author/org.apache.sling.replication.agent.impl.ReplicationAgentServiceFactory-publish.json&r1=1570192&r2=1570808&rev=1570808&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/replication/src/main/resources/SLING-CONTENT/libs/sling/replication/config.author/org.apache.sling.replication.agent.impl.ReplicationAgentServiceFactory-publish.json
(original)
+++
sling/trunk/contrib/extensions/replication/src/main/resources/SLING-CONTENT/libs/sling/replication/config/org.apache.sling.replication.agent.impl.ReplicationAgentServiceFactory-publish.json
Sat Feb 22 07:40:46 2014
@@ -4,5 +4,6 @@
"TransportHandler.target" : "(name=http-publish-receive)",
"ReplicationPackageBuilder.target" : "(name=vlt)",
"ReplicationQueueProvider.target" : "(name=sjh)",
- "ReplicationQueueDistributionStrategy.target" : "(name=single)"
+ "ReplicationQueueDistributionStrategy.target" : "(name=single)",
+ "runModes" : ["author"]
}
Copied:
sling/trunk/contrib/extensions/replication/src/main/resources/SLING-CONTENT/libs/sling/replication/config/org.apache.sling.replication.agent.impl.ReplicationAgentServiceFactory-reverserepo.json
(from r1570192,
sling/trunk/contrib/extensions/replication/src/main/resources/SLING-CONTENT/libs/sling/replication/config.publish/org.apache.sling.replication.agent.impl.ReplicationAgentServiceFactory-reverserepo.json)
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/src/main/resources/SLING-CONTENT/libs/sling/replication/config/org.apache.sling.replication.agent.impl.ReplicationAgentServiceFactory-reverserepo.json?p2=sling/trunk/contrib/extensions/replication/src/main/resources/SLING-CONTENT/libs/sling/replication/config/org.apache.sling.replication.agent.impl.ReplicationAgentServiceFactory-reverserepo.json&p1=sling/trunk/contrib/extensions/replication/src/main/resources/SLING-CONTENT/libs/sling/replication/config.publish/org.apache.sling.replication.agent.impl.ReplicationAgentServiceFactory-reverserepo.json&r1=1570192&r2=1570808&rev=1570808&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/replication/src/main/resources/SLING-CONTENT/libs/sling/replication/config.publish/org.apache.sling.replication.agent.impl.ReplicationAgentServiceFactory-reverserepo.json
(original)
+++
sling/trunk/contrib/extensions/replication/src/main/resources/SLING-CONTENT/libs/sling/replication/config/org.apache.sling.replication.agent.impl.ReplicationAgentServiceFactory-reverserepo.json
Sat Feb 22 07:40:46 2014
@@ -4,5 +4,6 @@
"ReplicationPackageBuilder.target" : "(name=vlt)",
"ReplicationQueueProvider.target" : "(name=sjh)",
"ReplicationQueueDistributionStrategy.target" : "(name=error)",
- "rules" : ["trigger on path: /content/usergenerated"]
+ "rules" : ["trigger on path: /content/usergenerated"],
+ "runModes" : ["publish"]
}
Modified:
sling/trunk/contrib/extensions/replication/src/test/java/org/apache/sling/replication/agent/impl/ReplicationAgentServiceFactoryTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/src/test/java/org/apache/sling/replication/agent/impl/ReplicationAgentServiceFactoryTest.java?rev=1570808&r1=1570807&r2=1570808&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/replication/src/test/java/org/apache/sling/replication/agent/impl/ReplicationAgentServiceFactoryTest.java
(original)
+++
sling/trunk/contrib/extensions/replication/src/test/java/org/apache/sling/replication/agent/impl/ReplicationAgentServiceFactoryTest.java
Sat Feb 22 07:40:46 2014
@@ -73,7 +73,6 @@ public class ReplicationAgentServiceFact
public void testActivationWithNoServicesBound() throws Exception {
try {
ReplicationAgentServiceFactory serviceFactory = new
ReplicationAgentServiceFactory();
-
Map<String, Object> dictionary = new HashMap<String, Object>();
BundleContext context = mock(BundleContext.class);
serviceFactory.activate(context, dictionary);
