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 cfd7edf0050ff6a1b1e92b7b01dc7b1810b60c59 Author: Marius Petria <[email protected]> AuthorDate: Mon Dec 8 16:11:24 2014 +0000 SLING-4060: creating dedicated factories for sync and queue agents git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/distribution/sample@1643847 13f79535-47bb-0310-9956-ffa450edef68 --- ...aultDistributionPackageBuilderFactory-vlt.json} | 0 .../settings.author/agents/publish-reverse.json | 2 ++ .../settings.author/agents/publish.json | 2 ++ .../settings.author/agents/pubsync.json | 22 ++++++--------- .../defaults/agents/{global.json => simple.json} | 1 - .../settings.author/defaults/agents/sync.json | 31 ++++++++++++++++++++++ .../settings.publish/agents/reverse.json | 2 ++ .../defaults/agents/{global.json => queue.json} | 13 --------- .../defaults/exporters/{global.json => agent.json} | 0 .../defaults/exporters/{global.json => local.json} | 0 .../defaults/importers/{global.json => local.json} | 0 11 files changed, 45 insertions(+), 28 deletions(-) diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/org.apache.sling.distribution.serialization.impl.vlt.FileVaultDistributionPackageBuilderFactory-vlt.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/org.apache.sling.distribution.serialization.impl.vlt.VaultDistributionPackageBuilderFactory-vlt.json similarity index 100% rename from src/main/resources/SLING-CONTENT/libs/sling/distribution/install/org.apache.sling.distribution.serialization.impl.vlt.FileVaultDistributionPackageBuilderFactory-vlt.json rename to src/main/resources/SLING-CONTENT/libs/sling/distribution/install/org.apache.sling.distribution.serialization.impl.vlt.VaultDistributionPackageBuilderFactory-vlt.json diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.author/agents/publish-reverse.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.author/agents/publish-reverse.json index 10be9d9..59996d1 100644 --- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.author/agents/publish-reverse.json +++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.author/agents/publish-reverse.json @@ -1,4 +1,6 @@ { + "type" : "simple", + "serviceName" : "distributionService", "packageExporter": { diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.author/agents/publish.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.author/agents/publish.json index 4ace18c..f65aaac 100644 --- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.author/agents/publish.json +++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.author/agents/publish.json @@ -1,4 +1,6 @@ { + "type" : "simple", + "serviceName" : "distributionService", "packageExporter": { diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.author/agents/pubsync.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.author/agents/pubsync.json index 83fc618..0eb22dc 100644 --- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.author/agents/pubsync.json +++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.author/agents/pubsync.json @@ -1,19 +1,13 @@ { - "serviceName" : "distributionService", - + "type" : "sync", - "packageExporter": { - "type": "remote", - "endpoints" : [ - "http://localhost:4503/libs/sling/distribution/services/exporters/reverse-pubsync"; - ] - }, + "serviceName" : "distributionService", - "packageImporter": { - "type" : "remote", + "packageExporter.endpoints" : [ + "http://localhost:4503/libs/sling/distribution/services/exporters/reverse-pubsync"; + ], - "endpoints" : [ - "http://localhost:4503/libs/sling/distribution/services/importers/default"; - ] - } + "packageImporter.endpoints" : [ + "http://localhost:4503/libs/sling/distribution/services/importers/default"; + ] } \ No newline at end of file diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.author/defaults/agents/global.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.author/defaults/agents/simple.json similarity index 97% rename from src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.author/defaults/agents/global.json rename to src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.author/defaults/agents/simple.json index ee06d84..b366f79 100644 --- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.author/defaults/agents/global.json +++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.author/defaults/agents/simple.json @@ -2,7 +2,6 @@ "jcr:primaryType" : "nt:unstructured", "kind" : "agent", - "type" : "simple", "isResource" : "true", diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.author/defaults/agents/sync.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.author/defaults/agents/sync.json new file mode 100644 index 0000000..66b9a20 --- /dev/null +++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.author/defaults/agents/sync.json @@ -0,0 +1,31 @@ +{ + "jcr:primaryType" : "nt:unstructured", + + "kind" : "agent", + + "isResource" : "true", + + "requestAuthorizationStrategy" : { + "kind" : "requestAuthorization", + "type" : "service", + "name" : "privilegeRead" + }, + + "packageBuilder" : { + "kind" : "packageBuilder", + + "type" : "service", + "name" : "vlt" + }, + + "transportSecretProvider" : { + "kind" : "transportSecretProvider", + "type" : "service", + "name" : "publishAdmin" + }, + + "triggers" : { + "kind" : "trigger", + "type" : "list" + } +} \ No newline at end of file diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.publish/agents/reverse.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.publish/agents/reverse.json index 80ccce2..267f3a1 100644 --- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.publish/agents/reverse.json +++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.publish/agents/reverse.json @@ -1,4 +1,6 @@ { + "type" : "queue", + "serviceName" : "distributionService", "isPassive" : true, diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.publish/defaults/agents/global.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.publish/defaults/agents/queue.json similarity index 69% rename from src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.publish/defaults/agents/global.json rename to src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.publish/defaults/agents/queue.json index 487bee3..fbf5367 100644 --- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.publish/defaults/agents/global.json +++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.publish/defaults/agents/queue.json @@ -2,7 +2,6 @@ "jcr:primaryType" : "nt:unstructured", "kind" : "agent", - "type" : "simple", "isResource" : "true", @@ -22,18 +21,6 @@ } }, - "packageImporter": { - "kind" : "importer", - - - "packageBuilder" : { - "kind" : "packageBuilder", - - "type" : "service", - "name" : "vlt" - } - }, - "triggers" : { "kind" : "trigger", "type" : "list" diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.publish/defaults/exporters/global.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.publish/defaults/exporters/agent.json similarity index 100% copy from src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.publish/defaults/exporters/global.json copy to src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.publish/defaults/exporters/agent.json diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.publish/defaults/exporters/global.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.publish/defaults/exporters/local.json similarity index 100% rename from src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.publish/defaults/exporters/global.json rename to src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.publish/defaults/exporters/local.json diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.publish/defaults/importers/global.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.publish/defaults/importers/local.json similarity index 100% rename from src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.publish/defaults/importers/global.json rename to src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.publish/defaults/importers/local.json -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
