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 1d734776e564daae8d31264c1e50243eba8574a7 Author: Marius Petria <[email protected]> AuthorDate: Wed Jan 7 11:02:33 2015 +0000 SLING-4289: refactoring the resourceproviders for osgi configs and osgi services git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/distribution/sample@1650034 13f79535-47bb-0310-9956-ffa450edef68 --- ...mpl.ResourceBasedDistributionComponentFactory.json | 4 ---- ...wardDistributionAgentFactory-publish-multiple.json | 18 ++++++++++++++++++ ...verseDistributionAgentFactory-publish-reverse.json | 19 +++++++++++++++++++ ...tionTriggerFactory-publish-reverse-scheduled.json} | 4 ++-- ....impl.ForwardDistributionAgentFactory-publish.json | 17 +++++++++++++++++ ...ent.impl.SyncDistributionAgentFactory-pubsync.json | 11 +++-------- ...utionTriggerFactory-pubsync-scheduled-trigger.json | 0 ...tributionTransportSecretProvider-publishAdmin.json | 6 ------ ...impleDistributionAgentFactory-publish-reverse.json | 16 ---------------- ...ibutionPackageExporterFactory-publish-reverse.json | 12 ------------ ...ibutionPackageImporterFactory-publish-reverse.json | 7 ------- ...utionTriggerFactory-publish-reverse-scheduled.json | 11 ----------- ...calDistributionPackageExporterFactory-publish.json | 7 ------- ...oteDistributionPackageImporterFactory-publish.json | 12 ------------ ...DistributionPackageBuilderFactory-pubsync-vlt.json | 5 ----- ...onTransportSecretProvider-pubsync-publishUser.json | 6 ------ ...DistributionPackageBuilderFactory-pubsync-vlt.json | 5 ----- ...t.impl.SimpleDistributionAgentFactory-reverse.json | 19 ------------------- ...calDistributionPackageExporterFactory-reverse.json | 7 ------- ...calDistributionPackageImporterFactory-reverse.json | 7 ------- ...pl.SimpleDistributionAgentFactory-cache-flush.json | 0 ...RemoteDistributionPackageImporter-cache-flush.json | 0 ...mpl.ResourceBasedDistributionComponentFactory.json | 4 ---- ...entDistributionPackageExporterFactory-reverse.json | 2 -- ...calDistributionPackageExporterFactory-default.json | 4 ---- ...calDistributionPackageImporterFactory-default.json | 3 --- ...QueueDistributionAgentFactory-reverse-pubsync.json | 2 +- ...t.impl.QueueDistributionAgentFactory-reverse.json} | 10 ++++------ ...onTriggerFactory-reverse-userGeneratedContent.json | 3 +-- ...ibutionServiceResourceProviderFactory-agents.json} | 4 +--- ...tionServiceResourceProviderFactory-exporters.json} | 7 ++----- ...tionServiceResourceProviderFactory-importers.json} | 6 ++---- ...utionServiceResourceProviderFactory-triggers.json} | 7 ++----- ...onConfigurationResourceProviderFactory-agents.json | 9 +++++++++ ...ropertiesResourceProviderFactory-simpleAgents.json | 18 ------------------ 35 files changed, 81 insertions(+), 191 deletions(-) diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/org.apache.sling.distribution.component.impl.ResourceBasedDistributionComponentFactory.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/org.apache.sling.distribution.component.impl.ResourceBasedDistributionComponentFactory.json deleted file mode 100644 index d8130f4..0000000 --- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/org.apache.sling.distribution.component.impl.ResourceBasedDistributionComponentFactory.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "jcr:primaryType": "sling:OsgiConfig", - "path": "/libs/sling/distribution/settings.author" -} \ 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 new file mode 100644 index 0000000..50125f3 --- /dev/null +++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/publish-multiple/org.apache.sling.distribution.agent.impl.ForwardDistributionAgentFactory-publish-multiple.json @@ -0,0 +1,18 @@ +{ + "jcr:primaryType": "sling:OsgiConfig", + + "name": "publish-multiple", + + "serviceName" : "distributionService", + + "requestAuthorizationStrategy.target" : "(name=privilegeRead)", + + "packageBuilder.target": "(name=vlt)", + + "transportSecretProvider.target" : "(name=publishAdmin)", + + "packageImporter.endpoints" : [ + "endpoint1=http://localhost:4503/libs/sling/distribution/services/importers/default";, + "endpoint2=http://localhost:4503/libs/sling/distribution/services/importers/defaultbadaddress"; + ] +} \ No newline at end of file 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 new file mode 100644 index 0000000..ba991ec --- /dev/null +++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/publish-reverse/org.apache.sling.distribution.agent.impl.ReverseDistributionAgentFactory-publish-reverse.json @@ -0,0 +1,19 @@ +{ + "jcr:primaryType": "sling:OsgiConfig", + + "name": "publish-reverse", + + "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"; + ], + + "triggers.target": "(name=publish-reverse-scheduled)" +} \ 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.trigger.impl.LocalDistributionTriggerFactory-pubsync-scheduled-trigger.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/publish-reverse/org.apache.sling.distribution.trigger.impl.LocalDistributionTriggerFactory-publish-reverse-scheduled.json similarity index 60% copy from src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.author/pubsync/org.apache.sling.distribution.trigger.impl.LocalDistributionTriggerFactory-pubsync-scheduled-trigger.json copy to src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/publish-reverse/org.apache.sling.distribution.trigger.impl.LocalDistributionTriggerFactory-publish-reverse-scheduled.json index 408b091..e0ea5dd 100644 --- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.author/pubsync/org.apache.sling.distribution.trigger.impl.LocalDistributionTriggerFactory-pubsync-scheduled-trigger.json +++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/publish-reverse/org.apache.sling.distribution.trigger.impl.LocalDistributionTriggerFactory-publish-reverse-scheduled.json @@ -1,10 +1,10 @@ { "jcr:primaryType": "sling:OsgiConfig", - "name": "pubsync-scheduled-trigger", + "name": "publish-reverse-scheduled", "type": "scheduledEvent", - "action": "poll", + "action": "pull", "seconds": "30" } \ No newline at end of file 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 new file mode 100644 index 0000000..94b4a13 --- /dev/null +++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/publish/org.apache.sling.distribution.agent.impl.ForwardDistributionAgentFactory-publish.json @@ -0,0 +1,17 @@ +{ + "jcr:primaryType": "sling:OsgiConfig", + + "name": "publish", + + "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"; + ] +} \ 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.SyncDistributionAgentFactory-pubsync.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/pubsync/org.apache.sling.distribution.agent.impl.SyncDistributionAgentFactory-pubsync.json similarity index 78% rename from src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.author/pubsync/org.apache.sling.distribution.agent.impl.SyncDistributionAgentFactory-pubsync.json rename to src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/pubsync/org.apache.sling.distribution.agent.impl.SyncDistributionAgentFactory-pubsync.json index 567cc41..2105195 100644 --- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.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 @@ -9,11 +9,9 @@ "packageExporter.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";, + "http://localhost:4505/libs/sling/distribution/services/exporters/reverse-pubsync"; ], - - "packageImporter.endpoints": [ "http://localhost:4503/libs/sling/distribution/services/importers/default";, "http://localhost:4504/libs/sling/distribution/services/importers/default";, @@ -21,10 +19,7 @@ ], - "packageBuilder.target" : "(name=pubsync-vlt)", - "transportSecretProvider.target" : "(name=pubsync-publishUser)", - - "triggers.target": "(name=pubsync-scheduled-trigger)" - + "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.osgi.author/pubsync/org.apache.sling.distribution.trigger.impl.LocalDistributionTriggerFactory-pubsync-scheduled-trigger.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/pubsync/org.apache.sling.distribution.trigger.impl.LocalDistributionTriggerFactory-pubsync-scheduled-trigger.json similarity index 100% rename from src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.author/pubsync/org.apache.sling.distribution.trigger.impl.LocalDistributionTriggerFactory-pubsync-scheduled-trigger.json rename to src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/pubsync/org.apache.sling.distribution.trigger.impl.LocalDistributionTriggerFactory-pubsync-scheduled-trigger.json diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.author/org.apache.sling.distribution.transport.impl.UserCredentialsDistributionTransportSecretProvider-publishAdmin.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.author/org.apache.sling.distribution.transport.impl.UserCredentialsDistributionTransportSecretProvider-publishAdmin.json deleted file mode 100644 index 10fbe4d..0000000 --- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.author/org.apache.sling.distribution.transport.impl.UserCredentialsDistributionTransportSecretProvider-publishAdmin.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "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 deleted file mode 100644 index 9bfc60d..0000000 --- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.author/publish-reverse/org.apache.sling.distribution.agent.impl.SimpleDistributionAgentFactory-publish-reverse.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "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 deleted file mode 100644 index d9e5834..0000000 --- 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 +++ /dev/null @@ -1,12 +0,0 @@ -{ - "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)", - "distributionTransportSecretProvider.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 deleted file mode 100644 index 45b6832..0000000 --- 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 +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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 deleted file mode 100644 index 49e8785..0000000 --- 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 +++ /dev/null @@ -1,11 +0,0 @@ -{ - "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.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 deleted file mode 100644 index 4fe2447..0000000 --- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.author/publish/org.apache.sling.distribution.packaging.impl.exporter.LocalDistributionPackageExporterFactory-publish.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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 deleted file mode 100644 index 4ab3f51..0000000 --- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.author/publish/org.apache.sling.distribution.packaging.impl.importer.RemoteDistributionPackageImporterFactory-publish.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "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)", - "distributionTransportSecretProvider.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.serialization.impl.vlt.VaultDistributionPackageBuilderFactory-pubsync-vlt.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.author/pubsync/org.apache.sling.distribution.serialization.impl.vlt.VaultDistributionPackageBuilderFactory-pubsync-vlt.json deleted file mode 100644 index d9912b5..0000000 --- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.author/pubsync/org.apache.sling.distribution.serialization.impl.vlt.VaultDistributionPackageBuilderFactory-pubsync-vlt.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "jcr:primaryType": "sling:OsgiConfig", - "name": "pubsync-vlt", - "type": "jcrvlt" -} \ 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.transport.impl.UserCredentialsDistributionTransportSecretProvider-pubsync-publishUser.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.author/pubsync/org.apache.sling.distribution.transport.impl.UserCredentialsDistributionTransportSecretProvider-pubsync-publishUser.json deleted file mode 100644 index c6d13fc..0000000 --- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.author/pubsync/org.apache.sling.distribution.transport.impl.UserCredentialsDistributionTransportSecretProvider-pubsync-publishUser.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "jcr:primaryType": "sling:OsgiConfig", - "name": "pubsync-publishUser", - "username": "admin", - "password": "admin" -} \ No newline at end of file diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.publish/reverse-pubsync/org.apache.sling.distribution.serialization.impl.vlt.VaultDistributionPackageBuilderFactory-pubsync-vlt.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.publish/reverse-pubsync/org.apache.sling.distribution.serialization.impl.vlt.VaultDistributionPackageBuilderFactory-pubsync-vlt.json deleted file mode 100644 index d9912b5..0000000 --- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.publish/reverse-pubsync/org.apache.sling.distribution.serialization.impl.vlt.VaultDistributionPackageBuilderFactory-pubsync-vlt.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "jcr:primaryType": "sling:OsgiConfig", - "name": "pubsync-vlt", - "type": "jcrvlt" -} \ 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 deleted file mode 100644 index 2316180..0000000 --- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.publish/reverse/org.apache.sling.distribution.agent.impl.SimpleDistributionAgentFactory-reverse.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "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 deleted file mode 100644 index 0b7350b..0000000 --- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.publish/reverse/org.apache.sling.distribution.packaging.impl.exporter.LocalDistributionPackageExporterFactory-reverse.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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 deleted file mode 100644 index b2631ac..0000000 --- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.publish/reverse/org.apache.sling.distribution.packaging.impl.importer.LocalDistributionPackageImporterFactory-reverse.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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/cache-flush/org.apache.sling.distribution.agent.impl.SimpleDistributionAgentFactory-cache-flush.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/cache-flush/org.apache.sling.distribution.agent.impl.SimpleDistributionAgentFactory-cache-flush.json similarity index 100% rename from src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.publish/cache-flush/org.apache.sling.distribution.agent.impl.SimpleDistributionAgentFactory-cache-flush.json rename to src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/cache-flush/org.apache.sling.distribution.agent.impl.SimpleDistributionAgentFactory-cache-flush.json diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.publish/cache-flush/org.apache.sling.distribution.packaging.impl.importer.AdvancedRemoteDistributionPackageImporter-cache-flush.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/cache-flush/org.apache.sling.distribution.packaging.impl.importer.AdvancedRemoteDistributionPackageImporter-cache-flush.json similarity index 100% rename from src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.publish/cache-flush/org.apache.sling.distribution.packaging.impl.importer.AdvancedRemoteDistributionPackageImporter-cache-flush.json rename to src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/cache-flush/org.apache.sling.distribution.packaging.impl.importer.AdvancedRemoteDistributionPackageImporter-cache-flush.json diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/org.apache.sling.distribution.component.impl.ResourceBasedDistributionComponentFactory.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/org.apache.sling.distribution.component.impl.ResourceBasedDistributionComponentFactory.json deleted file mode 100644 index 3c23f83..0000000 --- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/org.apache.sling.distribution.component.impl.ResourceBasedDistributionComponentFactory.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "jcr:primaryType": "sling:OsgiConfig", - "path": "/libs/sling/distribution/settings.publish" -} \ 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.AgentDistributionPackageExporterFactory-reverse.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/org.apache.sling.distribution.packaging.impl.exporter.AgentDistributionPackageExporterFactory-reverse.json similarity index 84% rename from src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.publish/org.apache.sling.distribution.packaging.impl.exporter.AgentDistributionPackageExporterFactory-reverse.json rename to src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/org.apache.sling.distribution.packaging.impl.exporter.AgentDistributionPackageExporterFactory-reverse.json index ab2d2f4..462ce8f 100644 --- 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.publish/org.apache.sling.distribution.packaging.impl.exporter.AgentDistributionPackageExporterFactory-reverse.json @@ -2,8 +2,6 @@ "jcr:primaryType": "sling:OsgiConfig", "name": "reverse", - "isResource" : true, - "packageBuilder.target" : "(name=vlt)", "agent.target": "(name=reverse)" 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.publish/org.apache.sling.distribution.packaging.impl.exporter.LocalDistributionPackageExporterFactory-default.json similarity index 69% rename from src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.publish/org.apache.sling.distribution.packaging.impl.exporter.LocalDistributionPackageExporterFactory-default.json rename to src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/org.apache.sling.distribution.packaging.impl.exporter.LocalDistributionPackageExporterFactory-default.json index 60132c0..660e122 100644 --- 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.publish/org.apache.sling.distribution.packaging.impl.exporter.LocalDistributionPackageExporterFactory-default.json @@ -2,9 +2,5 @@ "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.publish/org.apache.sling.distribution.packaging.impl.importer.LocalDistributionPackageImporterFactory-default.json similarity index 70% rename from src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.publish/org.apache.sling.distribution.packaging.impl.importer.LocalDistributionPackageImporterFactory-default.json rename to src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/org.apache.sling.distribution.packaging.impl.importer.LocalDistributionPackageImporterFactory-default.json index f4607dc..660e122 100644 --- 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.publish/org.apache.sling.distribution.packaging.impl.importer.LocalDistributionPackageImporterFactory-default.json @@ -1,9 +1,6 @@ { "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-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 similarity index 78% rename from src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.publish/reverse-pubsync/org.apache.sling.distribution.agent.impl.QueueDistributionAgentFactory-reverse-pubsync.json rename to src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/reverse-pubsync/org.apache.sling.distribution.agent.impl.QueueDistributionAgentFactory-reverse-pubsync.json index b71f21e..dbf3cce 100644 --- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.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 @@ -6,5 +6,5 @@ "requestAuthorizationStrategy.target" : "(name=privilegeRead)", - "packageBuilder.target" : "(name=pubsync-vlt)" + "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.agent.impl.SimpleDistributionAgentFactory-publish.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/reverse/org.apache.sling.distribution.agent.impl.QueueDistributionAgentFactory-reverse.json similarity index 50% rename from src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.author/publish/org.apache.sling.distribution.agent.impl.SimpleDistributionAgentFactory-publish.json rename to src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/reverse/org.apache.sling.distribution.agent.impl.QueueDistributionAgentFactory-reverse.json index e870174..aefcefc 100644 --- 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.publish/reverse/org.apache.sling.distribution.agent.impl.QueueDistributionAgentFactory-reverse.json @@ -1,15 +1,13 @@ { "jcr:primaryType": "sling:OsgiConfig", - - "name": "publish", - - "enabled" : false, + "name": "reverse", "serviceName" : "distributionService", "requestAuthorizationStrategy.target" : "(name=privilegeRead)", - "packageExporter.target": "(parent.name=publish)", + "packageBuilder.target" : "(name=vlt)", + + "triggers.target": "(name=reverse-userGeneratedContent)" - "packageImporter.target": "(parent.name=publish)" } \ 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.publish/reverse/org.apache.sling.distribution.trigger.impl.LocalDistributionTriggerFactory-reverse-userGeneratedContent.json similarity index 64% rename from src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.publish/reverse/org.apache.sling.distribution.trigger.impl.LocalDistributionTriggerFactory-reverse-userGeneratedContent.json rename to src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/reverse/org.apache.sling.distribution.trigger.impl.LocalDistributionTriggerFactory-reverse-userGeneratedContent.json index e632ed7..9e57314 100644 --- 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.publish/reverse/org.apache.sling.distribution.trigger.impl.LocalDistributionTriggerFactory-reverse-userGeneratedContent.json @@ -1,8 +1,7 @@ { "jcr:primaryType": "sling:OsgiConfig", - "name": "reverse/triggers/userGeneratedContent", - "parent.name": "reverse", + "name": "reverse-userGeneratedContent", "type" : "jcrEvent", "path" : "/content/usergenerated", diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/resources/services/org.apache.sling.distribution.resources.impl.OsgiPropertiesResourceProviderFactory-agents.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/resources/services/org.apache.sling.distribution.resources.impl.DistributionServiceResourceProviderFactory-agents.json similarity index 72% rename from src/main/resources/SLING-CONTENT/libs/sling/distribution/install/resources/services/org.apache.sling.distribution.resources.impl.OsgiPropertiesResourceProviderFactory-agents.json rename to src/main/resources/SLING-CONTENT/libs/sling/distribution/install/resources/services/org.apache.sling.distribution.resources.impl.DistributionServiceResourceProviderFactory-agents.json index f2587ac..ce7c5dd 100644 --- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/resources/services/org.apache.sling.distribution.resources.impl.OsgiPropertiesResourceProviderFactory-agents.json +++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/resources/services/org.apache.sling.distribution.resources.impl.DistributionServiceResourceProviderFactory-agents.json @@ -1,12 +1,10 @@ { "jcr:primaryType": "sling:OsgiConfig", - "name": "distributionAgents", "provider.roots": [ "/libs/sling/distribution/services/agents" ], - "serviceType": "org.apache.sling.distribution.agent.DistributionAgent", + "kind" : "agent", "resourceProperties": [ "sling:resourceType=sling/distribution/service/agent", "sling:resourceSuperType=sling/distribution/service", - "name={name}", "queue/sling:resourceType=sling/distribution/service/agent/queue" ] diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/resources/services/org.apache.sling.distribution.resources.impl.OsgiPropertiesResourceProviderFactory-exporters.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/resources/services/org.apache.sling.distribution.resources.impl.DistributionServiceResourceProviderFactory-exporters.json similarity index 50% rename from src/main/resources/SLING-CONTENT/libs/sling/distribution/install/resources/services/org.apache.sling.distribution.resources.impl.OsgiPropertiesResourceProviderFactory-exporters.json rename to src/main/resources/SLING-CONTENT/libs/sling/distribution/install/resources/services/org.apache.sling.distribution.resources.impl.DistributionServiceResourceProviderFactory-exporters.json index e1b8e94..415889f 100644 --- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/resources/services/org.apache.sling.distribution.resources.impl.OsgiPropertiesResourceProviderFactory-exporters.json +++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/resources/services/org.apache.sling.distribution.resources.impl.DistributionServiceResourceProviderFactory-exporters.json @@ -1,12 +1,9 @@ { "jcr:primaryType": "sling:OsgiConfig", - "name": "distributionExporters", "provider.roots": [ "/libs/sling/distribution/services/exporters" ], - "serviceType": "org.apache.sling.distribution.packaging.DistributionPackageExporter", + "kind" : "exporter", "resourceProperties": [ "sling:resourceType=sling/distribution/service/exporter", - "sling:resourceSuperType=sling/distribution/service", - - "name={name}" + "sling:resourceSuperType=sling/distribution/service" ] } \ No newline at end of file diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/resources/services/org.apache.sling.distribution.resources.impl.OsgiPropertiesResourceProviderFactory-importers.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/resources/services/org.apache.sling.distribution.resources.impl.DistributionServiceResourceProviderFactory-importers.json similarity index 59% rename from src/main/resources/SLING-CONTENT/libs/sling/distribution/install/resources/services/org.apache.sling.distribution.resources.impl.OsgiPropertiesResourceProviderFactory-importers.json rename to src/main/resources/SLING-CONTENT/libs/sling/distribution/install/resources/services/org.apache.sling.distribution.resources.impl.DistributionServiceResourceProviderFactory-importers.json index 1964678..bcec753 100644 --- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/resources/services/org.apache.sling.distribution.resources.impl.OsgiPropertiesResourceProviderFactory-importers.json +++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/resources/services/org.apache.sling.distribution.resources.impl.DistributionServiceResourceProviderFactory-importers.json @@ -2,11 +2,9 @@ "jcr:primaryType": "sling:OsgiConfig", "name": "distributionImporters", "provider.roots": [ "/libs/sling/distribution/services/importers" ], - "serviceType": "org.apache.sling.distribution.packaging.DistributionPackageImporter", + "kind" : "importer", "resourceProperties": [ "sling:resourceType=sling/distribution/service/importer", - "sling:resourceSuperType=sling/distribution/service", - - "name={name}" + "sling:resourceSuperType=sling/distribution/service" ] } \ No newline at end of file diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/resources/services/org.apache.sling.distribution.resources.impl.OsgiPropertiesResourceProviderFactory-triggers.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/resources/services/org.apache.sling.distribution.resources.impl.DistributionServiceResourceProviderFactory-triggers.json similarity index 51% rename from src/main/resources/SLING-CONTENT/libs/sling/distribution/install/resources/services/org.apache.sling.distribution.resources.impl.OsgiPropertiesResourceProviderFactory-triggers.json rename to src/main/resources/SLING-CONTENT/libs/sling/distribution/install/resources/services/org.apache.sling.distribution.resources.impl.DistributionServiceResourceProviderFactory-triggers.json index cf30532..2a4816c 100644 --- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/resources/services/org.apache.sling.distribution.resources.impl.OsgiPropertiesResourceProviderFactory-triggers.json +++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/resources/services/org.apache.sling.distribution.resources.impl.DistributionServiceResourceProviderFactory-triggers.json @@ -1,12 +1,9 @@ { "jcr:primaryType": "sling:OsgiConfig", - "name": "distributionTriggers", "provider.roots": [ "/libs/sling/distribution/services/triggers" ], - "serviceType": "org.apache.sling.distribution.trigger.DistributionTrigger", + "kind" : "trigger", "resourceProperties": [ "sling:resourceType=sling/distribution/service/trigger", - "sling:resourceSuperType=sling/distribution/service", - - "name={name}" + "sling:resourceSuperType=sling/distribution/service" ] } \ No newline at end of file diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/resources/settings/org.apache.sling.distribution.resources.impl.DistributionConfigurationResourceProviderFactory-agents.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/resources/settings/org.apache.sling.distribution.resources.impl.DistributionConfigurationResourceProviderFactory-agents.json new file mode 100644 index 0000000..721f964 --- /dev/null +++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/resources/settings/org.apache.sling.distribution.resources.impl.DistributionConfigurationResourceProviderFactory-agents.json @@ -0,0 +1,9 @@ +{ + "jcr:primaryType": "sling:OsgiConfig", + "provider.roots": [ "/libs/sling/distribution/settings/agents" ], + "kind" : "agent", + "resourceProperties": [ + "sling:resourceType=sling/distribution/setting/agent", + "sling:resourceSuperType=sling/distribution/setting" + ] +} \ No newline at end of file diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/resources/settings/org.apache.sling.distribution.resources.impl.OsgiPropertiesResourceProviderFactory-simpleAgents.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/resources/settings/org.apache.sling.distribution.resources.impl.OsgiPropertiesResourceProviderFactory-simpleAgents.json deleted file mode 100644 index 91825dd..0000000 --- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/resources/settings/org.apache.sling.distribution.resources.impl.OsgiPropertiesResourceProviderFactory-simpleAgents.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "jcr:primaryType": "sling:OsgiConfig", - "name": "simpleAgents", - "provider.roots": [ "/libs/sling/distribution/settings/agents" ], - "serviceType": "org.apache.sling.distribution.agent.impl.SimpleDistributionAgentFactory", - "providerType": "osgiConfig", - "groupPrefix": "agents", - - "resourceProperties": [ - "sling:resourceType=sling/distribution/setting/agent", - "sling:resourceSuperType=sling/distribution/setting", - "name={name}", - "packageExporter={packageExporter}", - "packageImporter={packageImporter}" - ] - - -} \ No newline at end of file -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
