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.6 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-distribution-sample.git
commit c55a57bcbaa790a5aab5e3a07f30963a3c9c0961 Author: Marius Petria <[email protected]> AuthorDate: Mon Nov 16 15:50:28 2015 +0000 SLING-5300: enable defaults for distribution components git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/distribution/sample@1714609 13f79535-47bb-0310-9956-ffa450edef68 --- ...everseDistributionAgentFactory-impersonate-publish-reverse.json | 6 ------ ...t.impl.ForwardDistributionAgentFactory-impersonate-publish.json | 4 ---- ...serCredentialsDistributionTransportSecretProvider-default.json} | 2 +- ...gent.impl.ForwardDistributionAgentFactory-publish-multiple.json | 6 ------ ...agent.impl.ReverseDistributionAgentFactory-publish-reverse.json | 6 ------ ...ent.impl.ForwardDistributionAgentFactory-publish-selective.json | 6 ------ ...ibution.agent.impl.ForwardDistributionAgentFactory-publish.json | 6 ------ ...stribution.agent.impl.SyncDistributionAgentFactory-pubsync.json | 7 +------ ....agent.impl.ForwardDistributionAgentFactory-queue-multiple.json | 6 ------ ...ent.impl.QueueDistributionAgentFactory-impersonate-reverse.json | 4 ---- ...distribution.agent.impl.QueueDistributionAgentFactory-temp.json | 2 -- ...l.exporter.LocalDistributionPackageExporterFactory-default.json | 4 +--- ...l.importer.LocalDistributionPackageImporterFactory-default.json | 4 +--- ...n.agent.impl.QueueDistributionAgentFactory-reverse-pubsync.json | 6 +----- ...tribution.agent.impl.QueueDistributionAgentFactory-reverse.json | 4 ---- ...geDistributionRequestAuthorizationStrategyFactory-default.json} | 2 +- ...n.impl.vlt.VaultDistributionPackageBuilderFactory-default.json} | 2 +- 17 files changed, 7 insertions(+), 70 deletions(-) diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/impersonate-publish-reverse/org.apache.sling.distribution.agent.impl.ReverseDistributionAgentFactory-impersonate-publish-reverse.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/impersonate-publish-reverse/org.apache.sling.distribution.agent.impl.ReverseDistributionAgentFactory-impersonate-publish-reverse.json index 2f63e6f..083f69b 100644 --- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/impersonate-publish-reverse/org.apache.sling.distribution.agent.impl.ReverseDistributionAgentFactory-impersonate-publish-reverse.json +++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/impersonate-publish-reverse/org.apache.sling.distribution.agent.impl.ReverseDistributionAgentFactory-impersonate-publish-reverse.json @@ -3,12 +3,6 @@ "name": "impersonate-publish-reverse", - "requestAuthorizationStrategy.target" : "(name=privilegeRead)", - - "packageBuilder.target": "(name=vlt)", - - "transportSecretProvider.target" : "(name=publishAdmin)", - "packageExporter.endpoints": [ "http://localhost:4503/libs/sling/distribution/services/exporters/impersonate-reverse"; ], diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/impersonate-publish/org.apache.sling.distribution.agent.impl.ForwardDistributionAgentFactory-impersonate-publish.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/impersonate-publish/org.apache.sling.distribution.agent.impl.ForwardDistributionAgentFactory-impersonate-publish.json index cd4201f..0dd3b6c 100644 --- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/impersonate-publish/org.apache.sling.distribution.agent.impl.ForwardDistributionAgentFactory-impersonate-publish.json +++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/impersonate-publish/org.apache.sling.distribution.agent.impl.ForwardDistributionAgentFactory-impersonate-publish.json @@ -3,10 +3,6 @@ "name": "impersonate-publish", - "packageBuilder.target": "(name=vlt)", - - "transportSecretProvider.target" : "(name=publishAdmin)", - "packageImporter.endpoints": [ "http://localhost:4503/libs/sling/distribution/services/importers/default"; ] diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/org.apache.sling.distribution.transport.impl.UserCredentialsDistributionTransportSecretProvider-publishAdmin.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/org.apache.sling.distribution.transport.impl.UserCredentialsDistributionTransportSecretProvider-default.json similarity index 76% rename from src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/org.apache.sling.distribution.transport.impl.UserCredentialsDistributionTransportSecretProvider-publishAdmin.json rename to src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/org.apache.sling.distribution.transport.impl.UserCredentialsDistributionTransportSecretProvider-default.json index 10fbe4d..2d89648 100644 --- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/org.apache.sling.distribution.transport.impl.UserCredentialsDistributionTransportSecretProvider-publishAdmin.json +++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/org.apache.sling.distribution.transport.impl.UserCredentialsDistributionTransportSecretProvider-default.json @@ -1,6 +1,6 @@ { "jcr:primaryType": "sling:OsgiConfig", - "name": "publishAdmin", + "name": "default", "username": "admin", "password": "admin" } \ No newline at end of file diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/publish-multiple/org.apache.sling.distribution.agent.impl.ForwardDistributionAgentFactory-publish-multiple.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/publish-multiple/org.apache.sling.distribution.agent.impl.ForwardDistributionAgentFactory-publish-multiple.json index 11f9533..07e34ee 100644 --- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/publish-multiple/org.apache.sling.distribution.agent.impl.ForwardDistributionAgentFactory-publish-multiple.json +++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/publish-multiple/org.apache.sling.distribution.agent.impl.ForwardDistributionAgentFactory-publish-multiple.json @@ -5,12 +5,6 @@ "serviceName" : "distributionService", - "requestAuthorizationStrategy.target" : "(name=privilegeRead)", - - "packageBuilder.target": "(name=vlt)", - - "transportSecretProvider.target" : "(name=publishAdmin)", - "useMultipleQueues" : true, "packageImporter.endpoints" : [ diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/publish-reverse/org.apache.sling.distribution.agent.impl.ReverseDistributionAgentFactory-publish-reverse.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/publish-reverse/org.apache.sling.distribution.agent.impl.ReverseDistributionAgentFactory-publish-reverse.json index ba991ec..bc817da 100644 --- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/publish-reverse/org.apache.sling.distribution.agent.impl.ReverseDistributionAgentFactory-publish-reverse.json +++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/publish-reverse/org.apache.sling.distribution.agent.impl.ReverseDistributionAgentFactory-publish-reverse.json @@ -5,12 +5,6 @@ "serviceName" : "distributionService", - "requestAuthorizationStrategy.target" : "(name=privilegeRead)", - - "packageBuilder.target": "(name=vlt)", - - "transportSecretProvider.target" : "(name=publishAdmin)", - "packageExporter.endpoints": [ "http://localhost:4503/libs/sling/distribution/services/exporters/reverse"; ], diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/publish-selective/org.apache.sling.distribution.agent.impl.ForwardDistributionAgentFactory-publish-selective.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/publish-selective/org.apache.sling.distribution.agent.impl.ForwardDistributionAgentFactory-publish-selective.json index 7147db8..6f7656f 100644 --- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/publish-selective/org.apache.sling.distribution.agent.impl.ForwardDistributionAgentFactory-publish-selective.json +++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/publish-selective/org.apache.sling.distribution.agent.impl.ForwardDistributionAgentFactory-publish-selective.json @@ -9,12 +9,6 @@ "useMultipleQueues" : true, - "requestAuthorizationStrategy.target" : "(name=privilegeRead)", - - "packageBuilder.target": "(name=vlt)", - - "transportSecretProvider.target" : "(name=publishAdmin)", - "packageImporter.endpoints": [ "publisher1=http://localhost:4503/libs/sling/distribution/services/importers/default"; ] diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/publish/org.apache.sling.distribution.agent.impl.ForwardDistributionAgentFactory-publish.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/publish/org.apache.sling.distribution.agent.impl.ForwardDistributionAgentFactory-publish.json index 94b4a13..4f00c4a 100644 --- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/publish/org.apache.sling.distribution.agent.impl.ForwardDistributionAgentFactory-publish.json +++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/publish/org.apache.sling.distribution.agent.impl.ForwardDistributionAgentFactory-publish.json @@ -5,12 +5,6 @@ "serviceName" : "distributionService", - "requestAuthorizationStrategy.target" : "(name=privilegeRead)", - - "packageBuilder.target": "(name=vlt)", - - "transportSecretProvider.target" : "(name=publishAdmin)", - "packageImporter.endpoints": [ "http://localhost:4503/libs/sling/distribution/services/importers/default"; ] diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/pubsync/org.apache.sling.distribution.agent.impl.SyncDistributionAgentFactory-pubsync.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/pubsync/org.apache.sling.distribution.agent.impl.SyncDistributionAgentFactory-pubsync.json index 2105195..c544075 100644 --- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/pubsync/org.apache.sling.distribution.agent.impl.SyncDistributionAgentFactory-pubsync.json +++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/pubsync/org.apache.sling.distribution.agent.impl.SyncDistributionAgentFactory-pubsync.json @@ -4,8 +4,6 @@ "serviceName" : "distributionService", - "requestAuthorizationStrategy.target" : "(name=privilegeRead)", - "packageExporter.endpoints": [ "http://localhost:4503/libs/sling/distribution/services/exporters/reverse-pubsync";, "http://localhost:4504/libs/sling/distribution/services/exporters/reverse-pubsync";, @@ -17,9 +15,6 @@ "http://localhost:4504/libs/sling/distribution/services/importers/default";, "http://localhost:4505/libs/sling/distribution/services/importers/default"; - ], - - "packageBuilder.target" : "(name=vlt)", - "transportSecretProvider.target" : "(name=publishAdmin)", + ] } \ No newline at end of file diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/queue-multiple/org.apache.sling.distribution.agent.impl.ForwardDistributionAgentFactory-queue-multiple.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/queue-multiple/org.apache.sling.distribution.agent.impl.ForwardDistributionAgentFactory-queue-multiple.json index e27f627..489ee74 100644 --- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/queue-multiple/org.apache.sling.distribution.agent.impl.ForwardDistributionAgentFactory-queue-multiple.json +++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/queue-multiple/org.apache.sling.distribution.agent.impl.ForwardDistributionAgentFactory-queue-multiple.json @@ -5,12 +5,6 @@ "serviceName" : "distributionService", - "requestAuthorizationStrategy.target" : "(name=privilegeRead)", - - "packageBuilder.target": "(name=vlt)", - - "transportSecretProvider.target" : "(name=publishAdmin)", - "useMultipleQueues" : true, "packageImporter.endpoints" : [ diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/impersonate-reverse/org.apache.sling.distribution.agent.impl.QueueDistributionAgentFactory-impersonate-reverse.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/impersonate-reverse/org.apache.sling.distribution.agent.impl.QueueDistributionAgentFactory-impersonate-reverse.json index 07d266d..0f12f14 100644 --- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/impersonate-reverse/org.apache.sling.distribution.agent.impl.QueueDistributionAgentFactory-impersonate-reverse.json +++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/impersonate-reverse/org.apache.sling.distribution.agent.impl.QueueDistributionAgentFactory-impersonate-reverse.json @@ -4,10 +4,6 @@ "serviceName" : "distributionService", - "requestAuthorizationStrategy.target" : "(name=privilegeRead)", - - "packageBuilder.target" : "(name=vlt)", - "triggers.target": "(name=reverse-userGeneratedContent)" } \ No newline at end of file diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/impexp/org.apache.sling.distribution.agent.impl.QueueDistributionAgentFactory-temp.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/impexp/org.apache.sling.distribution.agent.impl.QueueDistributionAgentFactory-temp.json index dad003d..9cc5d89 100644 --- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/impexp/org.apache.sling.distribution.agent.impl.QueueDistributionAgentFactory-temp.json +++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/impexp/org.apache.sling.distribution.agent.impl.QueueDistributionAgentFactory-temp.json @@ -4,7 +4,5 @@ "serviceName" : "distributionService", - "requestAuthorizationStrategy.target" : "(name=privilegeRead)", - "packageBuilder.target" : "(name=tempvlt)" } \ No newline at end of file diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/org.apache.sling.distribution.packaging.impl.exporter.LocalDistributionPackageExporterFactory-default.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/org.apache.sling.distribution.packaging.impl.exporter.LocalDistributionPackageExporterFactory-default.json index 660e122..7db889b 100644 --- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/org.apache.sling.distribution.packaging.impl.exporter.LocalDistributionPackageExporterFactory-default.json +++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/org.apache.sling.distribution.packaging.impl.exporter.LocalDistributionPackageExporterFactory-default.json @@ -1,6 +1,4 @@ { "jcr:primaryType": "sling:OsgiConfig", - "name": "default", - - "packageBuilder.target" : "(name=vlt)" + "name": "default" } \ No newline at end of file diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/org.apache.sling.distribution.packaging.impl.importer.LocalDistributionPackageImporterFactory-default.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/org.apache.sling.distribution.packaging.impl.importer.LocalDistributionPackageImporterFactory-default.json index 660e122..7db889b 100644 --- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/org.apache.sling.distribution.packaging.impl.importer.LocalDistributionPackageImporterFactory-default.json +++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/org.apache.sling.distribution.packaging.impl.importer.LocalDistributionPackageImporterFactory-default.json @@ -1,6 +1,4 @@ { "jcr:primaryType": "sling:OsgiConfig", - "name": "default", - - "packageBuilder.target" : "(name=vlt)" + "name": "default" } \ No newline at end of file diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/reverse-pubsync/org.apache.sling.distribution.agent.impl.QueueDistributionAgentFactory-reverse-pubsync.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/reverse-pubsync/org.apache.sling.distribution.agent.impl.QueueDistributionAgentFactory-reverse-pubsync.json index dbf3cce..46a621a 100644 --- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/reverse-pubsync/org.apache.sling.distribution.agent.impl.QueueDistributionAgentFactory-reverse-pubsync.json +++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/reverse-pubsync/org.apache.sling.distribution.agent.impl.QueueDistributionAgentFactory-reverse-pubsync.json @@ -2,9 +2,5 @@ "jcr:primaryType": "sling:OsgiConfig", "name": "reverse-pubsync", - "serviceName" : "distributionService", - - "requestAuthorizationStrategy.target" : "(name=privilegeRead)", - - "packageBuilder.target" : "(name=vlt)" + "serviceName" : "distributionService" } \ No newline at end of file diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/reverse/org.apache.sling.distribution.agent.impl.QueueDistributionAgentFactory-reverse.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/reverse/org.apache.sling.distribution.agent.impl.QueueDistributionAgentFactory-reverse.json index aefcefc..ead0257 100644 --- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/reverse/org.apache.sling.distribution.agent.impl.QueueDistributionAgentFactory-reverse.json +++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/reverse/org.apache.sling.distribution.agent.impl.QueueDistributionAgentFactory-reverse.json @@ -4,10 +4,6 @@ "serviceName" : "distributionService", - "requestAuthorizationStrategy.target" : "(name=privilegeRead)", - - "packageBuilder.target" : "(name=vlt)", - "triggers.target": "(name=reverse-userGeneratedContent)" } \ No newline at end of file diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/org.apache.sling.distribution.agent.impl.PrivilegeDistributionRequestAuthorizationStrategyFactory-privilegeRead.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/org.apache.sling.distribution.agent.impl.PrivilegeDistributionRequestAuthorizationStrategyFactory-default.json similarity index 77% rename from src/main/resources/SLING-CONTENT/libs/sling/distribution/install/org.apache.sling.distribution.agent.impl.PrivilegeDistributionRequestAuthorizationStrategyFactory-privilegeRead.json rename to src/main/resources/SLING-CONTENT/libs/sling/distribution/install/org.apache.sling.distribution.agent.impl.PrivilegeDistributionRequestAuthorizationStrategyFactory-default.json index be46af5..d05c876 100644 --- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/org.apache.sling.distribution.agent.impl.PrivilegeDistributionRequestAuthorizationStrategyFactory-privilegeRead.json +++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/org.apache.sling.distribution.agent.impl.PrivilegeDistributionRequestAuthorizationStrategyFactory-default.json @@ -1,6 +1,6 @@ { "jcr:primaryType": "sling:OsgiConfig", - "name": "privilegeRead", + "name": "default", "type": "privilege", "jcrPrivilege": "jcr:read" diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/org.apache.sling.distribution.serialization.impl.vlt.VaultDistributionPackageBuilderFactory-vlt.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/org.apache.sling.distribution.serialization.impl.vlt.VaultDistributionPackageBuilderFactory-default.json similarity index 82% rename from src/main/resources/SLING-CONTENT/libs/sling/distribution/install/org.apache.sling.distribution.serialization.impl.vlt.VaultDistributionPackageBuilderFactory-vlt.json rename to src/main/resources/SLING-CONTENT/libs/sling/distribution/install/org.apache.sling.distribution.serialization.impl.vlt.VaultDistributionPackageBuilderFactory-default.json index 396ee58..0e645ca 100644 --- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/org.apache.sling.distribution.serialization.impl.vlt.VaultDistributionPackageBuilderFactory-vlt.json +++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/org.apache.sling.distribution.serialization.impl.vlt.VaultDistributionPackageBuilderFactory-default.json @@ -1,6 +1,6 @@ { "jcr:primaryType": "sling:OsgiConfig", - "name": "vlt", + "name": "default", "type": "jcrvlt", "package.filters": ["/content|-.*/excluded"] } \ No newline at end of file -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
