This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.distribution.sample-0.1.0 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-distribution-sample.git
commit 3517e55a8819ef698a07f92bfc4cec064117370d Author: Tommaso Teofili <[email protected]> AuthorDate: Fri Oct 3 09:33:20 2014 +0000 SLING-3994 - simplified replication components' dependency management, minor javadoc adjustments git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/replication/sample@1629162 13f79535-47bb-0310-9956-ffa450edef68 --- ...oordinatingReplicationAgentFactory-pubsync.json | 22 ++++++------------ ...tionComponentFactory-trigger-remote-event.json} | 9 ++++---- ...leReplicationAgentFactory-publish-reverse.json} | 26 +++++++++------------- ...mpl.SimpleReplicationAgentFactory-publish.json} | 14 ++++-------- ...nComponentFactory-trigger-content-changed.json} | 2 +- ...SimpleReplicationAgentFactory-cache-flush.json} | 12 +++------- ...mpl.SimpleReplicationAgentFactory-reverse.json} | 12 +++------- ...ertiesResourceProviderFactory-simpleAgents.json | 2 +- 8 files changed, 35 insertions(+), 64 deletions(-) diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.CoordinatingReplicationAgentFactory-pubsync.json b/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.CoordinatingReplicationAgentFactory-pubsync.json index f45df35..68758f6 100644 --- a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.CoordinatingReplicationAgentFactory-pubsync.json +++ b/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.CoordinatingReplicationAgentFactory-pubsync.json @@ -1,25 +1,21 @@ { "jcr:primaryType": "sling:OsgiConfig", "name": "pubsync", - "type": "coordinating", - "enabled" : false, "packageExporter": [ "authenticationProvider/type=service", - "authenticationProvider/name=publishAdmin", "packageBuilder/type=vlt", "packageBuilder/servicename=replicationService", - "endpoints[0]=http://localhost:4503/libs/sling/replication/services/exporters/reverse";, - "endpoints[1]=http://localhost:4504/libs/sling/replication/services/exporters/reverse";, - "endpoints[2]=http://localhost:4505/libs/sling/replication/services/exporters/reverse";, + "endpoints[0]=http://localhost:4503/libs/sling/replication/services/exporters/reverse-pubsync";, + "endpoints[1]=http://localhost:4504/libs/sling/replication/services/exporters/reverse-pubsync";, + "endpoints[2]=http://localhost:4505/libs/sling/replication/services/exporters/reverse-pubsync";, "endpoints.strategy=All" ], "packageImporter": [ "authenticationProvider/type=service", - "authenticationProvider/name=publishAdmin", "packageBuilder/type=vlt", "packageBuilder/servicename=replicationService", @@ -30,13 +26,9 @@ "endpoints.strategy=All" ], - "queueProvider": [ - "type=service", - "name=sjh" - ], + "queueProvider.target" : "(name=sjh)", + + "queueDistributionStrategy.target": "(name=error)", - "queueDistributionStrategy": [ - "type=service", - "name=error" - ] + "transportAuthenticationProvider.target" : "(name=publishAdmin)" } \ No newline at end of file diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.DefaultReplicationComponentFactory-trigger-remote-event.json b/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.GenericReplicationComponentFactory-trigger-remote-event.json similarity index 59% rename from src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.DefaultReplicationComponentFactory-trigger-remote-event.json rename to src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.GenericReplicationComponentFactory-trigger-remote-event.json index 7504064..38030a4 100644 --- a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.DefaultReplicationComponentFactory-trigger-remote-event.json +++ b/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.GenericReplicationComponentFactory-trigger-remote-event.json @@ -2,14 +2,15 @@ "jcr:primaryType": "sling:OsgiConfig", "name": "remote-event", - "kind": "trigger", + "componentType": "trigger", "properties": [ "type=remoteEvent", "endpoint=http://localhost:4503/libs/sling/replication/services/triggers/content-changed.event";, - "authenticationProvider/type=service", - "authenticationProvider/name=publishAdmin" - ] + "authenticationProvider/type=service" + ], + + "transportAuthenticationProvider.target" : "(name=publishAdmin)" } \ No newline at end of file diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.CompactSimpleReplicationAgentFactory-publish-reverse.json b/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-publish-reverse.json similarity index 70% rename from src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.CompactSimpleReplicationAgentFactory-publish-reverse.json rename to src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-publish-reverse.json index 7fe693f..8cb8a95 100644 --- a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.CompactSimpleReplicationAgentFactory-publish-reverse.json +++ b/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-publish-reverse.json @@ -1,14 +1,14 @@ { "jcr:primaryType": "sling:OsgiConfig", "name": "publish-reverse", - "type": "simple", + + "enabled" : true, "packageExporter": [ "type=remote", "endpoints[0]=http://localhost:4503/libs/sling/replication/services/exporters/reverse";, "authenticationProvider/type=service", - "authenticationProvider/name=publishAdmin", "packageBuilder/type=vlt", "packageBuilder/servicename=replicationService" @@ -20,16 +20,6 @@ "packageBuilder/servicename=replicationService" ], - "queueProvider": [ - "type=service", - "name=sjh" - ], - - "queueDistributionStrategy": [ - "type=service", - "name=error" - ], - "trigger0": [ "type=scheduledEvent", "action=poll", @@ -40,8 +30,14 @@ "type=remoteEvent", "endpoint=http://localhost:4503/libs/sling/replication/services/triggers/content-changed.event";, - "authenticationProvider/type=service", - "authenticationProvider/name=publishAdmin" - ] + "authenticationProvider/type=service" + ], + + + "queueProvider.target" : "(name=sjh)", + + "queueDistributionStrategy.target": "(name=error)", + + "transportAuthenticationProvider.target" : "(name=publishAdmin)" } \ No newline at end of file diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.CompactSimpleReplicationAgentFactory-publish.json b/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-publish.json similarity index 68% rename from src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.CompactSimpleReplicationAgentFactory-publish.json rename to src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-publish.json index e100788..c08c6f0 100644 --- a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.CompactSimpleReplicationAgentFactory-publish.json +++ b/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-publish.json @@ -1,7 +1,6 @@ { "jcr:primaryType": "sling:OsgiConfig", "name": "publish", - "type": "simple", "packageExporter": [ "type=local", @@ -14,19 +13,14 @@ "endpoints[0]=http://localhost:4503/libs/sling/replication/services/importers/default";, "authenticationProvider/type=service", - "authenticationProvider/name=publishAdmin", "packageBuilder/type=vlt", "packageBuilder/servicename=replicationService" ], - "queueProvider": [ - "type=service", - "name=sjh" - ], + "queueProvider.target" : "(name=sjh)", + + "queueDistributionStrategy.target": "(name=error)", - "queueDistributionStrategy": [ - "type=service", - "name=error" - ] + "transportAuthenticationProvider.target" : "(name=publishAdmin)" } \ No newline at end of file diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.DefaultReplicationComponentFactory-trigger-content-changed.json b/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.GenericReplicationComponentFactory-trigger-content-changed.json similarity index 83% rename from src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.DefaultReplicationComponentFactory-trigger-content-changed.json rename to src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.GenericReplicationComponentFactory-trigger-content-changed.json index 4e32f7d..0b5cf00 100644 --- a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.DefaultReplicationComponentFactory-trigger-content-changed.json +++ b/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.GenericReplicationComponentFactory-trigger-content-changed.json @@ -2,7 +2,7 @@ "jcr:primaryType": "sling:OsgiConfig", "name": "content-changed", - "kind": "trigger", + "componentType": "trigger", "properties": [ "type=resourceEvent", diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.CompactSimpleReplicationAgentFactory-cache-flush.json b/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-cache-flush.json similarity index 56% rename from src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.CompactSimpleReplicationAgentFactory-cache-flush.json rename to src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-cache-flush.json index 9284f55..ee1b01d 100644 --- a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.CompactSimpleReplicationAgentFactory-cache-flush.json +++ b/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-cache-flush.json @@ -1,7 +1,6 @@ { "jcr:primaryType": "sling:OsgiConfig", "name": "cache-flush", - "type": "simple", "packageExporter": [ "type=service", @@ -13,13 +12,8 @@ "name=cache-flush" ], - "queueProvider": [ - "type=service", - "name=sjh" - ], - "queueDistributionStrategy": [ - "type=service", - "name=error" - ] + "queueProvider.target" : "(name=sjh)", + + "queueDistributionStrategy": "(name=error)" } diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.CompactSimpleReplicationAgentFactory-reverse.json b/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-reverse.json similarity index 72% rename from src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.CompactSimpleReplicationAgentFactory-reverse.json rename to src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-reverse.json index 72ad2fe..01cacfe 100644 --- a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.CompactSimpleReplicationAgentFactory-reverse.json +++ b/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-reverse.json @@ -1,7 +1,6 @@ { "jcr:primaryType": "sling:OsgiConfig", "name": "reverse", - "type": "simple", "isPassive": true, @@ -17,15 +16,10 @@ "packageBuilder/servicename=replicationService" ], - "queueProvider": [ - "type=service", - "name=sjh" - ], - "queueDistributionStrategy": [ - "type=service", - "name=error" - ], + "queueProvider.target" : "(name=sjh)", + + "queueDistributionStrategy": "(name=error)", "trigger0": [ "type=resourceEvent", diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/install/resources/settings/org.apache.sling.replication.resources.impl.OsgiPropertiesResourceProviderFactory-simpleAgents.json b/src/main/resources/SLING-CONTENT/libs/sling/replication/install/resources/settings/org.apache.sling.replication.resources.impl.OsgiPropertiesResourceProviderFactory-simpleAgents.json index b52ff51..a931c70 100644 --- a/src/main/resources/SLING-CONTENT/libs/sling/replication/install/resources/settings/org.apache.sling.replication.resources.impl.OsgiPropertiesResourceProviderFactory-simpleAgents.json +++ b/src/main/resources/SLING-CONTENT/libs/sling/replication/install/resources/settings/org.apache.sling.replication.resources.impl.OsgiPropertiesResourceProviderFactory-simpleAgents.json @@ -2,7 +2,7 @@ "jcr:primaryType": "sling:OsgiConfig", "name": "simpleAgents", "provider.roots": [ "/libs/sling/replication/settings/agents" ], - "serviceType": "org.apache.sling.replication.agent.impl.CompactSimpleReplicationAgentFactory", + "serviceType": "org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory", "providerType": "osgiConfig", "groupPrefix": "agents", -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
