Author: tommaso
Date: Fri Sep 26 13:07:52 2014
New Revision: 1627774
URL: http://svn.apache.org/r1627774
Log:
SLING-3901 - some missing changes from marius patch
Added:
sling/trunk/contrib/extensions/replication/core/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.DefaultReplicationComponentFactory-trigger-remote-event.json
sling/trunk/contrib/extensions/replication/core/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.DefaultReplicationComponentFactory-trigger-content-changed.json
Modified:
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/agent/impl/CompactSimpleReplicationAgentFactory.java
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/trigger/impl/RemoteEventReplicationTrigger.java
sling/trunk/contrib/extensions/replication/core/src/main/resources/SLING-CONTENT/libs/sling/replication/install/resources/services/org.apache.sling.replication.resources.impl.OsgiPropertiesResourceProviderFactory-triggers.json
Modified:
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/agent/impl/CompactSimpleReplicationAgentFactory.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/agent/impl/CompactSimpleReplicationAgentFactory.java?rev=1627774&r1=1627773&r2=1627774&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/agent/impl/CompactSimpleReplicationAgentFactory.java
(original)
+++
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/agent/impl/CompactSimpleReplicationAgentFactory.java
Fri Sep 26 13:07:52 2014
@@ -62,9 +62,6 @@ public class CompactSimpleReplicationAge
@Property(label = "Name")
public static final String NAME = "name";
- @Property(label = "Rules")
- public static final String RULES = "rules";
-
@Property(boolValue = true, label = "Replicate using aggregated paths")
public static final String USE_AGGREGATE_PATHS = "useAggregatePaths";
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=1627774&r1=1627773&r2=1627774&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 Sep 26 13:07:52 2014
@@ -90,7 +90,7 @@ public class RemoteEventReplicationTrigg
public void register(String handlerId, ReplicationTriggerRequestHandler
requestHandler) {
try {
- log.info("applying remote event replication rule");
+ log.info("applying remote event replication trigger");
ScheduleOptions options = scheduler.NOW();
options.name(handlerId);
Added:
sling/trunk/contrib/extensions/replication/core/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.DefaultReplicationComponentFactory-trigger-remote-event.json
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.DefaultReplicationComponentFactory-trigger-remote-event.json?rev=1627774&view=auto
==============================================================================
---
sling/trunk/contrib/extensions/replication/core/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.DefaultReplicationComponentFactory-trigger-remote-event.json
(added)
+++
sling/trunk/contrib/extensions/replication/core/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.DefaultReplicationComponentFactory-trigger-remote-event.json
Fri Sep 26 13:07:52 2014
@@ -0,0 +1,15 @@
+{
+ "jcr:primaryType" : "sling:OsgiConfig",
+ "name" : "remote-event",
+
+ "kind" : "trigger",
+
+ "properties" : [
+ "type=remoteEvent",
+
"endpoint=http://localhost:4503/libs/sling/replication/services/triggers/content-changed.event";,
+
+ "authenticationProvider/type=service",
+ "authenticationProvider/name=publishAdmin"
+ ]
+
+}
\ No newline at end of file
Added:
sling/trunk/contrib/extensions/replication/core/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.DefaultReplicationComponentFactory-trigger-content-changed.json
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.DefaultReplicationComponentFactory-trigger-content-changed.json?rev=1627774&view=auto
==============================================================================
---
sling/trunk/contrib/extensions/replication/core/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.DefaultReplicationComponentFactory-trigger-content-changed.json
(added)
+++
sling/trunk/contrib/extensions/replication/core/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.DefaultReplicationComponentFactory-trigger-content-changed.json
Fri Sep 26 13:07:52 2014
@@ -0,0 +1,12 @@
+{
+ "jcr:primaryType" : "sling:OsgiConfig",
+ "name" : "content-changed",
+
+ "kind" : "trigger",
+
+ "properties" : [
+ "type=resourceEvent",
+ "path=/content/usergenerated"
+ ]
+
+}
\ No newline at end of file
Modified:
sling/trunk/contrib/extensions/replication/core/src/main/resources/SLING-CONTENT/libs/sling/replication/install/resources/services/org.apache.sling.replication.resources.impl.OsgiPropertiesResourceProviderFactory-triggers.json
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/resources/SLING-CONTENT/libs/sling/replication/install/resources/services/org.apache.sling.replication.resources.impl.OsgiPropertiesResourceProviderFactory-triggers.json?rev=1627774&r1=1627773&r2=1627774&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/replication/core/src/main/resources/SLING-CONTENT/libs/sling/replication/install/resources/services/org.apache.sling.replication.resources.impl.OsgiPropertiesResourceProviderFactory-triggers.json
(original)
+++
sling/trunk/contrib/extensions/replication/core/src/main/resources/SLING-CONTENT/libs/sling/replication/install/resources/services/org.apache.sling.replication.resources.impl.OsgiPropertiesResourceProviderFactory-triggers.json
Fri Sep 26 13:07:52 2014
@@ -2,7 +2,7 @@
"jcr:primaryType" : "sling:OsgiConfig",
"name" : "replicationTriggers",
"provider.roots" : [ "/libs/sling/replication/services/triggers" ],
- "serviceType" : "org.apache.sling.replication.rule.ReplicationTrigger",
+ "serviceType" : "org.apache.sling.replication.trigger.ReplicationTrigger",
"resourceProperties" : [
"sling:resourceType=sling/replication/service/trigger",
"sling:resourceSuperType=sling/replication/service",
