SLING-4149: renaming factory to resource based & adding defaults
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1638116 13f79535-47bb-0310-9956-ffa450edef68
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 64%
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
