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 5cbd81631ebe5c36a1a77a41ff2f72ecc9e6229d Author: Marius Petria <[email protected]> AuthorDate: Wed Dec 17 13:20:47 2014 +0000 SLING-4153: adjusting osgi configs to dedicated factories git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/distribution/sample@1646232 13f79535-47bb-0310-9956-ffa450edef68 --- ....impl.SyncDistributionAgentFactory-pubsync.json | 30 ++++++++++++++++++++++ ...DistributionPackageExporterFactory-pubsync.json | 19 -------------- ...DistributionPackageImporterFactory-pubsync.json | 19 -------------- ...tributionPackageBuilderFactory-pubsync-vlt.json | 5 ++++ ...ransportSecretProvider-pubsync-publishUser.json | 6 +++++ ...onTriggerFactory-pubsync-scheduled-trigger.json | 10 ++++++++ ...eDistributionAgentFactory-reverse-pubsync.json} | 8 ++---- ...tributionPackageBuilderFactory-pubsync-vlt.json | 5 ++++ 8 files changed, 58 insertions(+), 44 deletions(-) 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.osgi.author/pubsync/org.apache.sling.distribution.agent.impl.SyncDistributionAgentFactory-pubsync.json new file mode 100644 index 0000000..567cc41 --- /dev/null +++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.author/pubsync/org.apache.sling.distribution.agent.impl.SyncDistributionAgentFactory-pubsync.json @@ -0,0 +1,30 @@ +{ + "jcr:primaryType": "sling:OsgiConfig", + "name": "pubsync", + + "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";, + "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";, + "http://localhost:4505/libs/sling/distribution/services/importers/default"; + + ], + + "packageBuilder.target" : "(name=pubsync-vlt)", + "transportSecretProvider.target" : "(name=pubsync-publishUser)", + + "triggers.target": "(name=pubsync-scheduled-trigger)" + + +} \ 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 deleted file mode 100644 index 907697c..0000000 --- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.author/pubsync/org.apache.sling.distribution.packaging.impl.exporter.RemoteDistributionPackageExporterFactory-pubsync.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "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)", - "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.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 deleted file mode 100644 index d381879..0000000 --- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.author/pubsync/org.apache.sling.distribution.packaging.impl.importer.RemoteDistributionPackageImporterFactory-pubsync.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "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)", - "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 new file mode 100644 index 0000000..d9912b5 --- /dev/null +++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.author/pubsync/org.apache.sling.distribution.serialization.impl.vlt.VaultDistributionPackageBuilderFactory-pubsync-vlt.json @@ -0,0 +1,5 @@ +{ + "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 new file mode 100644 index 0000000..c6d13fc --- /dev/null +++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.author/pubsync/org.apache.sling.distribution.transport.impl.UserCredentialsDistributionTransportSecretProvider-pubsync-publishUser.json @@ -0,0 +1,6 @@ +{ + "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.author/pubsync/org.apache.sling.distribution.trigger.impl.LocalDistributionTriggerFactory-pubsync-scheduled-trigger.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.author/pubsync/org.apache.sling.distribution.trigger.impl.LocalDistributionTriggerFactory-pubsync-scheduled-trigger.json new file mode 100644 index 0000000..408b091 --- /dev/null +++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.author/pubsync/org.apache.sling.distribution.trigger.impl.LocalDistributionTriggerFactory-pubsync-scheduled-trigger.json @@ -0,0 +1,10 @@ +{ + "jcr:primaryType": "sling:OsgiConfig", + + "name": "pubsync-scheduled-trigger", + + "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/pubsync/org.apache.sling.distribution.agent.impl.SimpleDistributionAgentFactory-pubsync.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.publish/reverse-pubsync/org.apache.sling.distribution.agent.impl.QueueDistributionAgentFactory-reverse-pubsync.json similarity index 50% rename from src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.author/pubsync/org.apache.sling.distribution.agent.impl.SimpleDistributionAgentFactory-pubsync.json rename to src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.publish/reverse-pubsync/org.apache.sling.distribution.agent.impl.QueueDistributionAgentFactory-reverse-pubsync.json index 05ee9f6..b71f21e 100644 --- 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.publish/reverse-pubsync/org.apache.sling.distribution.agent.impl.QueueDistributionAgentFactory-reverse-pubsync.json @@ -1,14 +1,10 @@ { "jcr:primaryType": "sling:OsgiConfig", - "name": "pubsync", - - "enabled" : false, + "name": "reverse-pubsync", "serviceName" : "distributionService", "requestAuthorizationStrategy.target" : "(name=privilegeRead)", - "packageExporter.target": "(parent.name=pubsync)", - - "packageImporter.target": "(parent.name=pubsync)" + "packageBuilder.target" : "(name=pubsync-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.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 new file mode 100644 index 0000000..d9912b5 --- /dev/null +++ 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 @@ -0,0 +1,5 @@ +{ + "jcr:primaryType": "sling:OsgiConfig", + "name": "pubsync-vlt", + "type": "jcrvlt" +} \ No newline at end of file -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
