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 5990eef376584cd49c41e3afd63808a68f4fde88 Author: Marius Petria <[email protected]> AuthorDate: Tue Nov 25 10:16:08 2014 +0000 SLING-4514: Generating OSGI configs from content and starting services using osgi services git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/distribution/sample@1641561 13f79535-47bb-0310-9956-ffa450edef68 --- ...ordinatingDistributionAgentFactory-pubsync.json | 35 -------------- ...leDistributionAgentFactory-publish-reverse.json | 39 ---------------- ...mpl.SimpleDistributionAgentFactory-publish.json | 27 ----------- ...utionComponentFactory-trigger-remote-event.json | 16 ------- ...ceBasedDistributionComponentFactory-agents.json | 4 +- ...AuthenticationProviderFactory-publishAdmin.json | 6 +++ ...leDistributionAgentFactory-publish-reverse.json | 16 +++++++ ...tionPackageExporterFactory-publish-reverse.json | 12 +++++ ...tionPackageImporterFactory-publish-reverse.json | 7 +++ ...onTriggerFactory-publish-reverse-scheduled.json | 11 +++++ ...mpl.SimpleDistributionAgentFactory-publish.json | 15 ++++++ ...DistributionPackageExporterFactory-publish.json | 7 +++ ...DistributionPackageImporterFactory-publish.json | 12 +++++ ...mpl.SimpleDistributionAgentFactory-pubsync.json | 14 ++++++ ...DistributionPackageExporterFactory-pubsync.json | 19 ++++++++ ...DistributionPackageImporterFactory-pubsync.json | 19 ++++++++ ...SimpleDistributionAgentFactory-cache-flush.json | 10 ++++ ...oteDistributionPackageImporter-cache-flush.json | 1 + ...DistributionPackageExporterFactory-reverse.json | 10 ++++ ...DistributionPackageExporterFactory-default.json | 10 ++++ ...DistributionPackageImporterFactory-default.json | 9 ++++ ...mpl.SimpleDistributionAgentFactory-reverse.json | 19 ++++++++ ...DistributionPackageExporterFactory-reverse.json | 7 +++ ...DistributionPackageImporterFactory-reverse.json | 7 +++ ...riggerFactory-reverse-userGeneratedContent.json | 11 +++++ ...SimpleDistributionAgentFactory-cache-flush.json | 23 ---------- ...mpl.SimpleDistributionAgentFactory-reverse.json | 33 -------------- ...onComponentFactory-trigger-content-changed.json | 13 ------ ...ceBasedDistributionComponentFactory-agents.json | 8 ++++ ...DistributionPackageExporterFactory-reverse.json | 6 ++- ...DistributionPackageExporterFactory-default.json | 6 ++- ...DistributionPackageImporterFactory-default.json | 6 ++- ...AuthorizationStrategyFactory-privilegeRead.json | 8 ++++ ...VaultDistributionPackageBuilderFactory-vlt.json | 4 ++ .../jcrsettings/defaults/agents/global.json | 22 --------- .../settings.author/agents/publish-reverse.json | 22 +++++++++ .../agents/publish.json} | 6 --- .../agents/pubsync.json} | 12 ++--- .../settings.author/defaults/agents/global.json | 53 ++++++++++++++++++++++ .../settings.publish/agents/reverse.json | 13 ++++++ .../settings.publish/defaults/agents/global.json | 41 +++++++++++++++++ 41 files changed, 392 insertions(+), 227 deletions(-) diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/org.apache.sling.distribution.agent.impl.CoordinatingDistributionAgentFactory-pubsync.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/org.apache.sling.distribution.agent.impl.CoordinatingDistributionAgentFactory-pubsync.json deleted file mode 100644 index 7724b93..0000000 --- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/org.apache.sling.distribution.agent.impl.CoordinatingDistributionAgentFactory-pubsync.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "jcr:primaryType": "sling:OsgiConfig", - "name": "pubsync", - - "serviceName" : "distributionService", - - "requestAuthorizationStrategy" : [ - "type=privilege", - "jcrPrivilege=jcr:read" - ], - - "packageExporter": [ - "packageBuilder/type=vlt", - - "endpoints[0]=http://localhost:4503/libs/sling/distribution/services/exporters/reverse-pubsync";, - "endpoints[1]=http://localhost:4504/libs/sling/distribution/services/exporters/reverse-pubsync";, - "endpoints[2]=http://localhost:4505/libs/sling/distribution/services/exporters/reverse-pubsync";, - "endpoints.strategy=All" - ], - - "packageImporter": [ - "packageBuilder/type=vlt", - - "endpoints[0]=http://localhost:4503/libs/sling/distribution/services/importers/default";, - "endpoints[1]=http://localhost:4504/libs/sling/distribution/services/importers/default";, - "endpoints[2]=http://localhost:4505/libs/sling/distribution/services/importers/default";, - "endpoints.strategy=All" - ], - - "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/distribution/install.author/org.apache.sling.distribution.agent.impl.SimpleDistributionAgentFactory-publish-reverse.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/org.apache.sling.distribution.agent.impl.SimpleDistributionAgentFactory-publish-reverse.json deleted file mode 100644 index e6a3929..0000000 --- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/org.apache.sling.distribution.agent.impl.SimpleDistributionAgentFactory-publish-reverse.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "jcr:primaryType": "sling:OsgiConfig", - "name": "publish-reverse", - - "enabled" : true, - - "serviceName" : "distributionService", - - - "packageExporter": [ - "type=remote", - "endpoints[0]=http://localhost:4503/libs/sling/distribution/services/exporters/reverse";, - - "packageBuilder/type=vlt" - ], - - "requestAuthorizationStrategy" : [ - "type=privilege", - "jcrPrivilege=jcr:read" - ], - - "packageImporter": [ - "type=local", - "packageBuilder/type=vlt" - ], - - "trigger": [ - "scheduledTrigger/type=scheduledEvent", - "scheduledTrigger/action=pull", - "scheduledTrigger/seconds=30", - - "remoteTrigger/type=remoteEvent", - "remoteTrigger/endpoint=http://localhost:4503/libs/sling/distribution/services/triggers/content-changed.event"; - ], - - - "transportAuthenticationProvider.target" : "(name=publishAdmin)" - -} \ No newline at end of file diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/org.apache.sling.distribution.agent.impl.SimpleDistributionAgentFactory-publish.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/org.apache.sling.distribution.agent.impl.SimpleDistributionAgentFactory-publish.json deleted file mode 100644 index d624a3f..0000000 --- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/org.apache.sling.distribution.agent.impl.SimpleDistributionAgentFactory-publish.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "jcr:primaryType": "sling:OsgiConfig", - "name": "publish", - - "serviceName" : "distributionService", - - "requestAuthorizationStrategy" : [ - "type=privilege", - "jcrPrivilege=jcr:read" - ], - - "packageExporter": [ - "type=local", - "packageBuilder/type=vlt" - ], - - "packageImporter": [ - "type=remote", - "endpoints[0]=http://localhost:4503/libs/sling/distribution/services/importers/default";, - - "authenticationProvider/type=service", - - "packageBuilder/type=vlt" - ], - - "transportAuthenticationProvider.target" : "(name=publishAdmin)" -} \ No newline at end of file diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/org.apache.sling.distribution.component.impl.GenericDistributionComponentFactory-trigger-remote-event.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/org.apache.sling.distribution.component.impl.GenericDistributionComponentFactory-trigger-remote-event.json deleted file mode 100644 index 6d8c4f8..0000000 --- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/org.apache.sling.distribution.component.impl.GenericDistributionComponentFactory-trigger-remote-event.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "jcr:primaryType": "sling:OsgiConfig", - "name": "remote-event", - - "componentType": "trigger", - - "properties": [ - "type=remoteEvent", - "endpoint=http://localhost:4503/libs/sling/distribution/services/triggers/content-changed.event";, - - "authenticationProvider/type=service" - ], - - "transportAuthenticationProvider.target" : "(name=publishAdmin)" - -} \ No newline at end of file diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/org.apache.sling.distribution.component.impl.ResourceBasedDistributionComponentFactory-agents.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/org.apache.sling.distribution.component.impl.ResourceBasedDistributionComponentFactory-agents.json index d502ae4..00ef1f0 100644 --- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/org.apache.sling.distribution.component.impl.ResourceBasedDistributionComponentFactory-agents.json +++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/org.apache.sling.distribution.component.impl.ResourceBasedDistributionComponentFactory-agents.json @@ -3,6 +3,6 @@ "name": "agents", "kind": "agent", - "path": "/libs/sling/distribution/jcrsettings/agents", - "defaults.path" : "/libs/sling/distribution/jcrsettings/defaults/agents/global" + "path": "/libs/sling/distribution/settings.author/agents", + "defaults.path" : "/libs/sling/distribution/settings.author/defaults/agents/global" } \ No newline at end of file diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.author/org.apache.sling.distribution.transport.authentication.impl.UserCredentialsTransportAuthenticationProviderFactory-publishAdmin.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.author/org.apache.sling.distribution.transport.authentication.impl.UserCredentialsTransportAuthenticationProviderFactory-publishAdmin.json new file mode 100644 index 0000000..10fbe4d --- /dev/null +++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.author/org.apache.sling.distribution.transport.authentication.impl.UserCredentialsTransportAuthenticationProviderFactory-publishAdmin.json @@ -0,0 +1,6 @@ +{ + "jcr:primaryType": "sling:OsgiConfig", + "name": "publishAdmin", + "username": "admin", + "password": "admin" +} \ No newline at end of file diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.author/publish-reverse/org.apache.sling.distribution.agent.impl.SimpleDistributionAgentFactory-publish-reverse.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.author/publish-reverse/org.apache.sling.distribution.agent.impl.SimpleDistributionAgentFactory-publish-reverse.json new file mode 100644 index 0000000..9bfc60d --- /dev/null +++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.author/publish-reverse/org.apache.sling.distribution.agent.impl.SimpleDistributionAgentFactory-publish-reverse.json @@ -0,0 +1,16 @@ +{ + "jcr:primaryType": "sling:OsgiConfig", + "name": "publish-reverse", + + "enabled" : false, + + "serviceName" : "distributionService", + + "requestAuthorizationStrategy.target" : "(name=privilegeRead)", + + "packageExporter.target": "(parent.name=publish-reverse)", + + "packageImporter.target": "(parent.name=publish-reverse)", + + "triggers.target": "(parent.name=publish-reverse)" +} \ No newline at end of file diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.author/publish-reverse/org.apache.sling.distribution.packaging.impl.exporter.RemoteDistributionPackageExporterFactory-publish-reverse.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.author/publish-reverse/org.apache.sling.distribution.packaging.impl.exporter.RemoteDistributionPackageExporterFactory-publish-reverse.json new file mode 100644 index 0000000..b4c6670 --- /dev/null +++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.author/publish-reverse/org.apache.sling.distribution.packaging.impl.exporter.RemoteDistributionPackageExporterFactory-publish-reverse.json @@ -0,0 +1,12 @@ +{ + "jcr:primaryType": "sling:OsgiConfig", + "name": "publish-reverse/exporter", + "parent.name": "publish-reverse", + "type": "remote", + + "endpoints": [ + "http://localhost:4503/libs/sling/distribution/services/exporters/reverse"; + ], + "packageBuilder.target" : "(name=vlt)", + "transportAuthenticationProvider.target" : "(name=publishAdmin)" +} \ No newline at end of file diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.author/publish-reverse/org.apache.sling.distribution.packaging.impl.importer.LocalDistributionPackageImporterFactory-publish-reverse.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.author/publish-reverse/org.apache.sling.distribution.packaging.impl.importer.LocalDistributionPackageImporterFactory-publish-reverse.json new file mode 100644 index 0000000..45b6832 --- /dev/null +++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.author/publish-reverse/org.apache.sling.distribution.packaging.impl.importer.LocalDistributionPackageImporterFactory-publish-reverse.json @@ -0,0 +1,7 @@ +{ + "jcr:primaryType": "sling:OsgiConfig", + "name": "publish-reverse/importer", + "parent.name": "publish-reverse", + "type": "local", + "packageBuilder.target" : "(name=vlt)" +} \ No newline at end of file diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.author/publish-reverse/org.apache.sling.distribution.trigger.impl.LocalDistributionTriggerFactory-publish-reverse-scheduled.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.author/publish-reverse/org.apache.sling.distribution.trigger.impl.LocalDistributionTriggerFactory-publish-reverse-scheduled.json new file mode 100644 index 0000000..49e8785 --- /dev/null +++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.author/publish-reverse/org.apache.sling.distribution.trigger.impl.LocalDistributionTriggerFactory-publish-reverse-scheduled.json @@ -0,0 +1,11 @@ +{ + "jcr:primaryType": "sling:OsgiConfig", + + "name": "publish-reverse/triggers/scheduled", + "parent.name": "publish-reverse", + + "type": "scheduledEvent", + "action": "poll", + "seconds": "30" + +} \ No newline at end of file diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.author/publish/org.apache.sling.distribution.agent.impl.SimpleDistributionAgentFactory-publish.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.author/publish/org.apache.sling.distribution.agent.impl.SimpleDistributionAgentFactory-publish.json new file mode 100644 index 0000000..e870174 --- /dev/null +++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.author/publish/org.apache.sling.distribution.agent.impl.SimpleDistributionAgentFactory-publish.json @@ -0,0 +1,15 @@ +{ + "jcr:primaryType": "sling:OsgiConfig", + + "name": "publish", + + "enabled" : false, + + "serviceName" : "distributionService", + + "requestAuthorizationStrategy.target" : "(name=privilegeRead)", + + "packageExporter.target": "(parent.name=publish)", + + "packageImporter.target": "(parent.name=publish)" +} \ No newline at end of file diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.author/publish/org.apache.sling.distribution.packaging.impl.exporter.LocalDistributionPackageExporterFactory-publish.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.author/publish/org.apache.sling.distribution.packaging.impl.exporter.LocalDistributionPackageExporterFactory-publish.json new file mode 100644 index 0000000..4fe2447 --- /dev/null +++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.author/publish/org.apache.sling.distribution.packaging.impl.exporter.LocalDistributionPackageExporterFactory-publish.json @@ -0,0 +1,7 @@ +{ + "jcr:primaryType": "sling:OsgiConfig", + "name": "publish/exporter", + "parent.name": "publish", + "type": "local", + "packageBuilder.target" : "(name=vlt)" +} \ No newline at end of file diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.author/publish/org.apache.sling.distribution.packaging.impl.importer.RemoteDistributionPackageImporterFactory-publish.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.author/publish/org.apache.sling.distribution.packaging.impl.importer.RemoteDistributionPackageImporterFactory-publish.json new file mode 100644 index 0000000..dd61b19 --- /dev/null +++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.author/publish/org.apache.sling.distribution.packaging.impl.importer.RemoteDistributionPackageImporterFactory-publish.json @@ -0,0 +1,12 @@ +{ + "jcr:primaryType": "sling:OsgiConfig", + "name": "publish/importer", + "parent.name": "publish", + "type": "remote", + + "endpoints": [ + "http://localhost:4503/libs/sling/distribution/services/importers/default"; + ], + "packageBuilder.target" : "(name=vlt)", + "transportAuthenticationProvider.target" : "(name=publishAdmin)" +} \ No newline at end of file diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.author/pubsync/org.apache.sling.distribution.agent.impl.SimpleDistributionAgentFactory-pubsync.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.author/pubsync/org.apache.sling.distribution.agent.impl.SimpleDistributionAgentFactory-pubsync.json new file mode 100644 index 0000000..05ee9f6 --- /dev/null +++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.author/pubsync/org.apache.sling.distribution.agent.impl.SimpleDistributionAgentFactory-pubsync.json @@ -0,0 +1,14 @@ +{ + "jcr:primaryType": "sling:OsgiConfig", + "name": "pubsync", + + "enabled" : false, + + "serviceName" : "distributionService", + + "requestAuthorizationStrategy.target" : "(name=privilegeRead)", + + "packageExporter.target": "(parent.name=pubsync)", + + "packageImporter.target": "(parent.name=pubsync)" +} \ No newline at end of file diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.author/pubsync/org.apache.sling.distribution.packaging.impl.exporter.RemoteDistributionPackageExporterFactory-pubsync.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.author/pubsync/org.apache.sling.distribution.packaging.impl.exporter.RemoteDistributionPackageExporterFactory-pubsync.json new file mode 100644 index 0000000..fdebdae --- /dev/null +++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.author/pubsync/org.apache.sling.distribution.packaging.impl.exporter.RemoteDistributionPackageExporterFactory-pubsync.json @@ -0,0 +1,19 @@ +{ + "jcr:primaryType": "sling:OsgiConfig", + "name": "pubsync/exporter", + "parent.name": "pubsync", + "type": "remote", + + "endpoints": [ + "http://localhost:4503/libs/sling/distribution/services/exporters/reverse-pubsync";, + "http://localhost:4504/libs/sling/distribution/services/exporters/reverse-pubsync";, + "http://localhost:4505/libs/sling/distribution/services/exporters/reverse-pubsync";, + ], + + "endpoints.strategy": "All", + + "packageBuilder.target" : "(name=vlt)", + "transportAuthenticationProvider.target" : "(name=publishAdmin)" + + +} \ No newline at end of file diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.author/pubsync/org.apache.sling.distribution.packaging.impl.importer.RemoteDistributionPackageImporterFactory-pubsync.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.author/pubsync/org.apache.sling.distribution.packaging.impl.importer.RemoteDistributionPackageImporterFactory-pubsync.json new file mode 100644 index 0000000..d95099e --- /dev/null +++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.author/pubsync/org.apache.sling.distribution.packaging.impl.importer.RemoteDistributionPackageImporterFactory-pubsync.json @@ -0,0 +1,19 @@ +{ + "jcr:primaryType": "sling:OsgiConfig", + "name": "pubsync/importer", + "parent.name": "pubsync", + "type": "remote", + + "endpoints": [ + "http://localhost:4503/libs/sling/distribution/services/importers/default";, + "http://localhost:4504/libs/sling/distribution/services/importers/default";, + "http://localhost:4505/libs/sling/distribution/services/importers/default"; + + ], + + "endpoints.strategy": "All", + + + "packageBuilder.target" : "(name=vlt)", + "transportAuthenticationProvider.target" : "(name=publishAdmin)" +} \ No newline at end of file diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.publish/cache-flush/org.apache.sling.distribution.agent.impl.SimpleDistributionAgentFactory-cache-flush.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.publish/cache-flush/org.apache.sling.distribution.agent.impl.SimpleDistributionAgentFactory-cache-flush.json new file mode 100644 index 0000000..ad5ce6e --- /dev/null +++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.publish/cache-flush/org.apache.sling.distribution.agent.impl.SimpleDistributionAgentFactory-cache-flush.json @@ -0,0 +1,10 @@ +{ + "jcr:primaryType": "sling:OsgiConfig", + "name": "cache-flush", + + "enabled" : false, + + + "requestAuthorizationStrategy.target" : "privilegeRead" + +} diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/org.apache.sling.distribution.packaging.impl.importer.AdvancedRemoteDistributionPackageImporter-cache-flush.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.publish/cache-flush/org.apache.sling.distribution.packaging.impl.importer.AdvancedRemoteDistributionPackageImporter-cache-flush.json similarity index 91% rename from src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/org.apache.sling.distribution.packaging.impl.importer.AdvancedRemoteDistributionPackageImporter-cache-flush.json rename to src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.publish/cache-flush/org.apache.sling.distribution.packaging.impl.importer.AdvancedRemoteDistributionPackageImporter-cache-flush.json index aca7432..c1160b6 100644 --- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/org.apache.sling.distribution.packaging.impl.importer.AdvancedRemoteDistributionPackageImporter-cache-flush.json +++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.publish/cache-flush/org.apache.sling.distribution.packaging.impl.importer.AdvancedRemoteDistributionPackageImporter-cache-flush.json @@ -1,6 +1,7 @@ { "jcr:primaryType": "sling:OsgiConfig", "name": "cache-flush", + "parent.name": "cache-flush", "useCustomHeaders": true, "customHeaders": [ "Path: {path}", diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.publish/org.apache.sling.distribution.packaging.impl.exporter.AgentDistributionPackageExporterFactory-reverse.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.publish/org.apache.sling.distribution.packaging.impl.exporter.AgentDistributionPackageExporterFactory-reverse.json new file mode 100644 index 0000000..ab2d2f4 --- /dev/null +++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.publish/org.apache.sling.distribution.packaging.impl.exporter.AgentDistributionPackageExporterFactory-reverse.json @@ -0,0 +1,10 @@ +{ + "jcr:primaryType": "sling:OsgiConfig", + "name": "reverse", + + "isResource" : true, + + "packageBuilder.target" : "(name=vlt)", + + "agent.target": "(name=reverse)" +} \ No newline at end of file diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.publish/org.apache.sling.distribution.packaging.impl.exporter.LocalDistributionPackageExporterFactory-default.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.publish/org.apache.sling.distribution.packaging.impl.exporter.LocalDistributionPackageExporterFactory-default.json new file mode 100644 index 0000000..60132c0 --- /dev/null +++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.publish/org.apache.sling.distribution.packaging.impl.exporter.LocalDistributionPackageExporterFactory-default.json @@ -0,0 +1,10 @@ +{ + "jcr:primaryType": "sling:OsgiConfig", + "name": "default", + + "isResource" : true, + + "type": "local", + + "packageBuilder.target" : "(name=vlt)" +} \ No newline at end of file diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.publish/org.apache.sling.distribution.packaging.impl.importer.LocalDistributionPackageImporterFactory-default.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.publish/org.apache.sling.distribution.packaging.impl.importer.LocalDistributionPackageImporterFactory-default.json new file mode 100644 index 0000000..f4607dc --- /dev/null +++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.publish/org.apache.sling.distribution.packaging.impl.importer.LocalDistributionPackageImporterFactory-default.json @@ -0,0 +1,9 @@ +{ + "jcr:primaryType": "sling:OsgiConfig", + "name": "default", + "type": "local", + + "isResource" : true, + + "packageBuilder.target" : "(name=vlt)" +} \ No newline at end of file diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.publish/reverse/org.apache.sling.distribution.agent.impl.SimpleDistributionAgentFactory-reverse.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.publish/reverse/org.apache.sling.distribution.agent.impl.SimpleDistributionAgentFactory-reverse.json new file mode 100644 index 0000000..2316180 --- /dev/null +++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.publish/reverse/org.apache.sling.distribution.agent.impl.SimpleDistributionAgentFactory-reverse.json @@ -0,0 +1,19 @@ +{ + "jcr:primaryType": "sling:OsgiConfig", + + "name": "reverse", + + "enabled" : false, + + "isPassive": true, + + "serviceName" : "distributionService", + + "requestAuthorizationStrategy.target" : "(name=privilegeRead)", + + "packageExporter.target": "(parent.name=reverse)", + + "packageImporter.target": "(parent.name=reverse)", + + "triggers.target": "(parent.name=reverse)" +} diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.publish/reverse/org.apache.sling.distribution.packaging.impl.exporter.LocalDistributionPackageExporterFactory-reverse.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.publish/reverse/org.apache.sling.distribution.packaging.impl.exporter.LocalDistributionPackageExporterFactory-reverse.json new file mode 100644 index 0000000..0b7350b --- /dev/null +++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.publish/reverse/org.apache.sling.distribution.packaging.impl.exporter.LocalDistributionPackageExporterFactory-reverse.json @@ -0,0 +1,7 @@ +{ + "jcr:primaryType": "sling:OsgiConfig", + "name": "reverse/exporter", + "parent.name": "reverse", + "type": "local", + "packageBuilder.target" : "(name=vlt)" +} \ No newline at end of file diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.publish/reverse/org.apache.sling.distribution.packaging.impl.importer.LocalDistributionPackageImporterFactory-reverse.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.publish/reverse/org.apache.sling.distribution.packaging.impl.importer.LocalDistributionPackageImporterFactory-reverse.json new file mode 100644 index 0000000..b2631ac --- /dev/null +++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.publish/reverse/org.apache.sling.distribution.packaging.impl.importer.LocalDistributionPackageImporterFactory-reverse.json @@ -0,0 +1,7 @@ +{ + "jcr:primaryType": "sling:OsgiConfig", + "name": "reverse/importer", + "parent.name": "reverse", + "type": "local", + "packageBuilder.target" : "(name=vlt)" +} \ No newline at end of file diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.publish/reverse/org.apache.sling.distribution.trigger.impl.LocalDistributionTriggerFactory-reverse-userGeneratedContent.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.publish/reverse/org.apache.sling.distribution.trigger.impl.LocalDistributionTriggerFactory-reverse-userGeneratedContent.json new file mode 100644 index 0000000..e632ed7 --- /dev/null +++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.publish/reverse/org.apache.sling.distribution.trigger.impl.LocalDistributionTriggerFactory-reverse-userGeneratedContent.json @@ -0,0 +1,11 @@ +{ + "jcr:primaryType": "sling:OsgiConfig", + + "name": "reverse/triggers/userGeneratedContent", + "parent.name": "reverse", + + "type" : "jcrEvent", + "path" : "/content/usergenerated", + "servicename" : "distributionService" + +} \ No newline at end of file diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/org.apache.sling.distribution.agent.impl.SimpleDistributionAgentFactory-cache-flush.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/org.apache.sling.distribution.agent.impl.SimpleDistributionAgentFactory-cache-flush.json deleted file mode 100644 index 22e474e..0000000 --- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/org.apache.sling.distribution.agent.impl.SimpleDistributionAgentFactory-cache-flush.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "jcr:primaryType": "sling:OsgiConfig", - "name": "cache-flush", - - "packageExporter": [ - "type=service", - "name=void" - ], - - "requestAuthorizationStrategy" : [ - "type=default" - ], - - "packageImporter": [ - "type=service", - "name=cache-flush" - ], - - - "queueProvider.target" : "(name=sjh)", - - "queueDistributionStrategy": "(name=error)" -} diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/org.apache.sling.distribution.agent.impl.SimpleDistributionAgentFactory-reverse.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/org.apache.sling.distribution.agent.impl.SimpleDistributionAgentFactory-reverse.json deleted file mode 100644 index a1ed69e..0000000 --- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/org.apache.sling.distribution.agent.impl.SimpleDistributionAgentFactory-reverse.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "jcr:primaryType": "sling:OsgiConfig", - "name": "reverse", - - "isPassive": true, - - "serviceName" : "distributionService", - - "packageExporter": [ - "type=local", - "packageBuilder/type=vlt" - ], - - "requestAuthorizationStrategy" : [ - "type=privilege", - "jcrPrivilege=jcr:read" - ], - - "packageImporter": [ - "type=local", - "packageBuilder/type=vlt" - ], - - "queueProvider.target" : "(name=sjh)", - - "queueDistributionStrategy": "(name=single)", - - "trigger": [ - "userGeneratedTrigger/type=jcrEvent", - "userGeneratedTrigger/path=/content/usergenerated", - "userGeneratedTrigger/servicename=distributionService" - ] -} diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/org.apache.sling.distribution.component.impl.GenericDistributionComponentFactory-trigger-content-changed.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/org.apache.sling.distribution.component.impl.GenericDistributionComponentFactory-trigger-content-changed.json deleted file mode 100644 index bea7209..0000000 --- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/org.apache.sling.distribution.component.impl.GenericDistributionComponentFactory-trigger-content-changed.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "jcr:primaryType": "sling:OsgiConfig", - "name": "content-changed", - - "componentType": "trigger", - - "properties": [ - "type=jcrEvent", - "path=/content/usergenerated", - "servicename=distributionService" - ] - -} \ No newline at end of file diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/org.apache.sling.distribution.component.impl.ResourceBasedDistributionComponentFactory-agents.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/org.apache.sling.distribution.component.impl.ResourceBasedDistributionComponentFactory-agents.json new file mode 100644 index 0000000..5855403 --- /dev/null +++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/org.apache.sling.distribution.component.impl.ResourceBasedDistributionComponentFactory-agents.json @@ -0,0 +1,8 @@ +{ + "jcr:primaryType": "sling:OsgiConfig", + "name": "agents", + + "kind": "agent", + "path": "/libs/sling/distribution/settings.publish/agents", + "defaults.path" : "/libs/sling/distribution/settings.publish/defaults/agents/global" +} \ 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.AgentDistributionPackageExporterFactory-reverse.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/org.apache.sling.distribution.packaging.impl.exporter.AgentDistributionPackageExporterFactory-reverse.json index 03ab1d4..ab2d2f4 100644 --- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/org.apache.sling.distribution.packaging.impl.exporter.AgentDistributionPackageExporterFactory-reverse.json +++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/org.apache.sling.distribution.packaging.impl.exporter.AgentDistributionPackageExporterFactory-reverse.json @@ -2,7 +2,9 @@ "jcr:primaryType": "sling:OsgiConfig", "name": "reverse", - "packageBuilder": [ "type=vlt" ], + "isResource" : true, - "DistributionAgent.target": "(name=reverse)" + "packageBuilder.target" : "(name=vlt)", + + "agent.target": "(name=reverse)" } \ 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 84cc756..60132c0 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 @@ -2,5 +2,9 @@ "jcr:primaryType": "sling:OsgiConfig", "name": "default", - "packageBuilder": [ "type=vlt" ] + "isResource" : true, + + "type": "local", + + "packageBuilder.target" : "(name=vlt)" } \ 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 b8eed8b..f4607dc 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,5 +1,9 @@ { "jcr:primaryType": "sling:OsgiConfig", "name": "default", - "packageBuilder": [ "type=vlt" ] + "type": "local", + + "isResource" : true, + + "packageBuilder.target" : "(name=vlt)" } \ 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-privilegeRead.json new file mode 100644 index 0000000..be46af5 --- /dev/null +++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/org.apache.sling.distribution.agent.impl.PrivilegeDistributionRequestAuthorizationStrategyFactory-privilegeRead.json @@ -0,0 +1,8 @@ +{ + "jcr:primaryType": "sling:OsgiConfig", + "name": "privilegeRead", + + "type": "privilege", + "jcrPrivilege": "jcr:read" + +} \ No newline at end of file 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.FileVaultDistributionPackageBuilderFactory-vlt.json new file mode 100644 index 0000000..e1743eb --- /dev/null +++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/org.apache.sling.distribution.serialization.impl.vlt.FileVaultDistributionPackageBuilderFactory-vlt.json @@ -0,0 +1,4 @@ +{ + "jcr:primaryType": "sling:OsgiConfig", + "name": "vlt" +} \ No newline at end of file diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/jcrsettings/defaults/agents/global.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/jcrsettings/defaults/agents/global.json deleted file mode 100644 index fbe7f2b..0000000 --- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/jcrsettings/defaults/agents/global.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "jcr:primaryType" : "nt:unstructured", - - "requestAuthorizationStrategy" : { - "type" : "privilege", - "jcrPrivilege" : "jcr:read" - }, - - "packageExporter": { - "packageBuilder" : { "type" : "vlt" } - - }, - - "packageImporter": { - "packageBuilder" : { "type" : "vlt" } - - }, - - "queueDistributionStrategy" : { "type" : "single" }, - - "queueProvider" : { "type" : "job" } -} \ No newline at end of file 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 new file mode 100644 index 0000000..10be9d9 --- /dev/null +++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.author/agents/publish-reverse.json @@ -0,0 +1,22 @@ +{ + "serviceName" : "distributionService", + + "packageExporter": { + "type": "remote", + "endpoints" : [ + "http://localhost:4503/libs/sling/distribution/services/exporters/reverse"; + ] + }, + + "packageImporter": { + "type" : "local" + }, + + "triggers" : { + "scheduled" : { + "type": "scheduledEvent", + "action": "pull", + "seconds": "30" + } + } +} \ No newline at end of file diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/jcrsettings/agents/jpublish.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.author/agents/publish.json similarity index 64% copy from src/main/resources/SLING-CONTENT/libs/sling/distribution/jcrsettings/agents/jpublish.json copy to src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.author/agents/publish.json index 3b9ffc2..4ace18c 100644 --- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/jcrsettings/agents/jpublish.json +++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.author/agents/publish.json @@ -8,12 +8,6 @@ "packageImporter": { "type" : "remote", - "transportAuthenticationProvider" : { - "type" : "user", - "username" : "admin", - "password" : "admin" - }, - "endpoints" : [ "http://localhost:4503/libs/sling/distribution/services/importers/default"; ] diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/jcrsettings/agents/jpublish.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.author/agents/pubsync.json similarity index 59% rename from src/main/resources/SLING-CONTENT/libs/sling/distribution/jcrsettings/agents/jpublish.json rename to src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.author/agents/pubsync.json index 3b9ffc2..83fc618 100644 --- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/jcrsettings/agents/jpublish.json +++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.author/agents/pubsync.json @@ -1,19 +1,17 @@ { "serviceName" : "distributionService", + "packageExporter": { - "type": "local" + "type": "remote", + "endpoints" : [ + "http://localhost:4503/libs/sling/distribution/services/exporters/reverse-pubsync"; + ] }, "packageImporter": { "type" : "remote", - "transportAuthenticationProvider" : { - "type" : "user", - "username" : "admin", - "password" : "admin" - }, - "endpoints" : [ "http://localhost:4503/libs/sling/distribution/services/importers/default"; ] 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/global.json new file mode 100644 index 0000000..f107e00 --- /dev/null +++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.author/defaults/agents/global.json @@ -0,0 +1,53 @@ +{ + "jcr:primaryType" : "nt:unstructured", + + "kind" : "agent", + "type" : "simple", + + "isResource" : "true", + + "requestAuthorizationStrategy" : { + "kind" : "requestAuthorization", + "type" : "service", + "name" : "privilegeRead" + }, + + "packageExporter": { + "kind" : "exporter", + + "packageBuilder" : { + "kind" : "packager", + "type" : "service", + "name" : "vlt" + }, + + "transportAuthenticationProvider" : { + "kind" : "transportAuthenticator", + "type" : "service", + "name" : "publishAdmin" + } + + }, + + "packageImporter": { + "kind" : "importer", + + "packageBuilder" : { + "kind" : "packager", + + "type" : "service", + "name" : "vlt" + }, + + "transportAuthenticationProvider" : { + "kind" : "transportAuthenticator", + "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 new file mode 100644 index 0000000..80ccce2 --- /dev/null +++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.publish/agents/reverse.json @@ -0,0 +1,13 @@ +{ + "serviceName" : "distributionService", + + "isPassive" : true, + + "packageExporter": { + "type": "local" + }, + + "packageImporter": { + "type" : "local" + } +} \ No newline at end of file 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/global.json new file mode 100644 index 0000000..5da4fbb --- /dev/null +++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.publish/defaults/agents/global.json @@ -0,0 +1,41 @@ +{ + "jcr:primaryType" : "nt:unstructured", + + "kind" : "agent", + "type" : "simple", + + "isResource" : "true", + + "requestAuthorizationStrategy" : { + "kind" : "requestAuthorization", + "type" : "service", + "name" : "privilegeRead" + }, + + "packageExporter": { + "kind" : "exporter", + + "packageBuilder" : { + "kind" : "packager", + "type" : "service", + "name" : "vlt" + } + }, + + "packageImporter": { + "kind" : "importer", + + + "packageBuilder" : { + "kind" : "packager", + + "type" : "service", + "name" : "vlt" + } + }, + + "triggers" : { + "kind" : "trigger", + "type" : "list" + } +} \ No newline at end of file -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
