You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2017/11/07 09:29:42 UTC
[sling-org-apache-sling-distribution-sample] annotated tag
org.apache.sling.distribution.sample-0.1.0 created (now b20e08a)
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a change 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.
at b20e08a (tag)
tagging d189e9a13ded64fffd64bb1ba98849befbc96c21 (commit)
by Tommaso Teofili
on Tue Mar 24 14:12:25 2015 +0000
- Log -----------------------------------------------------------------
org.apache.sling.distribution.sample-0.1.0
-----------------------------------------------------------------------
This annotated tag includes the following new commits:
new bb3b2c9 SLING-3978 - added 'sample' replication bundle
new dae9ac1 SLING-3978 - adjusted service user mapping to match the core sybmolic name
new 7a2e3b7 no Jira - ignored IntelliJ's config files
new 5bd1d0c Update to Sling Parent POM 22 with baselining enabled
new f9e18f3 SLING-3992 - added coordinating agent(factory), fixed some defaults (scheduling,remote polling)
new 3517e55 SLING-3994 - simplified replication components' dependency management, minor javadoc adjustments
new 490010a SLING-4008 - added JcrEventReplicationTrigger
new 2e50078 SLING-3993 - added an abstract jcr event trigger to avoid loops with two implementations(current and another persisting and replicating the event itself)
new 953e611 SLING-3899 - applied Marius patch to add the resource resolved to all APIs
new a820b02 SLING-4052 - cleaned up jcr pacakges
new 12e552a SLING-4052 - cleaned up jcr pacakges
new 47dfebf SLING-3899 - using authorization strategy for checking resource resolver
new f906ea1 SLING-4073 - replication component factory declaring accepted properties for component creation
new abb4084 SLING-4106 - cleand up agent API, moved replication component stuff to component package
new 6d442b4 SLING-4120: cleaned ReplicationQueueProvider of quueue creation/deletion semantics
new 2426062 SLING-4132 - fixed event listeners registration
new 9197ae5 SLING-4060: initial refactoring for property parsing
new cfb06b5 SLING-4140 - renamed and moved Sling Replication to Sling Content Distribution
new 877bcc6 SLING-4140 - renamed and moved Sling Replication to Sling Content Distribution
new b8059df SLING-4144 - split distribution api and core bundles
new 4124bc3 SLING-4149: adding component factories based on resources
new 5a26d72 SLING-4149: renaming factory to resource based & adding defaults
new d74cef5 Ignore Eclipse .settings folder
new 4bb3044 SLING-4153 - improve javadoc, added distribution request state, minor fixes
new 5990eef SLING-4514: Generating OSGI configs from content and starting services using osgi services
new 1f94f01 SLING-4154: making also importers and exporters to be picked up by content based factory
new c448282 SLING-4153 - fixed transport API to just expose the secret
new 8fa1d60 SLING-4153 - fixed transport API to just expose the secret
new 84aef53 SLING-4153: changing events to be controlled by agent + some name changes for settings
new 13ab803 SLING-4054: adding package builder based on jcr packages
new cfd7edf SLING-4060: creating dedicated factories for sync and queue agents
new 5cbd816 SLING-4153: adjusting osgi configs to dedicated factories
new 3a5baef SLING-4009: implementing multiple queue dispatch strategy to have one queue per receiving endpoint
new 1d73477 SLING-4289: refactoring the resourceproviders for osgi configs and osgi services
new 10bbfbe SLING-4009: making multiple queue delivery option explicit via osgi config
new b8aa8c2 SLING-4292: exposing queue and queue items as resources
new a7f7f3c SLING-4324: spliting LocalDistributionTriggerFactory in specific factories
new 662df30 SLING-4341: removing package also when a package is deleted from queue
new da3ebed SLING-4392: removing mechanism for generating osgi configs from jcr descriptions
new a1a4d2a Added eclipse project files to svn:ignore
new 6bd9959 [maven-release-plugin] prepare release org.apache.sling.distribution.sample-0.1.0
new d189e9a [maven-release-plugin] copy for tag org.apache.sling.distribution.sample-0.1.0
The 42 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
--
To stop receiving notification emails like this one, please contact
['"commits@sling.apache.org" <co...@sling.apache.org>'].
[sling-org-apache-sling-distribution-sample] 29/42: SLING-4153:
changing events to be controlled by agent + some name changes for settings
Posted by ro...@apache.org.
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 84aef53ca25812901fc761fa3cca79cc32a75880
Author: Marius Petria <mp...@apache.org>
AuthorDate: Fri Dec 5 13:24:00 2014 +0000
SLING-4153: changing events to be controlled by agent + some name changes for settings
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/distribution/sample@1643266 13f79535-47bb-0310-9956-ffa450edef68
---
.../distribution/settings.author/defaults/agents/global.json | 12 ++++++------
.../settings.publish/defaults/agents/global.json | 4 ++--
.../settings.publish/defaults/exporters/global.json | 2 +-
.../settings.publish/defaults/importers/global.json | 2 +-
4 files changed, 10 insertions(+), 10 deletions(-)
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
index 2a8a1f3..ee06d84 100644
--- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.author/defaults/agents/global.json
+++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.author/defaults/agents/global.json
@@ -16,13 +16,13 @@
"kind" : "exporter",
"packageBuilder" : {
- "kind" : "packager",
+ "kind" : "packageBuilder",
"type" : "service",
"name" : "vlt"
},
- "distributionTransportSecretProvider" : {
- "kind" : "transportAuthenticator",
+ "transportSecretProvider" : {
+ "kind" : "transportSecretProvider",
"type" : "service",
"name" : "publishAdmin"
}
@@ -33,14 +33,14 @@
"kind" : "importer",
"packageBuilder" : {
- "kind" : "packager",
+ "kind" : "packageBuilder",
"type" : "service",
"name" : "vlt"
},
- "distributionTransportSecretProvider" : {
- "kind" : "transportAuthenticator",
+ "transportSecretProvider" : {
+ "kind" : "transportSecretProvider",
"type" : "service",
"name" : "publishAdmin"
}
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
index 5da4fbb..487bee3 100644
--- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.publish/defaults/agents/global.json
+++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.publish/defaults/agents/global.json
@@ -16,7 +16,7 @@
"kind" : "exporter",
"packageBuilder" : {
- "kind" : "packager",
+ "kind" : "packageBuilder",
"type" : "service",
"name" : "vlt"
}
@@ -27,7 +27,7 @@
"packageBuilder" : {
- "kind" : "packager",
+ "kind" : "packageBuilder",
"type" : "service",
"name" : "vlt"
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.publish/defaults/exporters/global.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.publish/defaults/exporters/global.json
index be80eb3..63f485f 100644
--- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.publish/defaults/exporters/global.json
+++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.publish/defaults/exporters/global.json
@@ -6,7 +6,7 @@
"isResource" : "true",
"packageBuilder" : {
- "kind" : "packager",
+ "kind" : "packageBuilder",
"type" : "service",
"name" : "vlt"
}
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.publish/defaults/importers/global.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.publish/defaults/importers/global.json
index 9db09d2..b857d9a 100644
--- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.publish/defaults/importers/global.json
+++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.publish/defaults/importers/global.json
@@ -6,7 +6,7 @@
"isResource" : "true",
"packageBuilder" : {
- "kind" : "packager",
+ "kind" : "packageBuilder",
"type" : "service",
"name" : "vlt"
}
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-distribution-sample] 13/42: SLING-4073 -
replication component factory declaring accepted properties for component
creation
Posted by ro...@apache.org.
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 f906ea116b9b40eb6091d085448fda54314d7be9
Author: Tommaso Teofili <to...@apache.org>
AuthorDate: Fri Oct 17 07:58:45 2014 +0000
SLING-4073 - replication component factory declaring accepted properties for component creation
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/replication/sample@1632487 13f79535-47bb-0310-9956-ffa450edef68
---
...nt.impl.CoordinatingReplicationAgentFactory-pubsync.json | 13 ++++---------
....impl.SimpleReplicationAgentFactory-publish-reverse.json | 8 ++------
...on.agent.impl.SimpleReplicationAgentFactory-publish.json | 10 +++++-----
...rter.AgentReplicationPackageExporterFactory-reverse.json | 1 -
4 files changed, 11 insertions(+), 21 deletions(-)
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.CoordinatingReplicationAgentFactory-pubsync.json b/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.CoordinatingReplicationAgentFactory-pubsync.json
index 41d4e8e..6144bac 100644
--- a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.CoordinatingReplicationAgentFactory-pubsync.json
+++ b/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.CoordinatingReplicationAgentFactory-pubsync.json
@@ -4,10 +4,12 @@
"serviceName" : "replicationService",
+ "requestAuthorizationStrategy" : [
+ "type=privilege",
+ "jcrPrivilege=jcr:read"
+ ],
"packageExporter": [
- "authenticationProvider/type=service",
-
"packageBuilder/type=vlt",
"endpoints[0]=http://localhost:4503/libs/sling/replication/services/exporters/reverse-pubsync",
@@ -16,14 +18,7 @@
"endpoints.strategy=All"
],
- "packageExporterStrategy" : [
- "type=privilege",
- "jcrPrivilege=jcr:read"
- ],
-
"packageImporter": [
- "authenticationProvider/type=service",
-
"packageBuilder/type=vlt",
"endpoints[0]=http://localhost:4503/libs/sling/replication/services/importers/default",
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-publish-reverse.json b/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-publish-reverse.json
index d6b68cb..fccec22 100644
--- a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-publish-reverse.json
+++ b/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-publish-reverse.json
@@ -11,8 +11,6 @@
"type=remote",
"endpoints[0]=http://localhost:4503/libs/sling/replication/services/exporters/reverse",
- "authenticationProvider/type=service",
-
"packageBuilder/type=vlt"
],
@@ -23,7 +21,7 @@
"packageImporter": [
"type=local",
- "packageBuilder/type=vlt",
+ "packageBuilder/type=vlt"
],
"trigger0": [
@@ -34,9 +32,7 @@
"trigger1": [
"type=remoteEvent",
- "endpoint=http://localhost:4503/libs/sling/replication/services/triggers/content-changed.event",
-
- "authenticationProvider/type=service"
+ "endpoint=http://localhost:4503/libs/sling/replication/services/triggers/content-changed.event"
],
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-publish.json b/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-publish.json
index f6ab408..cf5ea57 100644
--- a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-publish.json
+++ b/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-publish.json
@@ -4,16 +4,16 @@
"serviceName" : "replicationService",
- "packageExporter": [
- "type=local",
- "packageBuilder/type=vlt"
- ],
-
"requestAuthorizationStrategy" : [
"type=privilege",
"jcrPrivilege=jcr:read"
],
+ "packageExporter": [
+ "type=local",
+ "packageBuilder/type=vlt"
+ ],
+
"packageImporter": [
"type=remote",
"endpoints[0]=http://localhost:4503/libs/sling/replication/services/importers/default",
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.packaging.impl.exporter.AgentReplicationPackageExporterFactory-reverse.json b/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.packaging.impl.exporter.AgentReplicationPackageExporterFactory-reverse.json
index 3495bc9..f9e8bb0 100644
--- a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.packaging.impl.exporter.AgentReplicationPackageExporterFactory-reverse.json
+++ b/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.packaging.impl.exporter.AgentReplicationPackageExporterFactory-reverse.json
@@ -3,7 +3,6 @@
"name": "reverse",
"packageBuilder": [ "type=vlt" ],
- "agent" : [ "type=service"],
"ReplicationAgent.target": "(name=reverse)"
}
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-distribution-sample] 31/42: SLING-4060:
creating dedicated factories for sync and queue agents
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.distribution.sample-0.1.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-distribution-sample.git
commit cfd7edf0050ff6a1b1e92b7b01dc7b1810b60c59
Author: Marius Petria <mp...@apache.org>
AuthorDate: Mon Dec 8 16:11:24 2014 +0000
SLING-4060: creating dedicated factories for sync and queue agents
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/distribution/sample@1643847 13f79535-47bb-0310-9956-ffa450edef68
---
...aultDistributionPackageBuilderFactory-vlt.json} | 0
.../settings.author/agents/publish-reverse.json | 2 ++
.../settings.author/agents/publish.json | 2 ++
.../settings.author/agents/pubsync.json | 22 ++++++---------
.../defaults/agents/{global.json => simple.json} | 1 -
.../settings.author/defaults/agents/sync.json | 31 ++++++++++++++++++++++
.../settings.publish/agents/reverse.json | 2 ++
.../defaults/agents/{global.json => queue.json} | 13 ---------
.../defaults/exporters/{global.json => agent.json} | 0
.../defaults/exporters/{global.json => local.json} | 0
.../defaults/importers/{global.json => local.json} | 0
11 files changed, 45 insertions(+), 28 deletions(-)
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/org.apache.sling.distribution.serialization.impl.vlt.FileVaultDistributionPackageBuilderFactory-vlt.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/org.apache.sling.distribution.serialization.impl.vlt.VaultDistributionPackageBuilderFactory-vlt.json
similarity index 100%
rename from src/main/resources/SLING-CONTENT/libs/sling/distribution/install/org.apache.sling.distribution.serialization.impl.vlt.FileVaultDistributionPackageBuilderFactory-vlt.json
rename to src/main/resources/SLING-CONTENT/libs/sling/distribution/install/org.apache.sling.distribution.serialization.impl.vlt.VaultDistributionPackageBuilderFactory-vlt.json
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.author/agents/publish-reverse.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.author/agents/publish-reverse.json
index 10be9d9..59996d1 100644
--- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.author/agents/publish-reverse.json
+++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.author/agents/publish-reverse.json
@@ -1,4 +1,6 @@
{
+ "type" : "simple",
+
"serviceName" : "distributionService",
"packageExporter": {
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.author/agents/publish.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.author/agents/publish.json
index 4ace18c..f65aaac 100644
--- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.author/agents/publish.json
+++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.author/agents/publish.json
@@ -1,4 +1,6 @@
{
+ "type" : "simple",
+
"serviceName" : "distributionService",
"packageExporter": {
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.author/agents/pubsync.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.author/agents/pubsync.json
index 83fc618..0eb22dc 100644
--- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.author/agents/pubsync.json
+++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.author/agents/pubsync.json
@@ -1,19 +1,13 @@
{
- "serviceName" : "distributionService",
-
+ "type" : "sync",
- "packageExporter": {
- "type": "remote",
- "endpoints" : [
- "http://localhost:4503/libs/sling/distribution/services/exporters/reverse-pubsync"
- ]
- },
+ "serviceName" : "distributionService",
- "packageImporter": {
- "type" : "remote",
+ "packageExporter.endpoints" : [
+ "http://localhost:4503/libs/sling/distribution/services/exporters/reverse-pubsync"
+ ],
- "endpoints" : [
- "http://localhost:4503/libs/sling/distribution/services/importers/default"
- ]
- }
+ "packageImporter.endpoints" : [
+ "http://localhost:4503/libs/sling/distribution/services/importers/default"
+ ]
}
\ No newline at end of file
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.author/defaults/agents/global.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.author/defaults/agents/simple.json
similarity index 97%
rename from src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.author/defaults/agents/global.json
rename to src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.author/defaults/agents/simple.json
index ee06d84..b366f79 100644
--- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.author/defaults/agents/global.json
+++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.author/defaults/agents/simple.json
@@ -2,7 +2,6 @@
"jcr:primaryType" : "nt:unstructured",
"kind" : "agent",
- "type" : "simple",
"isResource" : "true",
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.author/defaults/agents/sync.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.author/defaults/agents/sync.json
new file mode 100644
index 0000000..66b9a20
--- /dev/null
+++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.author/defaults/agents/sync.json
@@ -0,0 +1,31 @@
+{
+ "jcr:primaryType" : "nt:unstructured",
+
+ "kind" : "agent",
+
+ "isResource" : "true",
+
+ "requestAuthorizationStrategy" : {
+ "kind" : "requestAuthorization",
+ "type" : "service",
+ "name" : "privilegeRead"
+ },
+
+ "packageBuilder" : {
+ "kind" : "packageBuilder",
+
+ "type" : "service",
+ "name" : "vlt"
+ },
+
+ "transportSecretProvider" : {
+ "kind" : "transportSecretProvider",
+ "type" : "service",
+ "name" : "publishAdmin"
+ },
+
+ "triggers" : {
+ "kind" : "trigger",
+ "type" : "list"
+ }
+}
\ No newline at end of file
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.publish/agents/reverse.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.publish/agents/reverse.json
index 80ccce2..267f3a1 100644
--- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.publish/agents/reverse.json
+++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.publish/agents/reverse.json
@@ -1,4 +1,6 @@
{
+ "type" : "queue",
+
"serviceName" : "distributionService",
"isPassive" : true,
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.publish/defaults/agents/global.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.publish/defaults/agents/queue.json
similarity index 69%
rename from src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.publish/defaults/agents/global.json
rename to src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.publish/defaults/agents/queue.json
index 487bee3..fbf5367 100644
--- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.publish/defaults/agents/global.json
+++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.publish/defaults/agents/queue.json
@@ -2,7 +2,6 @@
"jcr:primaryType" : "nt:unstructured",
"kind" : "agent",
- "type" : "simple",
"isResource" : "true",
@@ -22,18 +21,6 @@
}
},
- "packageImporter": {
- "kind" : "importer",
-
-
- "packageBuilder" : {
- "kind" : "packageBuilder",
-
- "type" : "service",
- "name" : "vlt"
- }
- },
-
"triggers" : {
"kind" : "trigger",
"type" : "list"
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.publish/defaults/exporters/global.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.publish/defaults/exporters/agent.json
similarity index 100%
copy from src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.publish/defaults/exporters/global.json
copy to src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.publish/defaults/exporters/agent.json
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.publish/defaults/exporters/global.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.publish/defaults/exporters/local.json
similarity index 100%
rename from src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.publish/defaults/exporters/global.json
rename to src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.publish/defaults/exporters/local.json
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.publish/defaults/importers/global.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.publish/defaults/importers/local.json
similarity index 100%
rename from src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.publish/defaults/importers/global.json
rename to src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.publish/defaults/importers/local.json
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-distribution-sample] 14/42: SLING-4106 -
cleand up agent API, moved replication component stuff to component package
Posted by ro...@apache.org.
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 abb4084833f3c96a48b99121dcea2e15dbcb8aff
Author: Tommaso Teofili <to...@apache.org>
AuthorDate: Mon Oct 27 13:49:51 2014 +0000
SLING-4106 - cleand up agent API, moved replication component stuff to component package
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/replication/sample@1634538 13f79535-47bb-0310-9956-ffa450edef68
---
...mpl.GenericReplicationComponentFactory-trigger-remote-event.json} | 0
...replication.agent.impl.SimpleReplicationAgentFactory-reverse.json | 5 ++---
....GenericReplicationComponentFactory-trigger-content-changed.json} | 0
3 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.GenericReplicationComponentFactory-trigger-remote-event.json b/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.component.impl.GenericReplicationComponentFactory-trigger-remote-event.json
similarity index 100%
rename from src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.GenericReplicationComponentFactory-trigger-remote-event.json
rename to src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.component.impl.GenericReplicationComponentFactory-trigger-remote-event.json
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-reverse.json b/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-reverse.json
index a4cec76..53baa1b 100644
--- a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-reverse.json
+++ b/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-reverse.json
@@ -18,13 +18,12 @@
"packageImporter": [
"type=local",
- "packageBuilder/type=vlt",
+ "packageBuilder/type=vlt"
],
-
"queueProvider.target" : "(name=sjh)",
- "queueDistributionStrategy": "(name=error)",
+ "queueDistributionStrategy": "(name=single)",
"trigger0": [
"type=jcrEvent",
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.GenericReplicationComponentFactory-trigger-content-changed.json b/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.component.impl.GenericReplicationComponentFactory-trigger-content-changed.json
similarity index 100%
rename from src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.GenericReplicationComponentFactory-trigger-content-changed.json
rename to src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.component.impl.GenericReplicationComponentFactory-trigger-content-changed.json
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-distribution-sample] 30/42: SLING-4054:
adding package builder based on jcr packages
Posted by ro...@apache.org.
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 13ab80304987da89fc74cdc95046827b2aacea00
Author: Marius Petria <mp...@apache.org>
AuthorDate: Fri Dec 5 14:40:03 2014 +0000
SLING-4054: adding package builder based on jcr packages
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/distribution/sample@1643296 13f79535-47bb-0310-9956-ffa450edef68
---
...zation.impl.vlt.FileVaultDistributionPackageBuilderFactory-vlt.json | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
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
index e1743eb..931dc79 100644
--- 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
@@ -1,4 +1,5 @@
{
"jcr:primaryType": "sling:OsgiConfig",
- "name": "vlt"
+ "name": "vlt",
+ "type": "jcrvlt"
}
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-distribution-sample] 42/42:
[maven-release-plugin] copy for tag
org.apache.sling.distribution.sample-0.1.0
Posted by ro...@apache.org.
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 d189e9a13ded64fffd64bb1ba98849befbc96c21
Author: Tommaso Teofili <to...@apache.org>
AuthorDate: Tue Mar 24 14:12:25 2015 +0000
[maven-release-plugin] copy for tag org.apache.sling.distribution.sample-0.1.0
git-svn-id: https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.distribution.sample-0.1.0@1668901 13f79535-47bb-0310-9956-ffa450edef68
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-distribution-sample] 39/42: SLING-4392:
removing mechanism for generating osgi configs from jcr descriptions
Posted by ro...@apache.org.
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 da3ebed78a38e21a2725a12c877a94bce7ca897b
Author: Marius Petria <mp...@apache.org>
AuthorDate: Wed Feb 4 11:25:29 2015 +0000
SLING-4392: removing mechanism for generating osgi configs from jcr descriptions
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/distribution/sample@1657123 13f79535-47bb-0310-9956-ffa450edef68
---
.../settings.author/agents/publish-multiple.json | 11 -----
.../settings.author/agents/publish-reverse.json | 17 -------
.../settings.author/agents/publish.json | 10 -----
.../settings.author/agents/pubsync.json | 13 ------
.../settings.author/defaults/agents/forward.json | 31 -------------
.../settings.author/defaults/agents/reverse.json | 31 -------------
.../settings.author/defaults/agents/simple.json | 52 ----------------------
.../settings.author/defaults/agents/sync.json | 31 -------------
.../settings.publish/agents/reverse.json | 11 -----
.../settings.publish/defaults/agents/queue.json | 28 ------------
.../settings.publish/defaults/exporters/agent.json | 13 ------
.../settings.publish/defaults/exporters/local.json | 13 ------
.../settings.publish/defaults/importers/local.json | 13 ------
.../settings.publish/exporters/default.json | 3 --
.../settings.publish/exporters/reverse.json | 7 ---
.../settings.publish/importers/default.json | 3 --
16 files changed, 287 deletions(-)
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.author/agents/publish-multiple.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.author/agents/publish-multiple.json
deleted file mode 100644
index 8ee38b4..0000000
--- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.author/agents/publish-multiple.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "type" : "forward",
-
- "serviceName" : "distributionService",
-
-
- "packageImporter.endpoints" : [
- "endpoint1=http://localhost:4503/libs/sling/distribution/services/importers/default",
- "endpoint2=http://localhost:4503/libs/sling/distribution/services/importers/default"
- ]
-}
\ No newline at end of file
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.author/agents/publish-reverse.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.author/agents/publish-reverse.json
deleted file mode 100644
index 3fee975..0000000
--- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.author/agents/publish-reverse.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
- "type" : "reverse",
-
- "serviceName" : "distributionService",
-
- "packageExporter.endpoints": [
- "http://localhost:4503/libs/sling/distribution/services/exporters/reverse"
- ],
-
- "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/settings.author/agents/publish.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.author/agents/publish.json
deleted file mode 100644
index 55c6dbc..0000000
--- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.author/agents/publish.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "type" : "forward",
-
- "serviceName" : "distributionService",
-
-
- "packageImporter.endpoints" : [
- "http://localhost:4503/libs/sling/distribution/services/importers/default"
- ]
-}
\ No newline at end of file
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.author/agents/pubsync.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.author/agents/pubsync.json
deleted file mode 100644
index 0eb22dc..0000000
--- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.author/agents/pubsync.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
- "type" : "sync",
-
- "serviceName" : "distributionService",
-
- "packageExporter.endpoints" : [
- "http://localhost:4503/libs/sling/distribution/services/exporters/reverse-pubsync"
- ],
-
- "packageImporter.endpoints" : [
- "http://localhost:4503/libs/sling/distribution/services/importers/default"
- ]
-}
\ No newline at end of file
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.author/defaults/agents/forward.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.author/defaults/agents/forward.json
deleted file mode 100644
index 66b9a20..0000000
--- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.author/defaults/agents/forward.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
- "jcr:primaryType" : "nt:unstructured",
-
- "kind" : "agent",
-
- "isResource" : "true",
-
- "requestAuthorizationStrategy" : {
- "kind" : "requestAuthorization",
- "type" : "service",
- "name" : "privilegeRead"
- },
-
- "packageBuilder" : {
- "kind" : "packageBuilder",
-
- "type" : "service",
- "name" : "vlt"
- },
-
- "transportSecretProvider" : {
- "kind" : "transportSecretProvider",
- "type" : "service",
- "name" : "publishAdmin"
- },
-
- "triggers" : {
- "kind" : "trigger",
- "type" : "list"
- }
-}
\ No newline at end of file
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.author/defaults/agents/reverse.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.author/defaults/agents/reverse.json
deleted file mode 100644
index 66b9a20..0000000
--- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.author/defaults/agents/reverse.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
- "jcr:primaryType" : "nt:unstructured",
-
- "kind" : "agent",
-
- "isResource" : "true",
-
- "requestAuthorizationStrategy" : {
- "kind" : "requestAuthorization",
- "type" : "service",
- "name" : "privilegeRead"
- },
-
- "packageBuilder" : {
- "kind" : "packageBuilder",
-
- "type" : "service",
- "name" : "vlt"
- },
-
- "transportSecretProvider" : {
- "kind" : "transportSecretProvider",
- "type" : "service",
- "name" : "publishAdmin"
- },
-
- "triggers" : {
- "kind" : "trigger",
- "type" : "list"
- }
-}
\ No newline at end of file
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.author/defaults/agents/simple.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.author/defaults/agents/simple.json
deleted file mode 100644
index b366f79..0000000
--- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.author/defaults/agents/simple.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
- "jcr:primaryType" : "nt:unstructured",
-
- "kind" : "agent",
-
- "isResource" : "true",
-
- "requestAuthorizationStrategy" : {
- "kind" : "requestAuthorization",
- "type" : "service",
- "name" : "privilegeRead"
- },
-
- "packageExporter": {
- "kind" : "exporter",
-
- "packageBuilder" : {
- "kind" : "packageBuilder",
- "type" : "service",
- "name" : "vlt"
- },
-
- "transportSecretProvider" : {
- "kind" : "transportSecretProvider",
- "type" : "service",
- "name" : "publishAdmin"
- }
-
- },
-
- "packageImporter": {
- "kind" : "importer",
-
- "packageBuilder" : {
- "kind" : "packageBuilder",
-
- "type" : "service",
- "name" : "vlt"
- },
-
- "transportSecretProvider" : {
- "kind" : "transportSecretProvider",
- "type" : "service",
- "name" : "publishAdmin"
- }
- },
-
- "triggers" : {
- "kind" : "trigger",
- "type" : "list"
- }
-}
\ No newline at end of file
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.author/defaults/agents/sync.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.author/defaults/agents/sync.json
deleted file mode 100644
index 66b9a20..0000000
--- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.author/defaults/agents/sync.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
- "jcr:primaryType" : "nt:unstructured",
-
- "kind" : "agent",
-
- "isResource" : "true",
-
- "requestAuthorizationStrategy" : {
- "kind" : "requestAuthorization",
- "type" : "service",
- "name" : "privilegeRead"
- },
-
- "packageBuilder" : {
- "kind" : "packageBuilder",
-
- "type" : "service",
- "name" : "vlt"
- },
-
- "transportSecretProvider" : {
- "kind" : "transportSecretProvider",
- "type" : "service",
- "name" : "publishAdmin"
- },
-
- "triggers" : {
- "kind" : "trigger",
- "type" : "list"
- }
-}
\ No newline at end of file
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.publish/agents/reverse.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.publish/agents/reverse.json
deleted file mode 100644
index 79ae41f..0000000
--- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.publish/agents/reverse.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "type" : "queue",
-
- "serviceName" : "distributionService",
-
- "isPassive" : true,
-
- "packageExporter": {
- "type": "local"
- }
-}
\ No newline at end of file
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.publish/defaults/agents/queue.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.publish/defaults/agents/queue.json
deleted file mode 100644
index fbf5367..0000000
--- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.publish/defaults/agents/queue.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
- "jcr:primaryType" : "nt:unstructured",
-
- "kind" : "agent",
-
- "isResource" : "true",
-
- "requestAuthorizationStrategy" : {
- "kind" : "requestAuthorization",
- "type" : "service",
- "name" : "privilegeRead"
- },
-
- "packageExporter": {
- "kind" : "exporter",
-
- "packageBuilder" : {
- "kind" : "packageBuilder",
- "type" : "service",
- "name" : "vlt"
- }
- },
-
- "triggers" : {
- "kind" : "trigger",
- "type" : "list"
- }
-}
\ No newline at end of file
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.publish/defaults/exporters/agent.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.publish/defaults/exporters/agent.json
deleted file mode 100644
index 63f485f..0000000
--- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.publish/defaults/exporters/agent.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
- "jcr:primaryType" : "nt:unstructured",
-
- "kind" : "exporter",
-
- "isResource" : "true",
-
- "packageBuilder" : {
- "kind" : "packageBuilder",
- "type" : "service",
- "name" : "vlt"
- }
-}
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.publish/defaults/exporters/local.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.publish/defaults/exporters/local.json
deleted file mode 100644
index 63f485f..0000000
--- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.publish/defaults/exporters/local.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
- "jcr:primaryType" : "nt:unstructured",
-
- "kind" : "exporter",
-
- "isResource" : "true",
-
- "packageBuilder" : {
- "kind" : "packageBuilder",
- "type" : "service",
- "name" : "vlt"
- }
-}
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.publish/defaults/importers/local.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.publish/defaults/importers/local.json
deleted file mode 100644
index b857d9a..0000000
--- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.publish/defaults/importers/local.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
- "jcr:primaryType" : "nt:unstructured",
-
- "kind" : "importer",
-
- "isResource" : "true",
-
- "packageBuilder" : {
- "kind" : "packageBuilder",
- "type" : "service",
- "name" : "vlt"
- }
-}
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.publish/exporters/default.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.publish/exporters/default.json
deleted file mode 100644
index df081d1..0000000
--- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.publish/exporters/default.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "type" : "local"
-}
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.publish/exporters/reverse.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.publish/exporters/reverse.json
deleted file mode 100644
index 070b66f..0000000
--- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.publish/exporters/reverse.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "type" : "agent",
- "agent": {
- "type" : "service",
- "name" : "reverse"
- }
-}
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.publish/importers/default.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.publish/importers/default.json
deleted file mode 100644
index df081d1..0000000
--- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.publish/importers/default.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "type" : "local"
-}
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-distribution-sample] 23/42: Ignore Eclipse
.settings folder
Posted by ro...@apache.org.
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 d74cef5f4fae07e258113e4892b7b69c1de0d662
Author: Felix Meschberger <fm...@apache.org>
AuthorDate: Mon Nov 17 07:08:29 2014 +0000
Ignore Eclipse .settings folder
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/distribution/sample@1640072 13f79535-47bb-0310-9956-ffa450edef68
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-distribution-sample] 07/42: SLING-4008 -
added JcrEventReplicationTrigger
Posted by ro...@apache.org.
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 490010a7475f7cb11ace521cc6b17152256f30c9
Author: Tommaso Teofili <to...@apache.org>
AuthorDate: Mon Oct 6 16:03:20 2014 +0000
SLING-4008 - added JcrEventReplicationTrigger
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/replication/sample@1629691 13f79535-47bb-0310-9956-ffa450edef68
---
...impl.GenericReplicationComponentFactory-trigger-content-changed.json | 2 +-
...ng.replication.agent.impl.SimpleReplicationAgentFactory-reverse.json | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.GenericReplicationComponentFactory-trigger-content-changed.json b/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.GenericReplicationComponentFactory-trigger-content-changed.json
index 0b5cf00..f9ee413 100644
--- a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.GenericReplicationComponentFactory-trigger-content-changed.json
+++ b/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.GenericReplicationComponentFactory-trigger-content-changed.json
@@ -5,7 +5,7 @@
"componentType": "trigger",
"properties": [
- "type=resourceEvent",
+ "type=jcrEvent",
"path=/content/usergenerated"
]
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-reverse.json b/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-reverse.json
index 01cacfe..af9adfc 100644
--- a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-reverse.json
+++ b/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-reverse.json
@@ -22,7 +22,7 @@
"queueDistributionStrategy": "(name=error)",
"trigger0": [
- "type=resourceEvent",
+ "type=jcrEvent",
"path=/content/usergenerated"
]
}
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-distribution-sample] 35/42: SLING-4009:
making multiple queue delivery option explicit via osgi config
Posted by ro...@apache.org.
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 10bbfbe8675afc8f63cb9ee9cfa1660412c5ce52
Author: Marius Petria <mp...@apache.org>
AuthorDate: Thu Jan 8 08:45:15 2015 +0000
SLING-4009: making multiple queue delivery option explicit via osgi config
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/distribution/sample@1650232 13f79535-47bb-0310-9956-ffa450edef68
---
...ion.agent.impl.ForwardDistributionAgentFactory-publish-multiple.json | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/publish-multiple/org.apache.sling.distribution.agent.impl.ForwardDistributionAgentFactory-publish-multiple.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/publish-multiple/org.apache.sling.distribution.agent.impl.ForwardDistributionAgentFactory-publish-multiple.json
index 50125f3..5dcfcb6 100644
--- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/publish-multiple/org.apache.sling.distribution.agent.impl.ForwardDistributionAgentFactory-publish-multiple.json
+++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/publish-multiple/org.apache.sling.distribution.agent.impl.ForwardDistributionAgentFactory-publish-multiple.json
@@ -11,6 +11,8 @@
"transportSecretProvider.target" : "(name=publishAdmin)",
+ "useMultipleQueues" : true,
+
"packageImporter.endpoints" : [
"endpoint1=http://localhost:4503/libs/sling/distribution/services/importers/default",
"endpoint2=http://localhost:4503/libs/sling/distribution/services/importers/defaultbadaddress"
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-distribution-sample] 08/42: SLING-3993 -
added an abstract jcr event trigger to avoid loops with two
implementations(current and another persisting and replicating the event
itself)
Posted by ro...@apache.org.
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 2e500783e3a8ff980114e7ebab8675574483da34
Author: Tommaso Teofili <to...@apache.org>
AuthorDate: Tue Oct 14 13:52:02 2014 +0000
SLING-3993 - added an abstract jcr event trigger to avoid loops with two implementations(current and another persisting and replicating the event itself)
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/replication/sample@1631762 13f79535-47bb-0310-9956-ffa450edef68
---
...mpl.GenericReplicationComponentFactory-trigger-content-changed.json | 3 ++-
...g.replication.agent.impl.SimpleReplicationAgentFactory-reverse.json | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.GenericReplicationComponentFactory-trigger-content-changed.json b/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.GenericReplicationComponentFactory-trigger-content-changed.json
index f9ee413..155e371 100644
--- a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.GenericReplicationComponentFactory-trigger-content-changed.json
+++ b/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.GenericReplicationComponentFactory-trigger-content-changed.json
@@ -6,7 +6,8 @@
"properties": [
"type=jcrEvent",
- "path=/content/usergenerated"
+ "path=/content/usergenerated",
+ "servicename=replicationService"
]
}
\ No newline at end of file
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-reverse.json b/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-reverse.json
index af9adfc..56afbad 100644
--- a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-reverse.json
+++ b/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-reverse.json
@@ -23,6 +23,7 @@
"trigger0": [
"type=jcrEvent",
- "path=/content/usergenerated"
+ "path=/content/usergenerated",
+ "servicename=replicationService"
]
}
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-distribution-sample] 06/42: SLING-3994 -
simplified replication components' dependency management,
minor javadoc adjustments
Posted by ro...@apache.org.
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 3517e55a8819ef698a07f92bfc4cec064117370d
Author: Tommaso Teofili <to...@apache.org>
AuthorDate: Fri Oct 3 09:33:20 2014 +0000
SLING-3994 - simplified replication components' dependency management, minor javadoc adjustments
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/replication/sample@1629162 13f79535-47bb-0310-9956-ffa450edef68
---
...oordinatingReplicationAgentFactory-pubsync.json | 22 ++++++------------
...tionComponentFactory-trigger-remote-event.json} | 9 ++++----
...leReplicationAgentFactory-publish-reverse.json} | 26 +++++++++-------------
...mpl.SimpleReplicationAgentFactory-publish.json} | 14 ++++--------
...nComponentFactory-trigger-content-changed.json} | 2 +-
...SimpleReplicationAgentFactory-cache-flush.json} | 12 +++-------
...mpl.SimpleReplicationAgentFactory-reverse.json} | 12 +++-------
...ertiesResourceProviderFactory-simpleAgents.json | 2 +-
8 files changed, 35 insertions(+), 64 deletions(-)
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.CoordinatingReplicationAgentFactory-pubsync.json b/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.CoordinatingReplicationAgentFactory-pubsync.json
index f45df35..68758f6 100644
--- a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.CoordinatingReplicationAgentFactory-pubsync.json
+++ b/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.CoordinatingReplicationAgentFactory-pubsync.json
@@ -1,25 +1,21 @@
{
"jcr:primaryType": "sling:OsgiConfig",
"name": "pubsync",
- "type": "coordinating",
- "enabled" : false,
"packageExporter": [
"authenticationProvider/type=service",
- "authenticationProvider/name=publishAdmin",
"packageBuilder/type=vlt",
"packageBuilder/servicename=replicationService",
- "endpoints[0]=http://localhost:4503/libs/sling/replication/services/exporters/reverse",
- "endpoints[1]=http://localhost:4504/libs/sling/replication/services/exporters/reverse",
- "endpoints[2]=http://localhost:4505/libs/sling/replication/services/exporters/reverse",
+ "endpoints[0]=http://localhost:4503/libs/sling/replication/services/exporters/reverse-pubsync",
+ "endpoints[1]=http://localhost:4504/libs/sling/replication/services/exporters/reverse-pubsync",
+ "endpoints[2]=http://localhost:4505/libs/sling/replication/services/exporters/reverse-pubsync",
"endpoints.strategy=All"
],
"packageImporter": [
"authenticationProvider/type=service",
- "authenticationProvider/name=publishAdmin",
"packageBuilder/type=vlt",
"packageBuilder/servicename=replicationService",
@@ -30,13 +26,9 @@
"endpoints.strategy=All"
],
- "queueProvider": [
- "type=service",
- "name=sjh"
- ],
+ "queueProvider.target" : "(name=sjh)",
+
+ "queueDistributionStrategy.target": "(name=error)",
- "queueDistributionStrategy": [
- "type=service",
- "name=error"
- ]
+ "transportAuthenticationProvider.target" : "(name=publishAdmin)"
}
\ No newline at end of file
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.DefaultReplicationComponentFactory-trigger-remote-event.json b/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.GenericReplicationComponentFactory-trigger-remote-event.json
similarity index 59%
rename from src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.DefaultReplicationComponentFactory-trigger-remote-event.json
rename to src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.GenericReplicationComponentFactory-trigger-remote-event.json
index 7504064..38030a4 100644
--- a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.DefaultReplicationComponentFactory-trigger-remote-event.json
+++ b/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.GenericReplicationComponentFactory-trigger-remote-event.json
@@ -2,14 +2,15 @@
"jcr:primaryType": "sling:OsgiConfig",
"name": "remote-event",
- "kind": "trigger",
+ "componentType": "trigger",
"properties": [
"type=remoteEvent",
"endpoint=http://localhost:4503/libs/sling/replication/services/triggers/content-changed.event",
- "authenticationProvider/type=service",
- "authenticationProvider/name=publishAdmin"
- ]
+ "authenticationProvider/type=service"
+ ],
+
+ "transportAuthenticationProvider.target" : "(name=publishAdmin)"
}
\ No newline at end of file
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.CompactSimpleReplicationAgentFactory-publish-reverse.json b/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-publish-reverse.json
similarity index 70%
rename from src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.CompactSimpleReplicationAgentFactory-publish-reverse.json
rename to src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-publish-reverse.json
index 7fe693f..8cb8a95 100644
--- a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.CompactSimpleReplicationAgentFactory-publish-reverse.json
+++ b/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-publish-reverse.json
@@ -1,14 +1,14 @@
{
"jcr:primaryType": "sling:OsgiConfig",
"name": "publish-reverse",
- "type": "simple",
+
+ "enabled" : true,
"packageExporter": [
"type=remote",
"endpoints[0]=http://localhost:4503/libs/sling/replication/services/exporters/reverse",
"authenticationProvider/type=service",
- "authenticationProvider/name=publishAdmin",
"packageBuilder/type=vlt",
"packageBuilder/servicename=replicationService"
@@ -20,16 +20,6 @@
"packageBuilder/servicename=replicationService"
],
- "queueProvider": [
- "type=service",
- "name=sjh"
- ],
-
- "queueDistributionStrategy": [
- "type=service",
- "name=error"
- ],
-
"trigger0": [
"type=scheduledEvent",
"action=poll",
@@ -40,8 +30,14 @@
"type=remoteEvent",
"endpoint=http://localhost:4503/libs/sling/replication/services/triggers/content-changed.event",
- "authenticationProvider/type=service",
- "authenticationProvider/name=publishAdmin"
- ]
+ "authenticationProvider/type=service"
+ ],
+
+
+ "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/replication/install.author/org.apache.sling.replication.agent.impl.CompactSimpleReplicationAgentFactory-publish.json b/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-publish.json
similarity index 68%
rename from src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.CompactSimpleReplicationAgentFactory-publish.json
rename to src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-publish.json
index e100788..c08c6f0 100644
--- a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.CompactSimpleReplicationAgentFactory-publish.json
+++ b/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-publish.json
@@ -1,7 +1,6 @@
{
"jcr:primaryType": "sling:OsgiConfig",
"name": "publish",
- "type": "simple",
"packageExporter": [
"type=local",
@@ -14,19 +13,14 @@
"endpoints[0]=http://localhost:4503/libs/sling/replication/services/importers/default",
"authenticationProvider/type=service",
- "authenticationProvider/name=publishAdmin",
"packageBuilder/type=vlt",
"packageBuilder/servicename=replicationService"
],
- "queueProvider": [
- "type=service",
- "name=sjh"
- ],
+ "queueProvider.target" : "(name=sjh)",
+
+ "queueDistributionStrategy.target": "(name=error)",
- "queueDistributionStrategy": [
- "type=service",
- "name=error"
- ]
+ "transportAuthenticationProvider.target" : "(name=publishAdmin)"
}
\ No newline at end of file
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.DefaultReplicationComponentFactory-trigger-content-changed.json b/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.GenericReplicationComponentFactory-trigger-content-changed.json
similarity index 83%
rename from src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.DefaultReplicationComponentFactory-trigger-content-changed.json
rename to src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.GenericReplicationComponentFactory-trigger-content-changed.json
index 4e32f7d..0b5cf00 100644
--- a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.DefaultReplicationComponentFactory-trigger-content-changed.json
+++ b/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.GenericReplicationComponentFactory-trigger-content-changed.json
@@ -2,7 +2,7 @@
"jcr:primaryType": "sling:OsgiConfig",
"name": "content-changed",
- "kind": "trigger",
+ "componentType": "trigger",
"properties": [
"type=resourceEvent",
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.CompactSimpleReplicationAgentFactory-cache-flush.json b/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-cache-flush.json
similarity index 56%
rename from src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.CompactSimpleReplicationAgentFactory-cache-flush.json
rename to src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-cache-flush.json
index 9284f55..ee1b01d 100644
--- a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.CompactSimpleReplicationAgentFactory-cache-flush.json
+++ b/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-cache-flush.json
@@ -1,7 +1,6 @@
{
"jcr:primaryType": "sling:OsgiConfig",
"name": "cache-flush",
- "type": "simple",
"packageExporter": [
"type=service",
@@ -13,13 +12,8 @@
"name=cache-flush"
],
- "queueProvider": [
- "type=service",
- "name=sjh"
- ],
- "queueDistributionStrategy": [
- "type=service",
- "name=error"
- ]
+ "queueProvider.target" : "(name=sjh)",
+
+ "queueDistributionStrategy": "(name=error)"
}
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.CompactSimpleReplicationAgentFactory-reverse.json b/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-reverse.json
similarity index 72%
rename from src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.CompactSimpleReplicationAgentFactory-reverse.json
rename to src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-reverse.json
index 72ad2fe..01cacfe 100644
--- a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.CompactSimpleReplicationAgentFactory-reverse.json
+++ b/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-reverse.json
@@ -1,7 +1,6 @@
{
"jcr:primaryType": "sling:OsgiConfig",
"name": "reverse",
- "type": "simple",
"isPassive": true,
@@ -17,15 +16,10 @@
"packageBuilder/servicename=replicationService"
],
- "queueProvider": [
- "type=service",
- "name=sjh"
- ],
- "queueDistributionStrategy": [
- "type=service",
- "name=error"
- ],
+ "queueProvider.target" : "(name=sjh)",
+
+ "queueDistributionStrategy": "(name=error)",
"trigger0": [
"type=resourceEvent",
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/install/resources/settings/org.apache.sling.replication.resources.impl.OsgiPropertiesResourceProviderFactory-simpleAgents.json b/src/main/resources/SLING-CONTENT/libs/sling/replication/install/resources/settings/org.apache.sling.replication.resources.impl.OsgiPropertiesResourceProviderFactory-simpleAgents.json
index b52ff51..a931c70 100644
--- a/src/main/resources/SLING-CONTENT/libs/sling/replication/install/resources/settings/org.apache.sling.replication.resources.impl.OsgiPropertiesResourceProviderFactory-simpleAgents.json
+++ b/src/main/resources/SLING-CONTENT/libs/sling/replication/install/resources/settings/org.apache.sling.replication.resources.impl.OsgiPropertiesResourceProviderFactory-simpleAgents.json
@@ -2,7 +2,7 @@
"jcr:primaryType": "sling:OsgiConfig",
"name": "simpleAgents",
"provider.roots": [ "/libs/sling/replication/settings/agents" ],
- "serviceType": "org.apache.sling.replication.agent.impl.CompactSimpleReplicationAgentFactory",
+ "serviceType": "org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory",
"providerType": "osgiConfig",
"groupPrefix": "agents",
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-distribution-sample] 21/42: SLING-4149:
adding component factories based on resources
Posted by ro...@apache.org.
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 4124bc39ad70374f5326233141949bf5edc2fbb4
Author: Marius Petria <mp...@apache.org>
AuthorDate: Mon Nov 10 16:10:46 2014 +0000
SLING-4149: adding component factories based on resources
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/distribution/sample@1637904 13f79535-47bb-0310-9956-ffa450edef68
---
...ntBasedDistributionComponentFactory-agents.json | 8 +++++
.../distribution/jcrsettings/agents/jpublish.json | 38 ++++++++++++++++++++++
2 files changed, 46 insertions(+)
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/org.apache.sling.distribution.component.impl.ContentBasedDistributionComponentFactory-agents.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/org.apache.sling.distribution.component.impl.ContentBasedDistributionComponentFactory-agents.json
new file mode 100644
index 0000000..012616c
--- /dev/null
+++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/org.apache.sling.distribution.component.impl.ContentBasedDistributionComponentFactory-agents.json
@@ -0,0 +1,8 @@
+{
+ "jcr:primaryType": "sling:OsgiConfig",
+ "name": "agents",
+
+ "kind": "agent",
+ "path": "/libs/sling/distribution/jcrsettings/agents",
+ "servicename" : "distributionService"
+}
\ 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/jcrsettings/agents/jpublish.json
new file mode 100644
index 0000000..17c1dd9
--- /dev/null
+++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/jcrsettings/agents/jpublish.json
@@ -0,0 +1,38 @@
+{
+ "name": "jpublish",
+ "jcr:primaryType" : "nt:unstructured",
+
+ "serviceName" : "distributionService",
+
+ "requestAuthorizationStrategy" : {
+ "type" : "privilege",
+ "jcrPrivilege" : "jcr:read"
+ },
+
+ "packageExporter": {
+ "type": "local",
+ "packageBuilder" : { "type" : "vlt" }
+
+ },
+
+ "packageImporter": {
+ "type" : "remote",
+
+ "transportAuthenticationProvider" : {
+ "type" : "user",
+ "username" : "admin",
+ "password" : "admin"
+ },
+
+ "endpoints" : [
+ "http://localhost:4503/libs/sling/distribution/services/importers/default"
+ ],
+
+ "packageBuilder" : { "type" : "vlt" }
+
+ },
+
+ "queueDistributionStrategy" : { "type" : "single" },
+
+ "queueProvider" : { "type" : "job", "name" : "jpublish" }
+}
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-distribution-sample] 25/42: SLING-4514:
Generating OSGI configs from content and starting services using osgi
services
Posted by ro...@apache.org.
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 <mp...@apache.org>
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
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-distribution-sample] 32/42: SLING-4153:
adjusting osgi configs to dedicated factories
Posted by ro...@apache.org.
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 <mp...@apache.org>
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
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-distribution-sample] 40/42: Added eclipse
project files to svn:ignore
Posted by ro...@apache.org.
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 a1a4d2a7af10a9ca6287c16417ff1b3e12f34384
Author: tomekr <to...@unknown>
AuthorDate: Thu Feb 12 18:59:21 2015 +0000
Added eclipse project files to svn:ignore
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/distribution/sample@1659362 13f79535-47bb-0310-9956-ffa450edef68
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-distribution-sample] 04/42: Update to Sling
Parent POM 22 with baselining enabled
Posted by ro...@apache.org.
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 5bd1d0c717defb2c2affae03d948dc1434b610de
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Wed Oct 1 06:52:29 2014 +0000
Update to Sling Parent POM 22 with baselining enabled
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/replication/sample@1628620 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index e7c3dff..51033f9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>20</version>
+ <version>22</version>
</parent>
<!-- ======================================================================= -->
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-distribution-sample] 22/42: SLING-4149:
renaming factory to resource based & adding defaults
Posted by ro...@apache.org.
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 5a26d725b1a312374cdd8876f61c1c3018012c57
Author: Marius Petria <mp...@apache.org>
AuthorDate: Tue Nov 11 14:16:02 2014 +0000
SLING-4149: renaming factory to resource based & adding defaults
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/distribution/sample@1638116 13f79535-47bb-0310-9956-ffa450edef68
---
...eBasedDistributionComponentFactory-agents.json} | 2 +-
.../distribution/jcrsettings/agents/jpublish.json | 23 +++-------------------
.../jcrsettings/defaults/agents/global.json | 22 +++++++++++++++++++++
3 files changed, 26 insertions(+), 21 deletions(-)
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/org.apache.sling.distribution.component.impl.ContentBasedDistributionComponentFactory-agents.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/org.apache.sling.distribution.component.impl.ResourceBasedDistributionComponentFactory-agents.json
similarity index 63%
rename from src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/org.apache.sling.distribution.component.impl.ContentBasedDistributionComponentFactory-agents.json
rename to src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/org.apache.sling.distribution.component.impl.ResourceBasedDistributionComponentFactory-agents.json
index 012616c..d502ae4 100644
--- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/org.apache.sling.distribution.component.impl.ContentBasedDistributionComponentFactory-agents.json
+++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/org.apache.sling.distribution.component.impl.ResourceBasedDistributionComponentFactory-agents.json
@@ -4,5 +4,5 @@
"kind": "agent",
"path": "/libs/sling/distribution/jcrsettings/agents",
- "servicename" : "distributionService"
+ "defaults.path" : "/libs/sling/distribution/jcrsettings/defaults/agents/global"
}
\ 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/jcrsettings/agents/jpublish.json
index 17c1dd9..3b9ffc2 100644
--- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/jcrsettings/agents/jpublish.json
+++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/jcrsettings/agents/jpublish.json
@@ -1,18 +1,8 @@
{
- "name": "jpublish",
- "jcr:primaryType" : "nt:unstructured",
-
"serviceName" : "distributionService",
- "requestAuthorizationStrategy" : {
- "type" : "privilege",
- "jcrPrivilege" : "jcr:read"
- },
-
"packageExporter": {
- "type": "local",
- "packageBuilder" : { "type" : "vlt" }
-
+ "type": "local"
},
"packageImporter": {
@@ -26,13 +16,6 @@
"endpoints" : [
"http://localhost:4503/libs/sling/distribution/services/importers/default"
- ],
-
- "packageBuilder" : { "type" : "vlt" }
-
- },
-
- "queueDistributionStrategy" : { "type" : "single" },
-
- "queueProvider" : { "type" : "job", "name" : "jpublish" }
+ ]
+ }
}
\ 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
new file mode 100644
index 0000000..fbe7f2b
--- /dev/null
+++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/jcrsettings/defaults/agents/global.json
@@ -0,0 +1,22 @@
+{
+ "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
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-distribution-sample] 36/42: SLING-4292:
exposing queue and queue items as resources
Posted by ro...@apache.org.
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 b8aa8c2c0a9bd1c6bd25b4c09085d817b1182453
Author: Marius Petria <mp...@apache.org>
AuthorDate: Fri Jan 16 08:03:33 2015 +0000
SLING-4292: exposing queue and queue items as resources
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/distribution/sample@1652356 13f79535-47bb-0310-9956-ffa450edef68
---
...rwardDistributionAgentFactory-queue-multiple.json | 20 ++++++++++++++++++++
...ibutionServiceResourceProviderFactory-agents.json | 8 +-------
...tionServiceResourceProviderFactory-exporters.json | 6 +-----
...tionServiceResourceProviderFactory-importers.json | 7 +------
...utionServiceResourceProviderFactory-triggers.json | 6 +-----
...nConfigurationResourceProviderFactory-agents.json | 6 +-----
6 files changed, 25 insertions(+), 28 deletions(-)
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/queue-multiple/org.apache.sling.distribution.agent.impl.ForwardDistributionAgentFactory-queue-multiple.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/queue-multiple/org.apache.sling.distribution.agent.impl.ForwardDistributionAgentFactory-queue-multiple.json
new file mode 100644
index 0000000..e27f627
--- /dev/null
+++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/queue-multiple/org.apache.sling.distribution.agent.impl.ForwardDistributionAgentFactory-queue-multiple.json
@@ -0,0 +1,20 @@
+{
+ "jcr:primaryType": "sling:OsgiConfig",
+
+ "name": "queue-multiple",
+
+ "serviceName" : "distributionService",
+
+ "requestAuthorizationStrategy.target" : "(name=privilegeRead)",
+
+ "packageBuilder.target": "(name=vlt)",
+
+ "transportSecretProvider.target" : "(name=publishAdmin)",
+
+ "useMultipleQueues" : true,
+
+ "packageImporter.endpoints" : [
+ "endpoint1=http://localhost:1/libs/sling/distribution/services/importers/bad1",
+ "endpoint2=http://localhost:2/libs/sling/distribution/services/importers/bad2"
+ ]
+}
\ 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.DistributionServiceResourceProviderFactory-agents.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/resources/services/org.apache.sling.distribution.resources.impl.DistributionServiceResourceProviderFactory-agents.json
index ce7c5dd..d565ec9 100644
--- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/resources/services/org.apache.sling.distribution.resources.impl.DistributionServiceResourceProviderFactory-agents.json
+++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/resources/services/org.apache.sling.distribution.resources.impl.DistributionServiceResourceProviderFactory-agents.json
@@ -1,11 +1,5 @@
{
"jcr:primaryType": "sling:OsgiConfig",
"provider.roots": [ "/libs/sling/distribution/services/agents" ],
- "kind" : "agent",
- "resourceProperties": [
- "sling:resourceType=sling/distribution/service/agent",
- "sling:resourceSuperType=sling/distribution/service",
-
- "queue/sling:resourceType=sling/distribution/service/agent/queue"
- ]
+ "kind" : "agent"
}
\ 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.DistributionServiceResourceProviderFactory-exporters.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/resources/services/org.apache.sling.distribution.resources.impl.DistributionServiceResourceProviderFactory-exporters.json
index 415889f..22b6d62 100644
--- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/resources/services/org.apache.sling.distribution.resources.impl.DistributionServiceResourceProviderFactory-exporters.json
+++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/resources/services/org.apache.sling.distribution.resources.impl.DistributionServiceResourceProviderFactory-exporters.json
@@ -1,9 +1,5 @@
{
"jcr:primaryType": "sling:OsgiConfig",
"provider.roots": [ "/libs/sling/distribution/services/exporters" ],
- "kind" : "exporter",
- "resourceProperties": [
- "sling:resourceType=sling/distribution/service/exporter",
- "sling:resourceSuperType=sling/distribution/service"
- ]
+ "kind" : "exporter"
}
\ 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.DistributionServiceResourceProviderFactory-importers.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/resources/services/org.apache.sling.distribution.resources.impl.DistributionServiceResourceProviderFactory-importers.json
index bcec753..9a12a62 100644
--- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/resources/services/org.apache.sling.distribution.resources.impl.DistributionServiceResourceProviderFactory-importers.json
+++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/resources/services/org.apache.sling.distribution.resources.impl.DistributionServiceResourceProviderFactory-importers.json
@@ -1,10 +1,5 @@
{
"jcr:primaryType": "sling:OsgiConfig",
- "name": "distributionImporters",
"provider.roots": [ "/libs/sling/distribution/services/importers" ],
- "kind" : "importer",
- "resourceProperties": [
- "sling:resourceType=sling/distribution/service/importer",
- "sling:resourceSuperType=sling/distribution/service"
- ]
+ "kind" : "importer"
}
\ 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.DistributionServiceResourceProviderFactory-triggers.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/resources/services/org.apache.sling.distribution.resources.impl.DistributionServiceResourceProviderFactory-triggers.json
index 2a4816c..d42b9d5 100644
--- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/resources/services/org.apache.sling.distribution.resources.impl.DistributionServiceResourceProviderFactory-triggers.json
+++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/resources/services/org.apache.sling.distribution.resources.impl.DistributionServiceResourceProviderFactory-triggers.json
@@ -1,9 +1,5 @@
{
"jcr:primaryType": "sling:OsgiConfig",
"provider.roots": [ "/libs/sling/distribution/services/triggers" ],
- "kind" : "trigger",
- "resourceProperties": [
- "sling:resourceType=sling/distribution/service/trigger",
- "sling:resourceSuperType=sling/distribution/service"
- ]
+ "kind" : "trigger"
}
\ 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
index 721f964..ccf16c5 100644
--- 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
@@ -1,9 +1,5 @@
{
"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"
- ]
+ "kind" : "agent"
}
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-distribution-sample] 38/42: SLING-4341:
removing package also when a package is deleted from queue
Posted by ro...@apache.org.
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 662df30647fb8e592422446bf01be01b7a2eb959
Author: Marius Petria <mp...@apache.org>
AuthorDate: Thu Jan 22 15:32:44 2015 +0000
SLING-4341: removing package also when a package is deleted from queue
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/distribution/sample@1653915 13f79535-47bb-0310-9956-ffa450edef68
---
...g.impl.exporter.AgentDistributionPackageExporterFactory-reverse.json | 2 --
1 file changed, 2 deletions(-)
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 462ce8f..039b57e 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,5 @@
"jcr:primaryType": "sling:OsgiConfig",
"name": "reverse",
- "packageBuilder.target" : "(name=vlt)",
-
"agent.target": "(name=reverse)"
}
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-distribution-sample] 03/42: no Jira -
ignored IntelliJ's config files
Posted by ro...@apache.org.
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 7a2e3b7bc177f4658db38ea5633ef588659e39d5
Author: Tommaso Teofili <to...@apache.org>
AuthorDate: Mon Sep 29 14:15:48 2014 +0000
no Jira - ignored IntelliJ's config files
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/replication/sample@1628187 13f79535-47bb-0310-9956-ffa450edef68
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-distribution-sample] 28/42: SLING-4153 -
fixed transport API to just expose the secret
Posted by ro...@apache.org.
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 8fa1d606db85265666b4e8023ebaed23e115aefb
Author: Tommaso Teofili <to...@apache.org>
AuthorDate: Fri Dec 5 09:19:24 2014 +0000
SLING-4153 - fixed transport API to just expose the secret
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/distribution/sample@1643201 13f79535-47bb-0310-9956-ffa450edef68
---
...CredentialsDistributionTransportSecretProvider-publishAdmin.json | 6 ++++++
...CredentialsDistributionTransportSecretProvider-publishAdmin.json | 6 ++++++
2 files changed, 12 insertions(+)
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/org.apache.sling.distribution.transport.impl.UserCredentialsDistributionTransportSecretProvider-publishAdmin.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/org.apache.sling.distribution.transport.impl.UserCredentialsDistributionTransportSecretProvider-publishAdmin.json
new file mode 100644
index 0000000..10fbe4d
--- /dev/null
+++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/org.apache.sling.distribution.transport.impl.UserCredentialsDistributionTransportSecretProvider-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/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
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.impl.UserCredentialsDistributionTransportSecretProvider-publishAdmin.json
@@ -0,0 +1,6 @@
+{
+ "jcr:primaryType": "sling:OsgiConfig",
+ "name": "publishAdmin",
+ "username": "admin",
+ "password": "admin"
+}
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-distribution-sample] 24/42: SLING-4153 -
improve javadoc, added distribution request state, minor fixes
Posted by ro...@apache.org.
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 4bb3044e7e0d43a4af2cf8bcc9ba37a42482ded2
Author: Tommaso Teofili <to...@apache.org>
AuthorDate: Fri Nov 21 14:51:51 2014 +0000
SLING-4153 - improve javadoc, added distribution request state, minor fixes
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/distribution/sample@1640924 13f79535-47bb-0310-9956-ffa450edef68
---
...ution.agent.impl.SimpleDistributionAgentFactory-publish-reverse.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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
index 84b41b9..e6a3929 100644
--- 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
@@ -26,7 +26,7 @@
"trigger": [
"scheduledTrigger/type=scheduledEvent",
- "scheduledTrigger/action=poll",
+ "scheduledTrigger/action=pull",
"scheduledTrigger/seconds=30",
"remoteTrigger/type=remoteEvent",
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-distribution-sample] 20/42: SLING-4144 -
split distribution api and core bundles
Posted by ro...@apache.org.
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 b8059df46128519bfa563bce468eff856471a072
Author: Tommaso Teofili <to...@apache.org>
AuthorDate: Fri Nov 7 15:52:52 2014 +0000
SLING-4144 - split distribution api and core bundles
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/distribution/sample@1637392 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 110 +++-------------------------------------------------------------
1 file changed, 4 insertions(+), 106 deletions(-)
diff --git a/pom.xml b/pom.xml
index 656a556..a250a62 100644
--- a/pom.xml
+++ b/pom.xml
@@ -84,127 +84,25 @@
<!-- D E P E N D E N C I E S -->
<!-- ======================================================================= -->
<dependencies>
- <!-- TESTING -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <!-- SLING -->
+
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.distribution.core</artifactId>
<version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.api</artifactId>
- <version>2.3.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.commons.osgi</artifactId>
- <version>2.2.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.commons.scheduler</artifactId>
- <version>2.4.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.jcr.api</artifactId>
- <version>2.2.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.event</artifactId>
- <version>3.3.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.hc.core</artifactId>
- <version>1.0.6</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.settings</artifactId>
- <version>1.3.0</version>
<scope>provided</scope>
</dependency>
- <!-- LOGGING -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.6.2</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>1.6.2</version>
- <scope>runtime</scope>
- </dependency>
- <!-- SPECs -->
- <dependency>
- <groupId>javax.jcr</groupId>
- <artifactId>jcr</artifactId>
- <version>2.0</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </dependency>
+
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
- </dependency>
- <!-- FILEVAULT -->
- <dependency>
- <groupId>org.apache.jackrabbit.vault</groupId>
- <artifactId>org.apache.jackrabbit.vault</artifactId>
- <version>3.0.0</version>
- </dependency>
- <!-- HTTP -->
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>fluent-hc</artifactId>
- <version>4.3.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpasyncclient</artifactId>
- <version>4.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpcore-osgi</artifactId>
- <version>4.3.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient-osgi</artifactId>
- <version>4.3.4</version>
- </dependency>
- <!-- JACKRABBIT -->
- <dependency>
- <groupId>org.apache.jackrabbit</groupId>
- <artifactId>jackrabbit-jcr-commons</artifactId>
- <version>2.6.2</version>
- <scope>provided</scope>
- </dependency>
- <!-- COMMONS -->
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>2.4</version>
<scope>provided</scope>
</dependency>
+
</dependencies>
<reporting>
<plugins>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-distribution-sample] 01/42: SLING-3978 -
added 'sample' replication bundle
Posted by ro...@apache.org.
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 bb3b2c9bea783203dacb96e05cd1fb8efa42eeac
Author: Tommaso Teofili <to...@apache.org>
AuthorDate: Mon Sep 29 13:31:47 2014 +0000
SLING-3978 - added 'sample' replication bundle
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/replication/sample@1628179 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 221 +++++++++++++++++++++
...pleReplicationAgentFactory-publish-reverse.json | 47 +++++
...mpactSimpleReplicationAgentFactory-publish.json | 32 +++
...ationComponentFactory-trigger-remote-event.json | 15 ++
...AuthenticationProviderFactory-publishAdmin.json | 6 +
...tSimpleReplicationAgentFactory-cache-flush.json | 25 +++
...mpactSimpleReplicationAgentFactory-reverse.json | 34 ++++
...onComponentFactory-trigger-content-changed.json | 12 ++
...tReplicationPackageExporterFactory-reverse.json | 7 +
...lReplicationPackageExporterFactory-default.json | 6 +
...moteReplicationPackageImporter-cache-flush.json | 13 ++
...lReplicationPackageImporterFactory-default.json | 5 +
...eVaultReplicationPackageBuilderFactory-vlt.json | 5 +
....ServiceUserMapperImpl.amended-replication.json | 5 +
...giPropertiesResourceProviderFactory-agents.json | 13 ++
...ropertiesResourceProviderFactory-exporters.json | 12 ++
...ropertiesResourceProviderFactory-importers.json | 12 ++
...PropertiesResourceProviderFactory-triggers.json | 12 ++
...ertiesResourceProviderFactory-simpleAgents.json | 19 ++
.../replication/service/agent/replicate.html.esp | 18 ++
.../libs/sling/replication/service/html.esp | 21 ++
.../libs/sling/replication/service/list/html.esp | 35 ++++
.../libs/sling/replication/setting/html.esp | 33 +++
.../libs/sling/replication/setting/list/html.esp | 26 +++
24 files changed, 634 insertions(+)
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..e7c3dff
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,221 @@
+<?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <!-- ======================================================================= -->
+ <!-- P A R E N T P R O J E C T -->
+ <!-- ======================================================================= -->
+ <parent>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>sling</artifactId>
+ <version>20</version>
+ </parent>
+
+ <!-- ======================================================================= -->
+ <!-- P R O J E C T -->
+ <!-- ======================================================================= -->
+ <artifactId>org.apache.sling.replication.sample</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <packaging>bundle</packaging>
+
+ <name>Apache Sling Replication Sample</name>
+ <description>
+ The Apache Sling Replication sample bundle provides a set of sample configurations and custom component implementations.
+ </description>
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/replication/sample</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/replication/sample</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/sample</url>
+ </scm>
+
+ <!-- ======================================================================= -->
+ <!-- B U I L D -->
+ <!-- ======================================================================= -->
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-scr-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>maven-sling-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Bundle-SymbolicName>org.apache.sling.replication.sample</Bundle-SymbolicName>
+ <Sling-Initial-Content>
+ SLING-CONTENT/libs/sling/replication;path:=/libs/sling/replication;overwrite:=true
+ </Sling-Initial-Content>
+ <Export-Package>
+ </Export-Package>
+ <Embed-Dependency>httpasyncclient</Embed-Dependency>
+ </instructions>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
+ <!-- ======================================================================= -->
+ <!-- D E P E N D E N C I E S -->
+ <!-- ======================================================================= -->
+ <dependencies>
+ <!-- TESTING -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <!-- SLING -->
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.replication.core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.api</artifactId>
+ <version>2.3.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.commons.osgi</artifactId>
+ <version>2.2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.commons.scheduler</artifactId>
+ <version>2.4.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.jcr.api</artifactId>
+ <version>2.2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.event</artifactId>
+ <version>3.3.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.hc.core</artifactId>
+ <version>1.0.6</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.settings</artifactId>
+ <version>1.3.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <!-- LOGGING -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.6.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>1.6.2</version>
+ <scope>runtime</scope>
+ </dependency>
+ <!-- SPECs -->
+ <dependency>
+ <groupId>javax.jcr</groupId>
+ <artifactId>jcr</artifactId>
+ <version>2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ </dependency>
+ <!-- FILEVAULT -->
+ <dependency>
+ <groupId>org.apache.jackrabbit.vault</groupId>
+ <artifactId>org.apache.jackrabbit.vault</artifactId>
+ <version>3.0.0</version>
+ </dependency>
+ <!-- HTTP -->
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>fluent-hc</artifactId>
+ <version>4.3.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpasyncclient</artifactId>
+ <version>4.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore-osgi</artifactId>
+ <version>4.3.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient-osgi</artifactId>
+ <version>4.3.4</version>
+ </dependency>
+ <!-- JACKRABBIT -->
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-jcr-commons</artifactId>
+ <version>2.6.2</version>
+ <scope>provided</scope>
+ </dependency>
+ <!-- COMMONS -->
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>2.4</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>findbugs-maven-plugin</artifactId>
+ <version>2.5.3</version>
+ </plugin>
+ </plugins>
+ </reporting>
+</project>
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.CompactSimpleReplicationAgentFactory-publish-reverse.json b/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.CompactSimpleReplicationAgentFactory-publish-reverse.json
new file mode 100644
index 0000000..7fe693f
--- /dev/null
+++ b/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.CompactSimpleReplicationAgentFactory-publish-reverse.json
@@ -0,0 +1,47 @@
+{
+ "jcr:primaryType": "sling:OsgiConfig",
+ "name": "publish-reverse",
+ "type": "simple",
+
+ "packageExporter": [
+ "type=remote",
+ "endpoints[0]=http://localhost:4503/libs/sling/replication/services/exporters/reverse",
+
+ "authenticationProvider/type=service",
+ "authenticationProvider/name=publishAdmin",
+
+ "packageBuilder/type=vlt",
+ "packageBuilder/servicename=replicationService"
+ ],
+
+ "packageImporter": [
+ "type=local",
+ "packageBuilder/type=vlt",
+ "packageBuilder/servicename=replicationService"
+ ],
+
+ "queueProvider": [
+ "type=service",
+ "name=sjh"
+ ],
+
+ "queueDistributionStrategy": [
+ "type=service",
+ "name=error"
+ ],
+
+ "trigger0": [
+ "type=scheduledEvent",
+ "action=poll",
+ "seconds=30"
+ ],
+
+ "trigger1": [
+ "type=remoteEvent",
+ "endpoint=http://localhost:4503/libs/sling/replication/services/triggers/content-changed.event",
+
+ "authenticationProvider/type=service",
+ "authenticationProvider/name=publishAdmin"
+ ]
+
+}
\ No newline at end of file
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.CompactSimpleReplicationAgentFactory-publish.json b/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.CompactSimpleReplicationAgentFactory-publish.json
new file mode 100644
index 0000000..e100788
--- /dev/null
+++ b/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.CompactSimpleReplicationAgentFactory-publish.json
@@ -0,0 +1,32 @@
+{
+ "jcr:primaryType": "sling:OsgiConfig",
+ "name": "publish",
+ "type": "simple",
+
+ "packageExporter": [
+ "type=local",
+ "packageBuilder/type=vlt",
+ "packageBuilder/servicename=replicationService"
+ ],
+
+ "packageImporter": [
+ "type=remote",
+ "endpoints[0]=http://localhost:4503/libs/sling/replication/services/importers/default",
+
+ "authenticationProvider/type=service",
+ "authenticationProvider/name=publishAdmin",
+
+ "packageBuilder/type=vlt",
+ "packageBuilder/servicename=replicationService"
+ ],
+
+ "queueProvider": [
+ "type=service",
+ "name=sjh"
+ ],
+
+ "queueDistributionStrategy": [
+ "type=service",
+ "name=error"
+ ]
+}
\ No newline at end of file
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.DefaultReplicationComponentFactory-trigger-remote-event.json b/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.DefaultReplicationComponentFactory-trigger-remote-event.json
new file mode 100644
index 0000000..7504064
--- /dev/null
+++ b/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.DefaultReplicationComponentFactory-trigger-remote-event.json
@@ -0,0 +1,15 @@
+{
+ "jcr:primaryType": "sling:OsgiConfig",
+ "name": "remote-event",
+
+ "kind": "trigger",
+
+ "properties": [
+ "type=remoteEvent",
+ "endpoint=http://localhost:4503/libs/sling/replication/services/triggers/content-changed.event",
+
+ "authenticationProvider/type=service",
+ "authenticationProvider/name=publishAdmin"
+ ]
+
+}
\ No newline at end of file
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.transport.authentication.impl.UserCredentialsTransportAuthenticationProviderFactory-publishAdmin.json b/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.transport.authentication.impl.UserCredentialsTransportAuthenticationProviderFactory-publishAdmin.json
new file mode 100644
index 0000000..10fbe4d
--- /dev/null
+++ b/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.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/replication/install.publish/org.apache.sling.replication.agent.impl.CompactSimpleReplicationAgentFactory-cache-flush.json b/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.CompactSimpleReplicationAgentFactory-cache-flush.json
new file mode 100644
index 0000000..9284f55
--- /dev/null
+++ b/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.CompactSimpleReplicationAgentFactory-cache-flush.json
@@ -0,0 +1,25 @@
+{
+ "jcr:primaryType": "sling:OsgiConfig",
+ "name": "cache-flush",
+ "type": "simple",
+
+ "packageExporter": [
+ "type=service",
+ "name=void"
+ ],
+
+ "packageImporter": [
+ "type=service",
+ "name=cache-flush"
+ ],
+
+ "queueProvider": [
+ "type=service",
+ "name=sjh"
+ ],
+
+ "queueDistributionStrategy": [
+ "type=service",
+ "name=error"
+ ]
+}
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.CompactSimpleReplicationAgentFactory-reverse.json b/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.CompactSimpleReplicationAgentFactory-reverse.json
new file mode 100644
index 0000000..72ad2fe
--- /dev/null
+++ b/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.CompactSimpleReplicationAgentFactory-reverse.json
@@ -0,0 +1,34 @@
+{
+ "jcr:primaryType": "sling:OsgiConfig",
+ "name": "reverse",
+ "type": "simple",
+
+ "isPassive": true,
+
+ "packageExporter": [
+ "type=local",
+ "packageBuilder/type=vlt",
+ "packageBuilder/servicename=replicationService"
+ ],
+
+ "packageImporter": [
+ "type=local",
+ "packageBuilder/type=vlt",
+ "packageBuilder/servicename=replicationService"
+ ],
+
+ "queueProvider": [
+ "type=service",
+ "name=sjh"
+ ],
+
+ "queueDistributionStrategy": [
+ "type=service",
+ "name=error"
+ ],
+
+ "trigger0": [
+ "type=resourceEvent",
+ "path=/content/usergenerated"
+ ]
+}
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.DefaultReplicationComponentFactory-trigger-content-changed.json b/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.DefaultReplicationComponentFactory-trigger-content-changed.json
new file mode 100644
index 0000000..4e32f7d
--- /dev/null
+++ b/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.DefaultReplicationComponentFactory-trigger-content-changed.json
@@ -0,0 +1,12 @@
+{
+ "jcr:primaryType": "sling:OsgiConfig",
+ "name": "content-changed",
+
+ "kind": "trigger",
+
+ "properties": [
+ "type=resourceEvent",
+ "path=/content/usergenerated"
+ ]
+
+}
\ No newline at end of file
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.packaging.impl.exporter.AgentReplicationPackageExporterFactory-reverse.json b/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.packaging.impl.exporter.AgentReplicationPackageExporterFactory-reverse.json
new file mode 100644
index 0000000..a6b5348
--- /dev/null
+++ b/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.packaging.impl.exporter.AgentReplicationPackageExporterFactory-reverse.json
@@ -0,0 +1,7 @@
+{
+ "jcr:primaryType": "sling:OsgiConfig",
+ "name": "reverse",
+
+ "ReplicationPackageBuilder.target": "(name=vlt)",
+ "ReplicationAgent.target": "(name=reverse)"
+}
\ No newline at end of file
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.packaging.impl.exporter.LocalReplicationPackageExporterFactory-default.json b/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.packaging.impl.exporter.LocalReplicationPackageExporterFactory-default.json
new file mode 100644
index 0000000..55fe7ee
--- /dev/null
+++ b/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.packaging.impl.exporter.LocalReplicationPackageExporterFactory-default.json
@@ -0,0 +1,6 @@
+{
+ "jcr:primaryType": "sling:OsgiConfig",
+ "name": "default",
+
+ "ReplicationPackageBuilder.target": "(name=vlt)"
+}
\ No newline at end of file
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.packaging.impl.importer.AdvancedRemoteReplicationPackageImporter-cache-flush.json b/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.packaging.impl.importer.AdvancedRemoteReplicationPackageImporter-cache-flush.json
new file mode 100644
index 0000000..f3cd9ca
--- /dev/null
+++ b/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.packaging.impl.importer.AdvancedRemoteReplicationPackageImporter-cache-flush.json
@@ -0,0 +1,13 @@
+{
+ "jcr:primaryType": "sling:OsgiConfig",
+ "name": "cache-flush",
+ "useCustomHeaders": true,
+ "customHeaders": [
+ "Path: {path}",
+ "add -> Action : REFRESH",
+ "delete -> Change : REMOVE" ],
+ "useCustomBody": true,
+ "customBody": "",
+ "TransportAuthenticationProviderFactory.target": "(name=nop)",
+ "endpoints": [ "http://localhost:8000/invalidatecache" ]
+}
\ No newline at end of file
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.packaging.impl.importer.LocalReplicationPackageImporterFactory-default.json b/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.packaging.impl.importer.LocalReplicationPackageImporterFactory-default.json
new file mode 100644
index 0000000..9381551
--- /dev/null
+++ b/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.packaging.impl.importer.LocalReplicationPackageImporterFactory-default.json
@@ -0,0 +1,5 @@
+{
+ "jcr:primaryType": "sling:OsgiConfig",
+ "name": "default",
+ "ReplicationPackageBuilder.target": "(name=vlt)"
+}
\ No newline at end of file
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/install/org.apache.sling.replication.serialization.impl.vlt.FileVaultReplicationPackageBuilderFactory-vlt.json b/src/main/resources/SLING-CONTENT/libs/sling/replication/install/org.apache.sling.replication.serialization.impl.vlt.FileVaultReplicationPackageBuilderFactory-vlt.json
new file mode 100644
index 0000000..7ed8af7
--- /dev/null
+++ b/src/main/resources/SLING-CONTENT/libs/sling/replication/install/org.apache.sling.replication.serialization.impl.vlt.FileVaultReplicationPackageBuilderFactory-vlt.json
@@ -0,0 +1,5 @@
+{
+ "jcr:primaryType": "sling:OsgiConfig",
+ "name": "vlt",
+ "servicename": "replicationService"
+}
\ No newline at end of file
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/install/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-replication.json b/src/main/resources/SLING-CONTENT/libs/sling/replication/install/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-replication.json
new file mode 100644
index 0000000..14729c8
--- /dev/null
+++ b/src/main/resources/SLING-CONTENT/libs/sling/replication/install/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-replication.json
@@ -0,0 +1,5 @@
+{
+ "jcr:primaryType": "sling:OsgiConfig",
+ "user.default": "",
+ "user.mapping": "org.apache.sling.replication:replicationService=admin"
+}
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/install/resources/services/org.apache.sling.replication.resources.impl.OsgiPropertiesResourceProviderFactory-agents.json b/src/main/resources/SLING-CONTENT/libs/sling/replication/install/resources/services/org.apache.sling.replication.resources.impl.OsgiPropertiesResourceProviderFactory-agents.json
new file mode 100644
index 0000000..5d166ff
--- /dev/null
+++ b/src/main/resources/SLING-CONTENT/libs/sling/replication/install/resources/services/org.apache.sling.replication.resources.impl.OsgiPropertiesResourceProviderFactory-agents.json
@@ -0,0 +1,13 @@
+{
+ "jcr:primaryType": "sling:OsgiConfig",
+ "name": "replicationAgents",
+ "provider.roots": [ "/libs/sling/replication/services/agents" ],
+ "serviceType": "org.apache.sling.replication.agent.ReplicationAgent",
+ "resourceProperties": [
+ "sling:resourceType=sling/replication/service/agent",
+ "sling:resourceSuperType=sling/replication/service",
+ "name={name}",
+
+ "queue/sling:resourceType=sling/replication/service/agent/queue"
+ ]
+}
\ No newline at end of file
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/install/resources/services/org.apache.sling.replication.resources.impl.OsgiPropertiesResourceProviderFactory-exporters.json b/src/main/resources/SLING-CONTENT/libs/sling/replication/install/resources/services/org.apache.sling.replication.resources.impl.OsgiPropertiesResourceProviderFactory-exporters.json
new file mode 100644
index 0000000..58180b6
--- /dev/null
+++ b/src/main/resources/SLING-CONTENT/libs/sling/replication/install/resources/services/org.apache.sling.replication.resources.impl.OsgiPropertiesResourceProviderFactory-exporters.json
@@ -0,0 +1,12 @@
+{
+ "jcr:primaryType": "sling:OsgiConfig",
+ "name": "replicationExporters",
+ "provider.roots": [ "/libs/sling/replication/services/exporters" ],
+ "serviceType": "org.apache.sling.replication.packaging.ReplicationPackageExporter",
+ "resourceProperties": [
+ "sling:resourceType=sling/replication/service/exporter",
+ "sling:resourceSuperType=sling/replication/service",
+
+ "name={name}"
+ ]
+}
\ No newline at end of file
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/install/resources/services/org.apache.sling.replication.resources.impl.OsgiPropertiesResourceProviderFactory-importers.json b/src/main/resources/SLING-CONTENT/libs/sling/replication/install/resources/services/org.apache.sling.replication.resources.impl.OsgiPropertiesResourceProviderFactory-importers.json
new file mode 100644
index 0000000..85b4e30
--- /dev/null
+++ b/src/main/resources/SLING-CONTENT/libs/sling/replication/install/resources/services/org.apache.sling.replication.resources.impl.OsgiPropertiesResourceProviderFactory-importers.json
@@ -0,0 +1,12 @@
+{
+ "jcr:primaryType": "sling:OsgiConfig",
+ "name": "replicationImporters",
+ "provider.roots": [ "/libs/sling/replication/services/importers" ],
+ "serviceType": "org.apache.sling.replication.packaging.ReplicationPackageImporter",
+ "resourceProperties": [
+ "sling:resourceType=sling/replication/service/importer",
+ "sling:resourceSuperType=sling/replication/service",
+
+ "name={name}"
+ ]
+}
\ No newline at end of file
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/install/resources/services/org.apache.sling.replication.resources.impl.OsgiPropertiesResourceProviderFactory-triggers.json b/src/main/resources/SLING-CONTENT/libs/sling/replication/install/resources/services/org.apache.sling.replication.resources.impl.OsgiPropertiesResourceProviderFactory-triggers.json
new file mode 100644
index 0000000..14c715e
--- /dev/null
+++ b/src/main/resources/SLING-CONTENT/libs/sling/replication/install/resources/services/org.apache.sling.replication.resources.impl.OsgiPropertiesResourceProviderFactory-triggers.json
@@ -0,0 +1,12 @@
+{
+ "jcr:primaryType": "sling:OsgiConfig",
+ "name": "replicationTriggers",
+ "provider.roots": [ "/libs/sling/replication/services/triggers" ],
+ "serviceType": "org.apache.sling.replication.trigger.ReplicationTrigger",
+ "resourceProperties": [
+ "sling:resourceType=sling/replication/service/trigger",
+ "sling:resourceSuperType=sling/replication/service",
+
+ "name={name}"
+ ]
+}
\ No newline at end of file
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/install/resources/settings/org.apache.sling.replication.resources.impl.OsgiPropertiesResourceProviderFactory-simpleAgents.json b/src/main/resources/SLING-CONTENT/libs/sling/replication/install/resources/settings/org.apache.sling.replication.resources.impl.OsgiPropertiesResourceProviderFactory-simpleAgents.json
new file mode 100644
index 0000000..b52ff51
--- /dev/null
+++ b/src/main/resources/SLING-CONTENT/libs/sling/replication/install/resources/settings/org.apache.sling.replication.resources.impl.OsgiPropertiesResourceProviderFactory-simpleAgents.json
@@ -0,0 +1,19 @@
+{
+ "jcr:primaryType": "sling:OsgiConfig",
+ "name": "simpleAgents",
+ "provider.roots": [ "/libs/sling/replication/settings/agents" ],
+ "serviceType": "org.apache.sling.replication.agent.impl.CompactSimpleReplicationAgentFactory",
+ "providerType": "osgiConfig",
+ "groupPrefix": "agents",
+
+
+ "resourceProperties": [
+ "sling:resourceType=sling/replication/setting/agent",
+ "sling:resourceSuperType=sling/replication/setting",
+ "name={name}",
+ "packageExporter={packageExporter}",
+ "packageImporter={packageImporter}"
+ ]
+
+
+}
\ No newline at end of file
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/service/agent/replicate.html.esp b/src/main/resources/SLING-CONTENT/libs/sling/replication/service/agent/replicate.html.esp
new file mode 100644
index 0000000..b94cfc8
--- /dev/null
+++ b/src/main/resources/SLING-CONTENT/libs/sling/replication/service/agent/replicate.html.esp
@@ -0,0 +1,18 @@
+<%
+var valueMap = resource.adaptTo(Packages.org.apache.sling.api.resource.ValueMap);
+var pit = valueMap.keySet().iterator();
+%>
+<html>
+ <body>
+ <h1>Replicate: <%= valueMap.get("name") %></h1>
+
+ <form action="<%= request.contextPath + resource.path %>" method="POST">
+ Path: <input type="text" name="path"><br>
+ Action: <input type="radio" name="action" value="ADD">Add
+ <input type="radio" name="action" value="DELETE">Delete<br>
+
+ <input type="submit" value="Submit">
+
+ </form>
+ </body>
+</html>
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/service/html.esp b/src/main/resources/SLING-CONTENT/libs/sling/replication/service/html.esp
new file mode 100644
index 0000000..e2fc96d
--- /dev/null
+++ b/src/main/resources/SLING-CONTENT/libs/sling/replication/service/html.esp
@@ -0,0 +1,21 @@
+<%
+var valueMap = resource.adaptTo(Packages.org.apache.sling.api.resource.ValueMap);
+var pit = valueMap.keySet().iterator();
+%>
+<html>
+ <body>
+ <h1>Agent: <%= valueMap.get("name") %></h1>
+
+ <ul>
+ <% while(pit.hasNext()) { %>
+
+ <% var pname = pit.next(); %>
+
+ <li>
+ <%= pname %>: <%= valueMap.get(pname) %>
+ </li>
+
+ <% } %>
+ </ul>
+ </body>
+</html>
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/service/list/html.esp b/src/main/resources/SLING-CONTENT/libs/sling/replication/service/list/html.esp
new file mode 100644
index 0000000..b86c0be
--- /dev/null
+++ b/src/main/resources/SLING-CONTENT/libs/sling/replication/service/list/html.esp
@@ -0,0 +1,35 @@
+<%
+var settingsUrl = request.contextPath + "/libs/sling/replication/settings/";
+var valueMap = resource.adaptTo(Packages.org.apache.sling.api.resource.ValueMap);
+var childrenNames = valueMap.get("items"); %>
+<html>
+ <body>
+ <h1><%= valueMap.get("sling:resourceType") %></h1>
+
+ <ul>
+
+ <% for(var i=0; i<childrenNames.length; i++) { %>
+
+ <%
+ var childName = childrenNames[i];
+ var serviceName = childName;
+
+ var index = childName.lastIndexOf("/");
+ if (index >= 0) {
+ serviceName = childName.substring(index+1);
+ }
+
+ var childUrl = request.contextPath + resource.path + "/" + serviceName + ".html";
+ var childSettingsUrl = settingsUrl + childName + ".html";
+
+
+ %>
+ <li>
+ <a href="<%= childUrl %>"><%= childName %></a> <a href="<%= childSettingsUrl %>">(settings)</a>
+ </li>
+
+ <% } %>
+
+ </ul>
+ </body>
+</html>
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/setting/html.esp b/src/main/resources/SLING-CONTENT/libs/sling/replication/setting/html.esp
new file mode 100644
index 0000000..1bb968c
--- /dev/null
+++ b/src/main/resources/SLING-CONTENT/libs/sling/replication/setting/html.esp
@@ -0,0 +1,33 @@
+<%
+var valueMap = resource.adaptTo(Packages.org.apache.sling.api.resource.ValueMap);
+var pit = valueMap.keySet().iterator();
+var settingsUrl = request.contextPath + "/libs/sling/replication/settings/";
+%>
+<html>
+ <body>
+ <h1>Settings: <%= valueMap.get("name") %></h1>
+
+ <ul>
+ <% while(pit.hasNext()) { %>
+
+ <%
+ var pname = pit.next();
+ var pvalue = valueMap.get(pname).toString();
+ var purl = "";
+ if (!pname.contains(":") && pvalue.contains("/")) {
+ purl = settingsUrl + pvalue + ".html";
+ }
+ %>
+
+ <li>
+ <%= pname %>:
+ <% if(purl.length > 0) { %>
+ <a href="<%= purl %>"><%= pvalue %></a>
+ <% } else { %>
+ <%= pvalue %>
+ <% } %>
+ </li>
+ <% } %>
+ </ul>
+ </body>
+</html>
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/setting/list/html.esp b/src/main/resources/SLING-CONTENT/libs/sling/replication/setting/list/html.esp
new file mode 100644
index 0000000..b327903
--- /dev/null
+++ b/src/main/resources/SLING-CONTENT/libs/sling/replication/setting/list/html.esp
@@ -0,0 +1,26 @@
+<%
+var settingsUrl = request.contextPath + "/libs/sling/replication/settings/"
+var valueMap = resource.adaptTo(Packages.org.apache.sling.api.resource.ValueMap);
+var childrenNames = valueMap.get("items");
+%>
+<html>
+ <body>
+ <h1><%= valueMap.get("sling:resourceType") %></h1>
+
+ <ul>
+
+ <% for(var i=0; i<childrenNames.length; i++) { %>
+
+ <%
+ var childName = childrenNames[i];
+ var childUrl = settingsUrl + childName + ".html"
+ %>
+ <li>
+ <a href="<%= childUrl %>"><%= childName %></a>
+ </li>
+
+ <% } %>
+
+ </ul>
+ </body>
+</html>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-distribution-sample] 34/42: SLING-4289:
refactoring the resourceproviders for osgi configs and osgi services
Posted by ro...@apache.org.
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 <mp...@apache.org>
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
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-distribution-sample] 37/42: SLING-4324:
spliting LocalDistributionTriggerFactory in specific factories
Posted by ro...@apache.org.
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 a7f7f3cc36cfdc2e87b871cfb382267643a93572
Author: Marius Petria <mp...@apache.org>
AuthorDate: Fri Jan 16 14:19:13 2015 +0000
SLING-4324: spliting LocalDistributionTriggerFactory in specific factories
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/distribution/sample@1652413 13f79535-47bb-0310-9956-ffa450edef68
---
...ScheduledDistributionTriggerFactory-publish-reverse-scheduled.json} | 3 ---
...ScheduledDistributionTriggerFactory-pubsync-scheduled-trigger.json} | 2 --
...rEventDistributionTriggerFactory-reverse-userGeneratedContent.json} | 3 +--
3 files changed, 1 insertion(+), 7 deletions(-)
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/publish-reverse/org.apache.sling.distribution.trigger.impl.LocalDistributionTriggerFactory-publish-reverse-scheduled.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/publish-reverse/org.apache.sling.distribution.trigger.impl.ScheduledDistributionTriggerFactory-publish-reverse-scheduled.json
similarity index 79%
rename from src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/publish-reverse/org.apache.sling.distribution.trigger.impl.LocalDistributionTriggerFactory-publish-reverse-scheduled.json
rename to src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/publish-reverse/org.apache.sling.distribution.trigger.impl.ScheduledDistributionTriggerFactory-publish-reverse-scheduled.json
index e0ea5dd..f8170ae 100644
--- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/publish-reverse/org.apache.sling.distribution.trigger.impl.LocalDistributionTriggerFactory-publish-reverse-scheduled.json
+++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/publish-reverse/org.apache.sling.distribution.trigger.impl.ScheduledDistributionTriggerFactory-publish-reverse-scheduled.json
@@ -2,9 +2,6 @@
"jcr:primaryType": "sling:OsgiConfig",
"name": "publish-reverse-scheduled",
-
- "type": "scheduledEvent",
"action": "pull",
"seconds": "30"
-
}
\ No newline at end of file
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.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.ScheduledDistributionTriggerFactory-pubsync-scheduled-trigger.json
similarity index 80%
rename from src/main/resources/SLING-CONTENT/libs/sling/distribution/install.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.ScheduledDistributionTriggerFactory-pubsync-scheduled-trigger.json
index 408b091..792c2d7 100644
--- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.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.ScheduledDistributionTriggerFactory-pubsync-scheduled-trigger.json
@@ -3,8 +3,6 @@
"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.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.JcrEventDistributionTriggerFactory-reverse-userGeneratedContent.json
similarity index 65%
rename from src/main/resources/SLING-CONTENT/libs/sling/distribution/install.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.JcrEventDistributionTriggerFactory-reverse-userGeneratedContent.json
index 9e57314..0d5c428 100644
--- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.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.JcrEventDistributionTriggerFactory-reverse-userGeneratedContent.json
@@ -3,8 +3,7 @@
"name": "reverse-userGeneratedContent",
- "type" : "jcrEvent",
"path" : "/content/usergenerated",
- "servicename" : "distributionService"
+ "serviceName" : "distributionService"
}
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-distribution-sample] 26/42: SLING-4154:
making also importers and exporters to be picked up by content based
factory
Posted by ro...@apache.org.
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 1f94f0106c081a1d391fef4d1e53fd266358ac0a
Author: Marius Petria <mp...@apache.org>
AuthorDate: Thu Nov 27 14:11:39 2014 +0000
SLING-4154: making also importers and exporters to be picked up by content based factory
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/distribution/sample@1642158 13f79535-47bb-0310-9956-ffa450edef68
---
...pl.ResourceBasedDistributionComponentFactory-agents.json | 8 --------
...nent.impl.ResourceBasedDistributionComponentFactory.json | 4 ++++
...pl.ResourceBasedDistributionComponentFactory-agents.json | 8 --------
...nent.impl.ResourceBasedDistributionComponentFactory.json | 4 ++++
...ter.AgentDistributionPackageExporterFactory-reverse.json | 10 ----------
...ter.LocalDistributionPackageExporterFactory-default.json | 10 ----------
...ter.LocalDistributionPackageImporterFactory-default.json | 9 ---------
.../settings.publish/defaults/exporters/global.json | 13 +++++++++++++
.../settings.publish/defaults/importers/global.json | 13 +++++++++++++
.../distribution/settings.publish/exporters/default.json | 3 +++
.../distribution/settings.publish/exporters/reverse.json | 7 +++++++
.../distribution/settings.publish/importers/default.json | 3 +++
12 files changed, 47 insertions(+), 45 deletions(-)
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
deleted file mode 100644
index 00ef1f0..0000000
--- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/org.apache.sling.distribution.component.impl.ResourceBasedDistributionComponentFactory-agents.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "jcr:primaryType": "sling:OsgiConfig",
- "name": "agents",
-
- "kind": "agent",
- "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.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
new file mode 100644
index 0000000..d8130f4
--- /dev/null
+++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/org.apache.sling.distribution.component.impl.ResourceBasedDistributionComponentFactory.json
@@ -0,0 +1,4 @@
+{
+ "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.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
deleted file mode 100644
index 5855403..0000000
--- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/org.apache.sling.distribution.component.impl.ResourceBasedDistributionComponentFactory-agents.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "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.component.impl.ResourceBasedDistributionComponentFactory.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/org.apache.sling.distribution.component.impl.ResourceBasedDistributionComponentFactory.json
new file mode 100644
index 0000000..3c23f83
--- /dev/null
+++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/org.apache.sling.distribution.component.impl.ResourceBasedDistributionComponentFactory.json
@@ -0,0 +1,4 @@
+{
+ "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.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
deleted file mode 100644
index ab2d2f4..0000000
--- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/org.apache.sling.distribution.packaging.impl.exporter.AgentDistributionPackageExporterFactory-reverse.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "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.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
deleted file mode 100644
index 60132c0..0000000
--- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/org.apache.sling.distribution.packaging.impl.exporter.LocalDistributionPackageExporterFactory-default.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "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.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
deleted file mode 100644
index f4607dc..0000000
--- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/org.apache.sling.distribution.packaging.impl.importer.LocalDistributionPackageImporterFactory-default.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "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/settings.publish/defaults/exporters/global.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.publish/defaults/exporters/global.json
new file mode 100644
index 0000000..be80eb3
--- /dev/null
+++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.publish/defaults/exporters/global.json
@@ -0,0 +1,13 @@
+{
+ "jcr:primaryType" : "nt:unstructured",
+
+ "kind" : "exporter",
+
+ "isResource" : "true",
+
+ "packageBuilder" : {
+ "kind" : "packager",
+ "type" : "service",
+ "name" : "vlt"
+ }
+}
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.publish/defaults/importers/global.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.publish/defaults/importers/global.json
new file mode 100644
index 0000000..9db09d2
--- /dev/null
+++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.publish/defaults/importers/global.json
@@ -0,0 +1,13 @@
+{
+ "jcr:primaryType" : "nt:unstructured",
+
+ "kind" : "importer",
+
+ "isResource" : "true",
+
+ "packageBuilder" : {
+ "kind" : "packager",
+ "type" : "service",
+ "name" : "vlt"
+ }
+}
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.publish/exporters/default.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.publish/exporters/default.json
new file mode 100644
index 0000000..df081d1
--- /dev/null
+++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.publish/exporters/default.json
@@ -0,0 +1,3 @@
+{
+ "type" : "local"
+}
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.publish/exporters/reverse.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.publish/exporters/reverse.json
new file mode 100644
index 0000000..070b66f
--- /dev/null
+++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.publish/exporters/reverse.json
@@ -0,0 +1,7 @@
+{
+ "type" : "agent",
+ "agent": {
+ "type" : "service",
+ "name" : "reverse"
+ }
+}
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.publish/importers/default.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.publish/importers/default.json
new file mode 100644
index 0000000..df081d1
--- /dev/null
+++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.publish/importers/default.json
@@ -0,0 +1,3 @@
+{
+ "type" : "local"
+}
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-distribution-sample] 17/42: SLING-4060:
initial refactoring for property parsing
Posted by ro...@apache.org.
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 9197ae5aa26f795f9bc383aed57bae443d3ec5e3
Author: Marius Petria <mp...@apache.org>
AuthorDate: Thu Nov 6 10:45:43 2014 +0000
SLING-4060: initial refactoring for property parsing
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/replication/sample@1637071 13f79535-47bb-0310-9956-ffa450edef68
---
....SimpleReplicationAgentFactory-publish-reverse.json | 18 ++++++------------
...ent.impl.SimpleReplicationAgentFactory-publish.json | 4 ----
...ent.impl.SimpleReplicationAgentFactory-reverse.json | 8 ++++----
3 files changed, 10 insertions(+), 20 deletions(-)
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-publish-reverse.json b/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-publish-reverse.json
index fccec22..23ef9a9 100644
--- a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-publish-reverse.json
+++ b/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-publish-reverse.json
@@ -24,22 +24,16 @@
"packageBuilder/type=vlt"
],
- "trigger0": [
- "type=scheduledEvent",
- "action=poll",
- "seconds=30"
- ],
+ "trigger": [
+ "scheduledTrigger/type=scheduledEvent",
+ "scheduledTrigger/action=poll",
+ "scheduledTrigger/seconds=30",
- "trigger1": [
- "type=remoteEvent",
- "endpoint=http://localhost:4503/libs/sling/replication/services/triggers/content-changed.event"
+ "remoteTrigger/type=remoteEvent",
+ "remoteTrigger/endpoint=http://localhost:4503/libs/sling/replication/services/triggers/content-changed.event"
],
- "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/replication/install.author/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-publish.json b/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-publish.json
index cf5ea57..e03d474 100644
--- a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-publish.json
+++ b/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-publish.json
@@ -23,9 +23,5 @@
"packageBuilder/type=vlt"
],
- "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/replication/install.publish/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-reverse.json b/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-reverse.json
index 53baa1b..70fa22a 100644
--- a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-reverse.json
+++ b/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-reverse.json
@@ -25,9 +25,9 @@
"queueDistributionStrategy": "(name=single)",
- "trigger0": [
- "type=jcrEvent",
- "path=/content/usergenerated",
- "servicename=replicationService"
+ "trigger": [
+ "userGeneratedTrigger/type=jcrEvent",
+ "userGeneratedTrigger/path=/content/usergenerated",
+ "userGeneratedTrigger/servicename=replicationService"
]
}
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-distribution-sample] 18/42: SLING-4140 -
renamed and moved Sling Replication to Sling Content Distribution
Posted by ro...@apache.org.
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 cfb06b5d463174f363d52d821fa37da0f2d48145
Author: Tommaso Teofili <to...@apache.org>
AuthorDate: Fri Nov 7 10:28:02 2014 +0000
SLING-4140 - renamed and moved Sling Replication to Sling Content Distribution
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/distribution/sample@1637333 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 21 ++++++-------
...ordinatingDistributionAgentFactory-pubsync.json | 35 ++++++++++++++++++++++
...eDistributionAgentFactory-publish-reverse.json} | 6 ++--
...pl.SimpleDistributionAgentFactory-publish.json} | 4 +--
...tionComponentFactory-trigger-remote-event.json} | 2 +-
...uthenticationProviderFactory-publishAdmin.json} | 0
...impleDistributionAgentFactory-cache-flush.json} | 0
...pl.SimpleDistributionAgentFactory-reverse.json} | 4 +--
...nComponentFactory-trigger-content-changed.json} | 2 +-
...istributionPackageExporterFactory-reverse.json} | 2 +-
...istributionPackageExporterFactory-default.json} | 0
...teDistributionPackageImporter-cache-flush.json} | 0
...istributionPackageImporterFactory-default.json} | 0
...event.jobs.QueueConfiguration-distribution.json | 8 +++++
...ServiceUserMapperImpl.amended-distribution.json | 5 ++++
...giPropertiesResourceProviderFactory-agents.json | 13 ++++++++
...ropertiesResourceProviderFactory-exporters.json | 12 ++++++++
...ropertiesResourceProviderFactory-importers.json | 12 ++++++++
...PropertiesResourceProviderFactory-triggers.json | 12 ++++++++
...ertiesResourceProviderFactory-simpleAgents.json | 18 +++++++++++
.../service/agent/replicate.html.esp | 0
.../{replication => distribution}/service/html.esp | 0
.../service/list/html.esp | 2 +-
.../{replication => distribution}/setting/html.esp | 2 +-
.../setting/list/html.esp | 2 +-
...oordinatingReplicationAgentFactory-pubsync.json | 35 ----------------------
....event.jobs.QueueConfiguration-replication.json | 8 -----
....ServiceUserMapperImpl.amended-replication.json | 5 ----
...giPropertiesResourceProviderFactory-agents.json | 13 --------
...ropertiesResourceProviderFactory-exporters.json | 12 --------
...ropertiesResourceProviderFactory-importers.json | 12 --------
...PropertiesResourceProviderFactory-triggers.json | 12 --------
...ertiesResourceProviderFactory-simpleAgents.json | 18 -----------
33 files changed, 137 insertions(+), 140 deletions(-)
diff --git a/pom.xml b/pom.xml
index 51033f9..656a556 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,19 +32,19 @@
<!-- ======================================================================= -->
<!-- P R O J E C T -->
<!-- ======================================================================= -->
- <artifactId>org.apache.sling.replication.sample</artifactId>
+ <artifactId>org.apache.sling.distribution.sample</artifactId>
<version>0.0.1-SNAPSHOT</version>
<packaging>bundle</packaging>
- <name>Apache Sling Replication Sample</name>
+ <name>Apache Sling Distribution Sample</name>
<description>
- The Apache Sling Replication sample bundle provides a set of sample configurations and custom component implementations.
+ The Apache Sling Distribution sample bundle provides a set of sample configurations and custom component implementations.
</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/replication/sample</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/replication/sample</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/sample</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/distribution/sample</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/distribution/sample</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/sample</url>
</scm>
<!-- ======================================================================= -->
@@ -66,13 +66,10 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Bundle-SymbolicName>org.apache.sling.replication.sample</Bundle-SymbolicName>
+ <Bundle-SymbolicName>org.apache.sling.distribution.sample</Bundle-SymbolicName>
<Sling-Initial-Content>
- SLING-CONTENT/libs/sling/replication;path:=/libs/sling/replication;overwrite:=true
+ SLING-CONTENT/libs/sling/distribution;path:=/libs/sling/distribution;overwrite:=true
</Sling-Initial-Content>
- <Export-Package>
- </Export-Package>
- <Embed-Dependency>httpasyncclient</Embed-Dependency>
</instructions>
</configuration>
</plugin>
@@ -96,7 +93,7 @@
<!-- SLING -->
<dependency>
<groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.replication.core</artifactId>
+ <artifactId>org.apache.sling.distribution.core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
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
new file mode 100644
index 0000000..7724b93
--- /dev/null
+++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/org.apache.sling.distribution.agent.impl.CoordinatingDistributionAgentFactory-pubsync.json
@@ -0,0 +1,35 @@
+{
+ "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/replication/install.author/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-publish-reverse.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/org.apache.sling.distribution.agent.impl.SimpleDistributionAgentFactory-publish-reverse.json
similarity index 78%
rename from src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-publish-reverse.json
rename to src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/org.apache.sling.distribution.agent.impl.SimpleDistributionAgentFactory-publish-reverse.json
index 23ef9a9..84b41b9 100644
--- a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-publish-reverse.json
+++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/org.apache.sling.distribution.agent.impl.SimpleDistributionAgentFactory-publish-reverse.json
@@ -4,12 +4,12 @@
"enabled" : true,
- "serviceName" : "replicationService",
+ "serviceName" : "distributionService",
"packageExporter": [
"type=remote",
- "endpoints[0]=http://localhost:4503/libs/sling/replication/services/exporters/reverse",
+ "endpoints[0]=http://localhost:4503/libs/sling/distribution/services/exporters/reverse",
"packageBuilder/type=vlt"
],
@@ -30,7 +30,7 @@
"scheduledTrigger/seconds=30",
"remoteTrigger/type=remoteEvent",
- "remoteTrigger/endpoint=http://localhost:4503/libs/sling/replication/services/triggers/content-changed.event"
+ "remoteTrigger/endpoint=http://localhost:4503/libs/sling/distribution/services/triggers/content-changed.event"
],
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-publish.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/org.apache.sling.distribution.agent.impl.SimpleDistributionAgentFactory-publish.json
similarity index 76%
rename from src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-publish.json
rename to src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/org.apache.sling.distribution.agent.impl.SimpleDistributionAgentFactory-publish.json
index e03d474..d624a3f 100644
--- a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-publish.json
+++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/org.apache.sling.distribution.agent.impl.SimpleDistributionAgentFactory-publish.json
@@ -2,7 +2,7 @@
"jcr:primaryType": "sling:OsgiConfig",
"name": "publish",
- "serviceName" : "replicationService",
+ "serviceName" : "distributionService",
"requestAuthorizationStrategy" : [
"type=privilege",
@@ -16,7 +16,7 @@
"packageImporter": [
"type=remote",
- "endpoints[0]=http://localhost:4503/libs/sling/replication/services/importers/default",
+ "endpoints[0]=http://localhost:4503/libs/sling/distribution/services/importers/default",
"authenticationProvider/type=service",
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.component.impl.GenericReplicationComponentFactory-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
similarity index 72%
rename from src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.component.impl.GenericReplicationComponentFactory-trigger-remote-event.json
rename to src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/org.apache.sling.distribution.component.impl.GenericDistributionComponentFactory-trigger-remote-event.json
index 38030a4..6d8c4f8 100644
--- a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.component.impl.GenericReplicationComponentFactory-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
@@ -6,7 +6,7 @@
"properties": [
"type=remoteEvent",
- "endpoint=http://localhost:4503/libs/sling/replication/services/triggers/content-changed.event",
+ "endpoint=http://localhost:4503/libs/sling/distribution/services/triggers/content-changed.event",
"authenticationProvider/type=service"
],
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.transport.authentication.impl.UserCredentialsTransportAuthenticationProviderFactory-publishAdmin.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/org.apache.sling.distribution.transport.authentication.impl.UserCredentialsTransportAuthenticationProviderFactory-publishAdmin.json
similarity index 100%
rename from src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.transport.authentication.impl.UserCredentialsTransportAuthenticationProviderFactory-publishAdmin.json
rename to src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/org.apache.sling.distribution.transport.authentication.impl.UserCredentialsTransportAuthenticationProviderFactory-publishAdmin.json
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-cache-flush.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/org.apache.sling.distribution.agent.impl.SimpleDistributionAgentFactory-cache-flush.json
similarity index 100%
rename from src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-cache-flush.json
rename to src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/org.apache.sling.distribution.agent.impl.SimpleDistributionAgentFactory-cache-flush.json
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-reverse.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/org.apache.sling.distribution.agent.impl.SimpleDistributionAgentFactory-reverse.json
similarity index 85%
rename from src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-reverse.json
rename to src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/org.apache.sling.distribution.agent.impl.SimpleDistributionAgentFactory-reverse.json
index 70fa22a..a1ed69e 100644
--- a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-reverse.json
+++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/org.apache.sling.distribution.agent.impl.SimpleDistributionAgentFactory-reverse.json
@@ -4,7 +4,7 @@
"isPassive": true,
- "serviceName" : "replicationService",
+ "serviceName" : "distributionService",
"packageExporter": [
"type=local",
@@ -28,6 +28,6 @@
"trigger": [
"userGeneratedTrigger/type=jcrEvent",
"userGeneratedTrigger/path=/content/usergenerated",
- "userGeneratedTrigger/servicename=replicationService"
+ "userGeneratedTrigger/servicename=distributionService"
]
}
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.component.impl.GenericReplicationComponentFactory-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
similarity index 82%
rename from src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.component.impl.GenericReplicationComponentFactory-trigger-content-changed.json
rename to src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/org.apache.sling.distribution.component.impl.GenericDistributionComponentFactory-trigger-content-changed.json
index 155e371..bea7209 100644
--- a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.component.impl.GenericReplicationComponentFactory-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
@@ -7,7 +7,7 @@
"properties": [
"type=jcrEvent",
"path=/content/usergenerated",
- "servicename=replicationService"
+ "servicename=distributionService"
]
}
\ No newline at end of file
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.packaging.impl.exporter.AgentReplicationPackageExporterFactory-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 68%
rename from src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.packaging.impl.exporter.AgentReplicationPackageExporterFactory-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 f9e8bb0..03ab1d4 100644
--- a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.packaging.impl.exporter.AgentReplicationPackageExporterFactory-reverse.json
+++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/org.apache.sling.distribution.packaging.impl.exporter.AgentDistributionPackageExporterFactory-reverse.json
@@ -4,5 +4,5 @@
"packageBuilder": [ "type=vlt" ],
- "ReplicationAgent.target": "(name=reverse)"
+ "DistributionAgent.target": "(name=reverse)"
}
\ No newline at end of file
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.packaging.impl.exporter.LocalReplicationPackageExporterFactory-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 100%
rename from src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.packaging.impl.exporter.LocalReplicationPackageExporterFactory-default.json
rename to src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/org.apache.sling.distribution.packaging.impl.exporter.LocalDistributionPackageExporterFactory-default.json
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.packaging.impl.importer.AdvancedRemoteReplicationPackageImporter-cache-flush.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/org.apache.sling.distribution.packaging.impl.importer.AdvancedRemoteDistributionPackageImporter-cache-flush.json
similarity index 100%
rename from src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.packaging.impl.importer.AdvancedRemoteReplicationPackageImporter-cache-flush.json
rename to src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/org.apache.sling.distribution.packaging.impl.importer.AdvancedRemoteDistributionPackageImporter-cache-flush.json
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.packaging.impl.importer.LocalReplicationPackageImporterFactory-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 100%
rename from src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.packaging.impl.importer.LocalReplicationPackageImporterFactory-default.json
rename to src/main/resources/SLING-CONTENT/libs/sling/distribution/install.publish/org.apache.sling.distribution.packaging.impl.importer.LocalDistributionPackageImporterFactory-default.json
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/org.apache.sling.event.jobs.QueueConfiguration-distribution.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/org.apache.sling.event.jobs.QueueConfiguration-distribution.json
new file mode 100644
index 0000000..2b68424
--- /dev/null
+++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/org.apache.sling.event.jobs.QueueConfiguration-distribution.json
@@ -0,0 +1,8 @@
+{
+ "jcr:primaryType" : "sling:OsgiConfig",
+ "queue.name" : "org/apache/sling/distribution/queue/{0}",
+ "queue.retries" : "-1",
+ "queue.topics": "org/apache/sling/distribution/queue/*",
+ "queue.type" : "ORDERED"
+}
+
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-distribution.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-distribution.json
new file mode 100644
index 0000000..10337b7
--- /dev/null
+++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-distribution.json
@@ -0,0 +1,5 @@
+{
+ "jcr:primaryType": "sling:OsgiConfig",
+ "user.default": "",
+ "user.mapping": "org.apache.sling.distribution.core:distributionService=admin"
+}
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.OsgiPropertiesResourceProviderFactory-agents.json
new file mode 100644
index 0000000..f2587ac
--- /dev/null
+++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/resources/services/org.apache.sling.distribution.resources.impl.OsgiPropertiesResourceProviderFactory-agents.json
@@ -0,0 +1,13 @@
+{
+ "jcr:primaryType": "sling:OsgiConfig",
+ "name": "distributionAgents",
+ "provider.roots": [ "/libs/sling/distribution/services/agents" ],
+ "serviceType": "org.apache.sling.distribution.agent.DistributionAgent",
+ "resourceProperties": [
+ "sling:resourceType=sling/distribution/service/agent",
+ "sling:resourceSuperType=sling/distribution/service",
+ "name={name}",
+
+ "queue/sling:resourceType=sling/distribution/service/agent/queue"
+ ]
+}
\ 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-exporters.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/resources/services/org.apache.sling.distribution.resources.impl.OsgiPropertiesResourceProviderFactory-exporters.json
new file mode 100644
index 0000000..e1b8e94
--- /dev/null
+++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/resources/services/org.apache.sling.distribution.resources.impl.OsgiPropertiesResourceProviderFactory-exporters.json
@@ -0,0 +1,12 @@
+{
+ "jcr:primaryType": "sling:OsgiConfig",
+ "name": "distributionExporters",
+ "provider.roots": [ "/libs/sling/distribution/services/exporters" ],
+ "serviceType": "org.apache.sling.distribution.packaging.DistributionPackageExporter",
+ "resourceProperties": [
+ "sling:resourceType=sling/distribution/service/exporter",
+ "sling:resourceSuperType=sling/distribution/service",
+
+ "name={name}"
+ ]
+}
\ 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.OsgiPropertiesResourceProviderFactory-importers.json
new file mode 100644
index 0000000..1964678
--- /dev/null
+++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/resources/services/org.apache.sling.distribution.resources.impl.OsgiPropertiesResourceProviderFactory-importers.json
@@ -0,0 +1,12 @@
+{
+ "jcr:primaryType": "sling:OsgiConfig",
+ "name": "distributionImporters",
+ "provider.roots": [ "/libs/sling/distribution/services/importers" ],
+ "serviceType": "org.apache.sling.distribution.packaging.DistributionPackageImporter",
+ "resourceProperties": [
+ "sling:resourceType=sling/distribution/service/importer",
+ "sling:resourceSuperType=sling/distribution/service",
+
+ "name={name}"
+ ]
+}
\ 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.OsgiPropertiesResourceProviderFactory-triggers.json
new file mode 100644
index 0000000..cf30532
--- /dev/null
+++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/resources/services/org.apache.sling.distribution.resources.impl.OsgiPropertiesResourceProviderFactory-triggers.json
@@ -0,0 +1,12 @@
+{
+ "jcr:primaryType": "sling:OsgiConfig",
+ "name": "distributionTriggers",
+ "provider.roots": [ "/libs/sling/distribution/services/triggers" ],
+ "serviceType": "org.apache.sling.distribution.trigger.DistributionTrigger",
+ "resourceProperties": [
+ "sling:resourceType=sling/distribution/service/trigger",
+ "sling:resourceSuperType=sling/distribution/service",
+
+ "name={name}"
+ ]
+}
\ 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
new file mode 100644
index 0000000..91825dd
--- /dev/null
+++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install/resources/settings/org.apache.sling.distribution.resources.impl.OsgiPropertiesResourceProviderFactory-simpleAgents.json
@@ -0,0 +1,18 @@
+{
+ "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
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/service/agent/replicate.html.esp b/src/main/resources/SLING-CONTENT/libs/sling/distribution/service/agent/replicate.html.esp
similarity index 100%
rename from src/main/resources/SLING-CONTENT/libs/sling/replication/service/agent/replicate.html.esp
rename to src/main/resources/SLING-CONTENT/libs/sling/distribution/service/agent/replicate.html.esp
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/service/html.esp b/src/main/resources/SLING-CONTENT/libs/sling/distribution/service/html.esp
similarity index 100%
rename from src/main/resources/SLING-CONTENT/libs/sling/replication/service/html.esp
rename to src/main/resources/SLING-CONTENT/libs/sling/distribution/service/html.esp
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/service/list/html.esp b/src/main/resources/SLING-CONTENT/libs/sling/distribution/service/list/html.esp
similarity index 92%
rename from src/main/resources/SLING-CONTENT/libs/sling/replication/service/list/html.esp
rename to src/main/resources/SLING-CONTENT/libs/sling/distribution/service/list/html.esp
index b86c0be..fec9698 100644
--- a/src/main/resources/SLING-CONTENT/libs/sling/replication/service/list/html.esp
+++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/service/list/html.esp
@@ -1,5 +1,5 @@
<%
-var settingsUrl = request.contextPath + "/libs/sling/replication/settings/";
+var settingsUrl = request.contextPath + "/libs/sling/distribution/settings/";
var valueMap = resource.adaptTo(Packages.org.apache.sling.api.resource.ValueMap);
var childrenNames = valueMap.get("items"); %>
<html>
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/setting/html.esp b/src/main/resources/SLING-CONTENT/libs/sling/distribution/setting/html.esp
similarity index 90%
rename from src/main/resources/SLING-CONTENT/libs/sling/replication/setting/html.esp
rename to src/main/resources/SLING-CONTENT/libs/sling/distribution/setting/html.esp
index 1bb968c..640beaf 100644
--- a/src/main/resources/SLING-CONTENT/libs/sling/replication/setting/html.esp
+++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/setting/html.esp
@@ -1,7 +1,7 @@
<%
var valueMap = resource.adaptTo(Packages.org.apache.sling.api.resource.ValueMap);
var pit = valueMap.keySet().iterator();
-var settingsUrl = request.contextPath + "/libs/sling/replication/settings/";
+var settingsUrl = request.contextPath + "/libs/sling/distribution/settings/";
%>
<html>
<body>
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/setting/list/html.esp b/src/main/resources/SLING-CONTENT/libs/sling/distribution/setting/list/html.esp
similarity index 87%
rename from src/main/resources/SLING-CONTENT/libs/sling/replication/setting/list/html.esp
rename to src/main/resources/SLING-CONTENT/libs/sling/distribution/setting/list/html.esp
index b327903..fd018aa 100644
--- a/src/main/resources/SLING-CONTENT/libs/sling/replication/setting/list/html.esp
+++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/setting/list/html.esp
@@ -1,5 +1,5 @@
<%
-var settingsUrl = request.contextPath + "/libs/sling/replication/settings/"
+var settingsUrl = request.contextPath + "/libs/sling/distribution/settings/"
var valueMap = resource.adaptTo(Packages.org.apache.sling.api.resource.ValueMap);
var childrenNames = valueMap.get("items");
%>
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.CoordinatingReplicationAgentFactory-pubsync.json b/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.CoordinatingReplicationAgentFactory-pubsync.json
deleted file mode 100644
index 6144bac..0000000
--- a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.CoordinatingReplicationAgentFactory-pubsync.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
- "jcr:primaryType": "sling:OsgiConfig",
- "name": "pubsync",
-
- "serviceName" : "replicationService",
-
- "requestAuthorizationStrategy" : [
- "type=privilege",
- "jcrPrivilege=jcr:read"
- ],
-
- "packageExporter": [
- "packageBuilder/type=vlt",
-
- "endpoints[0]=http://localhost:4503/libs/sling/replication/services/exporters/reverse-pubsync",
- "endpoints[1]=http://localhost:4504/libs/sling/replication/services/exporters/reverse-pubsync",
- "endpoints[2]=http://localhost:4505/libs/sling/replication/services/exporters/reverse-pubsync",
- "endpoints.strategy=All"
- ],
-
- "packageImporter": [
- "packageBuilder/type=vlt",
-
- "endpoints[0]=http://localhost:4503/libs/sling/replication/services/importers/default",
- "endpoints[1]=http://localhost:4504/libs/sling/replication/services/importers/default",
- "endpoints[2]=http://localhost:4505/libs/sling/replication/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/replication/install/org.apache.sling.event.jobs.QueueConfiguration-replication.json b/src/main/resources/SLING-CONTENT/libs/sling/replication/install/org.apache.sling.event.jobs.QueueConfiguration-replication.json
deleted file mode 100644
index a75062b..0000000
--- a/src/main/resources/SLING-CONTENT/libs/sling/replication/install/org.apache.sling.event.jobs.QueueConfiguration-replication.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "jcr:primaryType" : "sling:OsgiConfig",
- "queue.name" : "org/apache/sling/replication/queue/{0}",
- "queue.retries" : "-1",
- "queue.topics": "org/apache/sling/replication/queue/*",
- "queue.type" : "ORDERED"
-}
-
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/install/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-replication.json b/src/main/resources/SLING-CONTENT/libs/sling/replication/install/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-replication.json
deleted file mode 100644
index 33c0a62..0000000
--- a/src/main/resources/SLING-CONTENT/libs/sling/replication/install/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-replication.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "jcr:primaryType": "sling:OsgiConfig",
- "user.default": "",
- "user.mapping": "org.apache.sling.replication.core:replicationService=admin"
-}
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/install/resources/services/org.apache.sling.replication.resources.impl.OsgiPropertiesResourceProviderFactory-agents.json b/src/main/resources/SLING-CONTENT/libs/sling/replication/install/resources/services/org.apache.sling.replication.resources.impl.OsgiPropertiesResourceProviderFactory-agents.json
deleted file mode 100644
index 5d166ff..0000000
--- a/src/main/resources/SLING-CONTENT/libs/sling/replication/install/resources/services/org.apache.sling.replication.resources.impl.OsgiPropertiesResourceProviderFactory-agents.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
- "jcr:primaryType": "sling:OsgiConfig",
- "name": "replicationAgents",
- "provider.roots": [ "/libs/sling/replication/services/agents" ],
- "serviceType": "org.apache.sling.replication.agent.ReplicationAgent",
- "resourceProperties": [
- "sling:resourceType=sling/replication/service/agent",
- "sling:resourceSuperType=sling/replication/service",
- "name={name}",
-
- "queue/sling:resourceType=sling/replication/service/agent/queue"
- ]
-}
\ No newline at end of file
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/install/resources/services/org.apache.sling.replication.resources.impl.OsgiPropertiesResourceProviderFactory-exporters.json b/src/main/resources/SLING-CONTENT/libs/sling/replication/install/resources/services/org.apache.sling.replication.resources.impl.OsgiPropertiesResourceProviderFactory-exporters.json
deleted file mode 100644
index 58180b6..0000000
--- a/src/main/resources/SLING-CONTENT/libs/sling/replication/install/resources/services/org.apache.sling.replication.resources.impl.OsgiPropertiesResourceProviderFactory-exporters.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "jcr:primaryType": "sling:OsgiConfig",
- "name": "replicationExporters",
- "provider.roots": [ "/libs/sling/replication/services/exporters" ],
- "serviceType": "org.apache.sling.replication.packaging.ReplicationPackageExporter",
- "resourceProperties": [
- "sling:resourceType=sling/replication/service/exporter",
- "sling:resourceSuperType=sling/replication/service",
-
- "name={name}"
- ]
-}
\ No newline at end of file
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/install/resources/services/org.apache.sling.replication.resources.impl.OsgiPropertiesResourceProviderFactory-importers.json b/src/main/resources/SLING-CONTENT/libs/sling/replication/install/resources/services/org.apache.sling.replication.resources.impl.OsgiPropertiesResourceProviderFactory-importers.json
deleted file mode 100644
index 85b4e30..0000000
--- a/src/main/resources/SLING-CONTENT/libs/sling/replication/install/resources/services/org.apache.sling.replication.resources.impl.OsgiPropertiesResourceProviderFactory-importers.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "jcr:primaryType": "sling:OsgiConfig",
- "name": "replicationImporters",
- "provider.roots": [ "/libs/sling/replication/services/importers" ],
- "serviceType": "org.apache.sling.replication.packaging.ReplicationPackageImporter",
- "resourceProperties": [
- "sling:resourceType=sling/replication/service/importer",
- "sling:resourceSuperType=sling/replication/service",
-
- "name={name}"
- ]
-}
\ No newline at end of file
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/install/resources/services/org.apache.sling.replication.resources.impl.OsgiPropertiesResourceProviderFactory-triggers.json b/src/main/resources/SLING-CONTENT/libs/sling/replication/install/resources/services/org.apache.sling.replication.resources.impl.OsgiPropertiesResourceProviderFactory-triggers.json
deleted file mode 100644
index 14c715e..0000000
--- a/src/main/resources/SLING-CONTENT/libs/sling/replication/install/resources/services/org.apache.sling.replication.resources.impl.OsgiPropertiesResourceProviderFactory-triggers.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "jcr:primaryType": "sling:OsgiConfig",
- "name": "replicationTriggers",
- "provider.roots": [ "/libs/sling/replication/services/triggers" ],
- "serviceType": "org.apache.sling.replication.trigger.ReplicationTrigger",
- "resourceProperties": [
- "sling:resourceType=sling/replication/service/trigger",
- "sling:resourceSuperType=sling/replication/service",
-
- "name={name}"
- ]
-}
\ No newline at end of file
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/install/resources/settings/org.apache.sling.replication.resources.impl.OsgiPropertiesResourceProviderFactory-simpleAgents.json b/src/main/resources/SLING-CONTENT/libs/sling/replication/install/resources/settings/org.apache.sling.replication.resources.impl.OsgiPropertiesResourceProviderFactory-simpleAgents.json
deleted file mode 100644
index 7a81cd2..0000000
--- a/src/main/resources/SLING-CONTENT/libs/sling/replication/install/resources/settings/org.apache.sling.replication.resources.impl.OsgiPropertiesResourceProviderFactory-simpleAgents.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
- "jcr:primaryType": "sling:OsgiConfig",
- "name": "simpleAgents",
- "provider.roots": [ "/libs/sling/replication/settings/agents" ],
- "serviceType": "org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory",
- "providerType": "osgiConfig",
- "groupPrefix": "agents",
-
- "resourceProperties": [
- "sling:resourceType=sling/replication/setting/agent",
- "sling:resourceSuperType=sling/replication/setting",
- "name={name}",
- "packageExporter={packageExporter}",
- "packageImporter={packageImporter}"
- ]
-
-
-}
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-distribution-sample] 16/42: SLING-4132 -
fixed event listeners registration
Posted by ro...@apache.org.
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 2426062204dcf18060ecb0bcd87da5f9d2fdc01d
Author: Tommaso Teofili <to...@apache.org>
AuthorDate: Tue Nov 4 16:22:04 2014 +0000
SLING-4132 - fixed event listeners registration
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/replication/sample@1636636 13f79535-47bb-0310-9956-ffa450edef68
---
...esources.impl.OsgiPropertiesResourceProviderFactory-simpleAgents.json | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/install/resources/settings/org.apache.sling.replication.resources.impl.OsgiPropertiesResourceProviderFactory-simpleAgents.json b/src/main/resources/SLING-CONTENT/libs/sling/replication/install/resources/settings/org.apache.sling.replication.resources.impl.OsgiPropertiesResourceProviderFactory-simpleAgents.json
index a931c70..7a81cd2 100644
--- a/src/main/resources/SLING-CONTENT/libs/sling/replication/install/resources/settings/org.apache.sling.replication.resources.impl.OsgiPropertiesResourceProviderFactory-simpleAgents.json
+++ b/src/main/resources/SLING-CONTENT/libs/sling/replication/install/resources/settings/org.apache.sling.replication.resources.impl.OsgiPropertiesResourceProviderFactory-simpleAgents.json
@@ -6,7 +6,6 @@
"providerType": "osgiConfig",
"groupPrefix": "agents",
-
"resourceProperties": [
"sling:resourceType=sling/replication/setting/agent",
"sling:resourceSuperType=sling/replication/setting",
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-distribution-sample] 15/42: SLING-4120:
cleaned ReplicationQueueProvider of quueue creation/deletion semantics
Posted by ro...@apache.org.
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 6d442b4b74922e9b36fa104aafce6c94f0c1cfd2
Author: Marius Petria <mp...@apache.org>
AuthorDate: Fri Oct 31 08:50:10 2014 +0000
SLING-4120: cleaned ReplicationQueueProvider of quueue creation/deletion semantics
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/replication/sample@1635725 13f79535-47bb-0310-9956-ffa450edef68
---
...rg.apache.sling.event.jobs.QueueConfiguration-replication.json | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/install/org.apache.sling.event.jobs.QueueConfiguration-replication.json b/src/main/resources/SLING-CONTENT/libs/sling/replication/install/org.apache.sling.event.jobs.QueueConfiguration-replication.json
new file mode 100644
index 0000000..a75062b
--- /dev/null
+++ b/src/main/resources/SLING-CONTENT/libs/sling/replication/install/org.apache.sling.event.jobs.QueueConfiguration-replication.json
@@ -0,0 +1,8 @@
+{
+ "jcr:primaryType" : "sling:OsgiConfig",
+ "queue.name" : "org/apache/sling/replication/queue/{0}",
+ "queue.retries" : "-1",
+ "queue.topics": "org/apache/sling/replication/queue/*",
+ "queue.type" : "ORDERED"
+}
+
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-distribution-sample] 10/42: SLING-4052 -
cleaned up jcr pacakges
Posted by ro...@apache.org.
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 a820b02954992ee4195e8bd7e818476f0b743462
Author: Tommaso Teofili <to...@apache.org>
AuthorDate: Wed Oct 15 14:46:42 2014 +0000
SLING-4052 - cleaned up jcr pacakges
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/replication/sample@1632062 13f79535-47bb-0310-9956-ffa450edef68
---
....replication.agent.impl.SimpleReplicationAgentFactory-reverse.json | 4 ++--
....impl.exporter.AgentReplicationPackageExporterFactory-reverse.json | 4 +++-
....impl.exporter.LocalReplicationPackageExporterFactory-default.json | 2 +-
...importer.AdvancedRemoteReplicationPackageImporter-cache-flush.json | 2 +-
....impl.importer.LocalReplicationPackageImporterFactory-default.json | 2 +-
5 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-reverse.json b/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-reverse.json
index 595c8ed..3d056aa 100644
--- a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-reverse.json
+++ b/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-reverse.json
@@ -4,10 +4,11 @@
"isPassive": true,
+ "serviceName" : "replicationService",
+
"packageExporter": [
"type=local",
"packageBuilder/type=vlt",
- "packageBuilder/servicename=replicationService"
],
"packageExporterStrategy" : [
@@ -18,7 +19,6 @@
"packageImporter": [
"type=local",
"packageBuilder/type=vlt",
- "packageBuilder/servicename=replicationService"
],
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.packaging.impl.exporter.AgentReplicationPackageExporterFactory-reverse.json b/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.packaging.impl.exporter.AgentReplicationPackageExporterFactory-reverse.json
index a6b5348..3495bc9 100644
--- a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.packaging.impl.exporter.AgentReplicationPackageExporterFactory-reverse.json
+++ b/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.packaging.impl.exporter.AgentReplicationPackageExporterFactory-reverse.json
@@ -2,6 +2,8 @@
"jcr:primaryType": "sling:OsgiConfig",
"name": "reverse",
- "ReplicationPackageBuilder.target": "(name=vlt)",
+ "packageBuilder": [ "type=vlt" ],
+ "agent" : [ "type=service"],
+
"ReplicationAgent.target": "(name=reverse)"
}
\ No newline at end of file
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.packaging.impl.exporter.LocalReplicationPackageExporterFactory-default.json b/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.packaging.impl.exporter.LocalReplicationPackageExporterFactory-default.json
index 55fe7ee..84cc756 100644
--- a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.packaging.impl.exporter.LocalReplicationPackageExporterFactory-default.json
+++ b/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.packaging.impl.exporter.LocalReplicationPackageExporterFactory-default.json
@@ -2,5 +2,5 @@
"jcr:primaryType": "sling:OsgiConfig",
"name": "default",
- "ReplicationPackageBuilder.target": "(name=vlt)"
+ "packageBuilder": [ "type=vlt" ]
}
\ No newline at end of file
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.packaging.impl.importer.AdvancedRemoteReplicationPackageImporter-cache-flush.json b/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.packaging.impl.importer.AdvancedRemoteReplicationPackageImporter-cache-flush.json
index f3cd9ca..aca7432 100644
--- a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.packaging.impl.importer.AdvancedRemoteReplicationPackageImporter-cache-flush.json
+++ b/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.packaging.impl.importer.AdvancedRemoteReplicationPackageImporter-cache-flush.json
@@ -8,6 +8,6 @@
"delete -> Change : REMOVE" ],
"useCustomBody": true,
"customBody": "",
- "TransportAuthenticationProviderFactory.target": "(name=nop)",
+ "TransportAuthenticationProvider.target": "(name=nop)",
"endpoints": [ "http://localhost:8000/invalidatecache" ]
}
\ No newline at end of file
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.packaging.impl.importer.LocalReplicationPackageImporterFactory-default.json b/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.packaging.impl.importer.LocalReplicationPackageImporterFactory-default.json
index 9381551..b8eed8b 100644
--- a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.packaging.impl.importer.LocalReplicationPackageImporterFactory-default.json
+++ b/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.packaging.impl.importer.LocalReplicationPackageImporterFactory-default.json
@@ -1,5 +1,5 @@
{
"jcr:primaryType": "sling:OsgiConfig",
"name": "default",
- "ReplicationPackageBuilder.target": "(name=vlt)"
+ "packageBuilder": [ "type=vlt" ]
}
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-distribution-sample] 27/42: SLING-4153 -
fixed transport API to just expose the secret
Posted by ro...@apache.org.
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 c448282c471be831c8ec48b1fac8033501c19a44
Author: Tommaso Teofili <to...@apache.org>
AuthorDate: Fri Dec 5 08:08:59 2014 +0000
SLING-4153 - fixed transport API to just expose the secret
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/distribution/sample@1643180 13f79535-47bb-0310-9956-ffa450edef68
---
...dentialsTransportAuthenticationProviderFactory-publishAdmin.json | 6 ------
...dentialsTransportAuthenticationProviderFactory-publishAdmin.json | 6 ------
...er.RemoteDistributionPackageExporterFactory-publish-reverse.json | 2 +-
...l.importer.RemoteDistributionPackageImporterFactory-publish.json | 2 +-
...l.exporter.RemoteDistributionPackageExporterFactory-pubsync.json | 2 +-
...l.importer.RemoteDistributionPackageImporterFactory-pubsync.json | 2 +-
...ution.agent.impl.SimpleDistributionAgentFactory-cache-flush.json | 1 -
...orter.AdvancedRemoteDistributionPackageImporter-cache-flush.json | 1 -
.../sling/distribution/settings.author/defaults/agents/global.json | 4 ++--
9 files changed, 6 insertions(+), 20 deletions(-)
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/org.apache.sling.distribution.transport.authentication.impl.UserCredentialsTransportAuthenticationProviderFactory-publishAdmin.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/org.apache.sling.distribution.transport.authentication.impl.UserCredentialsTransportAuthenticationProviderFactory-publishAdmin.json
deleted file mode 100644
index 10fbe4d..0000000
--- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/org.apache.sling.distribution.transport.authentication.impl.UserCredentialsTransportAuthenticationProviderFactory-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/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
deleted file mode 100644
index 10fbe4d..0000000
--- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.osgi.author/org.apache.sling.distribution.transport.authentication.impl.UserCredentialsTransportAuthenticationProviderFactory-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.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
index b4c6670..d9e5834 100644
--- 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
@@ -8,5 +8,5 @@
"http://localhost:4503/libs/sling/distribution/services/exporters/reverse"
],
"packageBuilder.target" : "(name=vlt)",
- "transportAuthenticationProvider.target" : "(name=publishAdmin)"
+ "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/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
index dd61b19..4ab3f51 100644
--- 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
@@ -8,5 +8,5 @@
"http://localhost:4503/libs/sling/distribution/services/importers/default"
],
"packageBuilder.target" : "(name=vlt)",
- "transportAuthenticationProvider.target" : "(name=publishAdmin)"
+ "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.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
index fdebdae..907697c 100644
--- 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
@@ -13,7 +13,7 @@
"endpoints.strategy": "All",
"packageBuilder.target" : "(name=vlt)",
- "transportAuthenticationProvider.target" : "(name=publishAdmin)"
+ "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
index d95099e..d381879 100644
--- 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
@@ -15,5 +15,5 @@
"packageBuilder.target" : "(name=vlt)",
- "transportAuthenticationProvider.target" : "(name=publishAdmin)"
+ "distributionTransportSecretProvider.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
index ad5ce6e..c3825df 100644
--- 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
@@ -4,7 +4,6 @@
"enabled" : false,
-
"requestAuthorizationStrategy.target" : "privilegeRead"
}
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.osgi.publish/cache-flush/org.apache.sling.distribution.packaging.impl.importer.AdvancedRemoteDistributionPackageImporter-cache-flush.json
index c1160b6..59c2119 100644
--- 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.osgi.publish/cache-flush/org.apache.sling.distribution.packaging.impl.importer.AdvancedRemoteDistributionPackageImporter-cache-flush.json
@@ -9,6 +9,5 @@
"delete -> Change : REMOVE" ],
"useCustomBody": true,
"customBody": "",
- "TransportAuthenticationProvider.target": "(name=nop)",
"endpoints": [ "http://localhost:8000/invalidatecache" ]
}
\ No newline at end of file
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.author/defaults/agents/global.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.author/defaults/agents/global.json
index f107e00..2a8a1f3 100644
--- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.author/defaults/agents/global.json
+++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.author/defaults/agents/global.json
@@ -21,7 +21,7 @@
"name" : "vlt"
},
- "transportAuthenticationProvider" : {
+ "distributionTransportSecretProvider" : {
"kind" : "transportAuthenticator",
"type" : "service",
"name" : "publishAdmin"
@@ -39,7 +39,7 @@
"name" : "vlt"
},
- "transportAuthenticationProvider" : {
+ "distributionTransportSecretProvider" : {
"kind" : "transportAuthenticator",
"type" : "service",
"name" : "publishAdmin"
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-distribution-sample] 09/42: SLING-3899 -
applied Marius patch to add the resource resolved to all APIs
Posted by ro...@apache.org.
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 953e6111db02cc1525e058bd77a64ca7ecb7e6de
Author: Tommaso Teofili <to...@apache.org>
AuthorDate: Tue Oct 14 15:09:12 2014 +0000
SLING-3899 - applied Marius patch to add the resource resolved to all APIs
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/replication/sample@1631780 13f79535-47bb-0310-9956-ffa450edef68
---
...nt.impl.CoordinatingReplicationAgentFactory-pubsync.json | 10 ++++++++--
....impl.SimpleReplicationAgentFactory-publish-reverse.json | 12 +++++++++---
...on.agent.impl.SimpleReplicationAgentFactory-publish.json | 13 +++++++++----
...gent.impl.SimpleReplicationAgentFactory-cache-flush.json | 4 ++++
...on.agent.impl.SimpleReplicationAgentFactory-reverse.json | 5 +++++
5 files changed, 35 insertions(+), 9 deletions(-)
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.CoordinatingReplicationAgentFactory-pubsync.json b/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.CoordinatingReplicationAgentFactory-pubsync.json
index 68758f6..41d4e8e 100644
--- a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.CoordinatingReplicationAgentFactory-pubsync.json
+++ b/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.CoordinatingReplicationAgentFactory-pubsync.json
@@ -2,11 +2,13 @@
"jcr:primaryType": "sling:OsgiConfig",
"name": "pubsync",
+ "serviceName" : "replicationService",
+
+
"packageExporter": [
"authenticationProvider/type=service",
"packageBuilder/type=vlt",
- "packageBuilder/servicename=replicationService",
"endpoints[0]=http://localhost:4503/libs/sling/replication/services/exporters/reverse-pubsync",
"endpoints[1]=http://localhost:4504/libs/sling/replication/services/exporters/reverse-pubsync",
@@ -14,11 +16,15 @@
"endpoints.strategy=All"
],
+ "packageExporterStrategy" : [
+ "type=privilege",
+ "jcrPrivilege=jcr:read"
+ ],
+
"packageImporter": [
"authenticationProvider/type=service",
"packageBuilder/type=vlt",
- "packageBuilder/servicename=replicationService",
"endpoints[0]=http://localhost:4503/libs/sling/replication/services/importers/default",
"endpoints[1]=http://localhost:4504/libs/sling/replication/services/importers/default",
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-publish-reverse.json b/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-publish-reverse.json
index 8cb8a95..e70dd38 100644
--- a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-publish-reverse.json
+++ b/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-publish-reverse.json
@@ -4,20 +4,26 @@
"enabled" : true,
+ "serviceName" : "replicationService",
+
+
"packageExporter": [
"type=remote",
"endpoints[0]=http://localhost:4503/libs/sling/replication/services/exporters/reverse",
"authenticationProvider/type=service",
- "packageBuilder/type=vlt",
- "packageBuilder/servicename=replicationService"
+ "packageBuilder/type=vlt"
+ ],
+
+ "packageExporterStrategy" : [
+ "type=privilege",
+ "jcrPrivilege=jcr:read"
],
"packageImporter": [
"type=local",
"packageBuilder/type=vlt",
- "packageBuilder/servicename=replicationService"
],
"trigger0": [
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-publish.json b/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-publish.json
index c08c6f0..9eccc41 100644
--- a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-publish.json
+++ b/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-publish.json
@@ -2,10 +2,16 @@
"jcr:primaryType": "sling:OsgiConfig",
"name": "publish",
+ "serviceName" : "replicationService",
+
"packageExporter": [
"type=local",
- "packageBuilder/type=vlt",
- "packageBuilder/servicename=replicationService"
+ "packageBuilder/type=vlt"
+ ],
+
+ "packageExporterStrategy" : [
+ "type=privilege",
+ "jcrPrivilege=jcr:read"
],
"packageImporter": [
@@ -14,8 +20,7 @@
"authenticationProvider/type=service",
- "packageBuilder/type=vlt",
- "packageBuilder/servicename=replicationService"
+ "packageBuilder/type=vlt"
],
"queueProvider.target" : "(name=sjh)",
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-cache-flush.json b/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-cache-flush.json
index ee1b01d..0920457 100644
--- a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-cache-flush.json
+++ b/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-cache-flush.json
@@ -7,6 +7,10 @@
"name=void"
],
+ "packageExporterStrategy" : [
+ "type=default"
+ ],
+
"packageImporter": [
"type=service",
"name=cache-flush"
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-reverse.json b/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-reverse.json
index 56afbad..595c8ed 100644
--- a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-reverse.json
+++ b/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-reverse.json
@@ -10,6 +10,11 @@
"packageBuilder/servicename=replicationService"
],
+ "packageExporterStrategy" : [
+ "type=privilege",
+ "jcrPrivilege=jcr:read"
+ ],
+
"packageImporter": [
"type=local",
"packageBuilder/type=vlt",
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-distribution-sample] 12/42: SLING-3899 -
using authorization strategy for checking resource resolver
Posted by ro...@apache.org.
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 47dfebf35226af7de46f0d4a4096adb467f34794
Author: Tommaso Teofili <to...@apache.org>
AuthorDate: Thu Oct 16 07:03:31 2014 +0000
SLING-3899 - using authorization strategy for checking resource resolver
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/replication/sample@1632218 13f79535-47bb-0310-9956-ffa450edef68
---
...tion.agent.impl.SimpleReplicationAgentFactory-publish-reverse.json | 2 +-
....replication.agent.impl.SimpleReplicationAgentFactory-publish.json | 2 +-
...lication.agent.impl.SimpleReplicationAgentFactory-cache-flush.json | 2 +-
....replication.agent.impl.SimpleReplicationAgentFactory-reverse.json | 4 ++--
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-publish-reverse.json b/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-publish-reverse.json
index e70dd38..d6b68cb 100644
--- a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-publish-reverse.json
+++ b/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-publish-reverse.json
@@ -16,7 +16,7 @@
"packageBuilder/type=vlt"
],
- "packageExporterStrategy" : [
+ "requestAuthorizationStrategy" : [
"type=privilege",
"jcrPrivilege=jcr:read"
],
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-publish.json b/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-publish.json
index 9eccc41..f6ab408 100644
--- a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-publish.json
+++ b/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-publish.json
@@ -9,7 +9,7 @@
"packageBuilder/type=vlt"
],
- "packageExporterStrategy" : [
+ "requestAuthorizationStrategy" : [
"type=privilege",
"jcrPrivilege=jcr:read"
],
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-cache-flush.json b/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-cache-flush.json
index 0920457..22e474e 100644
--- a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-cache-flush.json
+++ b/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-cache-flush.json
@@ -7,7 +7,7 @@
"name=void"
],
- "packageExporterStrategy" : [
+ "requestAuthorizationStrategy" : [
"type=default"
],
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-reverse.json b/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-reverse.json
index 3d056aa..a4cec76 100644
--- a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-reverse.json
+++ b/src/main/resources/SLING-CONTENT/libs/sling/replication/install.publish/org.apache.sling.replication.agent.impl.SimpleReplicationAgentFactory-reverse.json
@@ -8,10 +8,10 @@
"packageExporter": [
"type=local",
- "packageBuilder/type=vlt",
+ "packageBuilder/type=vlt"
],
- "packageExporterStrategy" : [
+ "requestAuthorizationStrategy" : [
"type=privilege",
"jcrPrivilege=jcr:read"
],
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-distribution-sample] 33/42: SLING-4009:
implementing multiple queue dispatch strategy to have one queue per
receiving endpoint
Posted by ro...@apache.org.
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 3a5baef56fbbb2054dc32fd6297f51d8369e0095
Author: Marius Petria <mp...@apache.org>
AuthorDate: Mon Jan 5 10:40:33 2015 +0000
SLING-4009: implementing multiple queue dispatch strategy to have one queue per receiving endpoint
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/distribution/sample@1649499 13f79535-47bb-0310-9956-ffa450edef68
---
.../settings.author/agents/publish-multiple.json | 11 ++++++++
.../settings.author/agents/publish-reverse.json | 13 +++------
.../settings.author/agents/publish.json | 15 +++--------
.../settings.author/defaults/agents/forward.json | 31 ++++++++++++++++++++++
.../settings.author/defaults/agents/reverse.json | 31 ++++++++++++++++++++++
.../settings.publish/agents/reverse.json | 4 ---
6 files changed, 80 insertions(+), 25 deletions(-)
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.author/agents/publish-multiple.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.author/agents/publish-multiple.json
new file mode 100644
index 0000000..8ee38b4
--- /dev/null
+++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.author/agents/publish-multiple.json
@@ -0,0 +1,11 @@
+{
+ "type" : "forward",
+
+ "serviceName" : "distributionService",
+
+
+ "packageImporter.endpoints" : [
+ "endpoint1=http://localhost:4503/libs/sling/distribution/services/importers/default",
+ "endpoint2=http://localhost:4503/libs/sling/distribution/services/importers/default"
+ ]
+}
\ No newline at end of file
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.author/agents/publish-reverse.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.author/agents/publish-reverse.json
index 59996d1..3fee975 100644
--- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.author/agents/publish-reverse.json
+++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.author/agents/publish-reverse.json
@@ -1,18 +1,11 @@
{
- "type" : "simple",
+ "type" : "reverse",
"serviceName" : "distributionService",
- "packageExporter": {
- "type": "remote",
- "endpoints" : [
+ "packageExporter.endpoints": [
"http://localhost:4503/libs/sling/distribution/services/exporters/reverse"
- ]
- },
-
- "packageImporter": {
- "type" : "local"
- },
+ ],
"triggers" : {
"scheduled" : {
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.author/agents/publish.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.author/agents/publish.json
index f65aaac..55c6dbc 100644
--- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.author/agents/publish.json
+++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.author/agents/publish.json
@@ -1,17 +1,10 @@
{
- "type" : "simple",
+ "type" : "forward",
"serviceName" : "distributionService",
- "packageExporter": {
- "type": "local"
- },
- "packageImporter": {
- "type" : "remote",
-
- "endpoints" : [
- "http://localhost:4503/libs/sling/distribution/services/importers/default"
- ]
- }
+ "packageImporter.endpoints" : [
+ "http://localhost:4503/libs/sling/distribution/services/importers/default"
+ ]
}
\ No newline at end of file
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.author/defaults/agents/forward.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.author/defaults/agents/forward.json
new file mode 100644
index 0000000..66b9a20
--- /dev/null
+++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.author/defaults/agents/forward.json
@@ -0,0 +1,31 @@
+{
+ "jcr:primaryType" : "nt:unstructured",
+
+ "kind" : "agent",
+
+ "isResource" : "true",
+
+ "requestAuthorizationStrategy" : {
+ "kind" : "requestAuthorization",
+ "type" : "service",
+ "name" : "privilegeRead"
+ },
+
+ "packageBuilder" : {
+ "kind" : "packageBuilder",
+
+ "type" : "service",
+ "name" : "vlt"
+ },
+
+ "transportSecretProvider" : {
+ "kind" : "transportSecretProvider",
+ "type" : "service",
+ "name" : "publishAdmin"
+ },
+
+ "triggers" : {
+ "kind" : "trigger",
+ "type" : "list"
+ }
+}
\ No newline at end of file
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.author/defaults/agents/reverse.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.author/defaults/agents/reverse.json
new file mode 100644
index 0000000..66b9a20
--- /dev/null
+++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.author/defaults/agents/reverse.json
@@ -0,0 +1,31 @@
+{
+ "jcr:primaryType" : "nt:unstructured",
+
+ "kind" : "agent",
+
+ "isResource" : "true",
+
+ "requestAuthorizationStrategy" : {
+ "kind" : "requestAuthorization",
+ "type" : "service",
+ "name" : "privilegeRead"
+ },
+
+ "packageBuilder" : {
+ "kind" : "packageBuilder",
+
+ "type" : "service",
+ "name" : "vlt"
+ },
+
+ "transportSecretProvider" : {
+ "kind" : "transportSecretProvider",
+ "type" : "service",
+ "name" : "publishAdmin"
+ },
+
+ "triggers" : {
+ "kind" : "trigger",
+ "type" : "list"
+ }
+}
\ No newline at end of file
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.publish/agents/reverse.json b/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.publish/agents/reverse.json
index 267f3a1..79ae41f 100644
--- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.publish/agents/reverse.json
+++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/settings.publish/agents/reverse.json
@@ -7,9 +7,5 @@
"packageExporter": {
"type": "local"
- },
-
- "packageImporter": {
- "type" : "local"
}
}
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-distribution-sample] 19/42: SLING-4140 -
renamed and moved Sling Replication to Sling Content Distribution
Posted by ro...@apache.org.
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 877bcc604a54d036758c274b36e4dd8cc09e4e21
Author: Tommaso Teofili <to...@apache.org>
AuthorDate: Fri Nov 7 10:45:49 2014 +0000
SLING-4140 - renamed and moved Sling Replication to Sling Content Distribution
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/distribution/sample@1637339 13f79535-47bb-0310-9956-ffa450edef68
---
.../libs/sling/distribution/service/agent/replicate.html.esp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/distribution/service/agent/replicate.html.esp b/src/main/resources/SLING-CONTENT/libs/sling/distribution/service/agent/replicate.html.esp
index b94cfc8..9612ed7 100644
--- a/src/main/resources/SLING-CONTENT/libs/sling/distribution/service/agent/replicate.html.esp
+++ b/src/main/resources/SLING-CONTENT/libs/sling/distribution/service/agent/replicate.html.esp
@@ -4,7 +4,7 @@ var pit = valueMap.keySet().iterator();
%>
<html>
<body>
- <h1>Replicate: <%= valueMap.get("name") %></h1>
+ <h1>Distribute: <%= valueMap.get("name") %></h1>
<form action="<%= request.contextPath + resource.path %>" method="POST">
Path: <input type="text" name="path"><br>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-distribution-sample] 41/42:
[maven-release-plugin] prepare release
org.apache.sling.distribution.sample-0.1.0
Posted by ro...@apache.org.
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 6bd9959a0b581edb33d402b8004006d3af3e8c92
Author: Tommaso Teofili <to...@apache.org>
AuthorDate: Tue Mar 24 14:12:19 2015 +0000
[maven-release-plugin] prepare release org.apache.sling.distribution.sample-0.1.0
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/distribution/sample@1668900 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index a250a62..ad46fbc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,8 +17,7 @@
specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<!-- ======================================================================= -->
<!-- P A R E N T P R O J E C T -->
@@ -33,7 +32,7 @@
<!-- P R O J E C T -->
<!-- ======================================================================= -->
<artifactId>org.apache.sling.distribution.sample</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>0.1.0</version>
<packaging>bundle</packaging>
<name>Apache Sling Distribution Sample</name>
@@ -42,9 +41,9 @@
</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/distribution/sample</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/distribution/sample</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/sample</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.distribution.sample-0.1.0</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.distribution.sample-0.1.0</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.distribution.sample-0.1.0</url>
</scm>
<!-- ======================================================================= -->
@@ -88,7 +87,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.distribution.core</artifactId>
- <version>${project.version}</version>
+ <version>0.1.0</version>
<scope>provided</scope>
</dependency>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-distribution-sample] 05/42: SLING-3992 -
added coordinating agent(factory), fixed some defaults (scheduling,
remote polling)
Posted by ro...@apache.org.
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 f9e18f3cf06a3cd748b9de04e48bae3732acd1b6
Author: Tommaso Teofili <to...@apache.org>
AuthorDate: Thu Oct 2 09:47:24 2014 +0000
SLING-3992 - added coordinating agent(factory), fixed some defaults (scheduling,remote polling)
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/replication/sample@1628917 13f79535-47bb-0310-9956-ffa450edef68
---
...oordinatingReplicationAgentFactory-pubsync.json | 42 ++++++++++++++++++++++
1 file changed, 42 insertions(+)
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.CoordinatingReplicationAgentFactory-pubsync.json b/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.CoordinatingReplicationAgentFactory-pubsync.json
new file mode 100644
index 0000000..f45df35
--- /dev/null
+++ b/src/main/resources/SLING-CONTENT/libs/sling/replication/install.author/org.apache.sling.replication.agent.impl.CoordinatingReplicationAgentFactory-pubsync.json
@@ -0,0 +1,42 @@
+{
+ "jcr:primaryType": "sling:OsgiConfig",
+ "name": "pubsync",
+ "type": "coordinating",
+ "enabled" : false,
+
+ "packageExporter": [
+ "authenticationProvider/type=service",
+ "authenticationProvider/name=publishAdmin",
+
+ "packageBuilder/type=vlt",
+ "packageBuilder/servicename=replicationService",
+
+ "endpoints[0]=http://localhost:4503/libs/sling/replication/services/exporters/reverse",
+ "endpoints[1]=http://localhost:4504/libs/sling/replication/services/exporters/reverse",
+ "endpoints[2]=http://localhost:4505/libs/sling/replication/services/exporters/reverse",
+ "endpoints.strategy=All"
+ ],
+
+ "packageImporter": [
+ "authenticationProvider/type=service",
+ "authenticationProvider/name=publishAdmin",
+
+ "packageBuilder/type=vlt",
+ "packageBuilder/servicename=replicationService",
+
+ "endpoints[0]=http://localhost:4503/libs/sling/replication/services/importers/default",
+ "endpoints[1]=http://localhost:4504/libs/sling/replication/services/importers/default",
+ "endpoints[2]=http://localhost:4505/libs/sling/replication/services/importers/default",
+ "endpoints.strategy=All"
+ ],
+
+ "queueProvider": [
+ "type=service",
+ "name=sjh"
+ ],
+
+ "queueDistributionStrategy": [
+ "type=service",
+ "name=error"
+ ]
+}
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-distribution-sample] 02/42: SLING-3978 -
adjusted service user mapping to match the core sybmolic name
Posted by ro...@apache.org.
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 dae9ac18a1745d344ca60732d4d07630f0e8a8b0
Author: Tommaso Teofili <to...@apache.org>
AuthorDate: Mon Sep 29 13:53:35 2014 +0000
SLING-3978 - adjusted service user mapping to match the core sybmolic name
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/replication/sample@1628183 13f79535-47bb-0310-9956-ffa450edef68
---
...rviceusermapping.impl.ServiceUserMapperImpl.amended-replication.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/install/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-replication.json b/src/main/resources/SLING-CONTENT/libs/sling/replication/install/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-replication.json
index 14729c8..33c0a62 100644
--- a/src/main/resources/SLING-CONTENT/libs/sling/replication/install/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-replication.json
+++ b/src/main/resources/SLING-CONTENT/libs/sling/replication/install/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-replication.json
@@ -1,5 +1,5 @@
{
"jcr:primaryType": "sling:OsgiConfig",
"user.default": "",
- "user.mapping": "org.apache.sling.replication:replicationService=admin"
+ "user.mapping": "org.apache.sling.replication.core:replicationService=admin"
}
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-distribution-sample] 11/42: SLING-4052 -
cleaned up jcr pacakges
Posted by ro...@apache.org.
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 12e552a444782f5c67de639e2058ff7519d893e2
Author: Tommaso Teofili <to...@apache.org>
AuthorDate: Wed Oct 15 14:49:14 2014 +0000
SLING-4052 - cleaned up jcr pacakges
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/replication/sample@1632066 13f79535-47bb-0310-9956-ffa450edef68
---
...ation.impl.vlt.FileVaultReplicationPackageBuilderFactory-vlt.json | 5 -----
1 file changed, 5 deletions(-)
diff --git a/src/main/resources/SLING-CONTENT/libs/sling/replication/install/org.apache.sling.replication.serialization.impl.vlt.FileVaultReplicationPackageBuilderFactory-vlt.json b/src/main/resources/SLING-CONTENT/libs/sling/replication/install/org.apache.sling.replication.serialization.impl.vlt.FileVaultReplicationPackageBuilderFactory-vlt.json
deleted file mode 100644
index 7ed8af7..0000000
--- a/src/main/resources/SLING-CONTENT/libs/sling/replication/install/org.apache.sling.replication.serialization.impl.vlt.FileVaultReplicationPackageBuilderFactory-vlt.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "jcr:primaryType": "sling:OsgiConfig",
- "name": "vlt",
- "servicename": "replicationService"
-}
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.