You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2018/07/27 08:34:28 UTC
[sling-org-apache-sling-feature] branch master updated: Distinguish
between choices and options
This is an automated email from the ASF dual-hosted git repository.
cziegeler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-feature.git
The following commit(s) were added to refs/heads/master by this push:
new 73e0d12 Distinguish between choices and options
73e0d12 is described below
commit 73e0d127de1a7da3f4f13624c9dd08eeb512bbf7
Author: Carsten Ziegeler <cz...@adobe.com>
AuthorDate: Fri Jul 27 10:34:22 2018 +0200
Distinguish between choices and options
---
appconf.md | 54 ++++++++++++++++++++++++++++--------------------------
1 file changed, 28 insertions(+), 26 deletions(-)
diff --git a/appconf.md b/appconf.md
index d1ad3ea..745c825 100644
--- a/appconf.md
+++ b/appconf.md
@@ -11,37 +11,39 @@ A application configuration for such use cases could look like this:
"repository" : [
"org.apache.sling:org.apache.sling.portal:1.0."
],
+ "choices" : [
+ [
+ {
+ "name" : "author",
+ "features" : [
+ "org.apache.sling:org.apache.sling.cms:1.0.0"
+ ],
+ "variables" : {
+ "service_id" : "author"
+ },
+ options : {
+ "jsp" : true
+ }
+ },
+ {
+ "name" : "publish",
+ "variables" : {
+ "service_id" : "publish"
+ },
+ "features" : [
+ "org.apache.sling:org.apache.sling.cache:1.3.6"
+ ],
+ }
+ ],
+ ]
"options" : {
"jsp" : {
"features" : [
"org.apache.sling:org.apache.sling.scripting.jsp:1.0.0"
]
},
- "author" : {
- "features" : [
- "org.apache.sling:org.apache.sling.cms:1.0.0"
- ],
- "variables" : {
- "service_id" : "author"
- },
- "activation" : {
- "publish" : false,
- "jsp" : true
- }
- },
- "publish" : {
- "features" : [
- "org.apache.sling:org.apache.sling.cache:1.3.6"
- ],
- "variables" : {
- "service_id" : "publish"
- },
- "activation" : {
- "author" : false
- }
- },
- "samples" : {
- "options" : {
+ "samplecontent" : {
+ "choices" : {
"author" : {
"features" : [
"org.apache.sling:org.apache.sling.samples.author:1.0.0"
@@ -56,7 +58,7 @@ A application configuration for such use cases could look like this:
}
},
"defaults" : {
- "options": ["author"]
+ "options": []
},
"framework" : {
"id" : "org.apache.felix:org.apache.felix.framework:6.0.0"