You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by dk...@apache.org on 2020/09/29 04:22:30 UTC
[sling-org-apache-sling-app-cms] branch master updated: Updated to
the structure / dependencies of Sling Starter and the latest feature
launcher release
This is an automated email from the ASF dual-hosted git repository.
dklco pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-app-cms.git
The following commit(s) were added to refs/heads/master by this push:
new f51dc36 Updated to the structure / dependencies of Sling Starter and the latest feature launcher release
f51dc36 is described below
commit f51dc36fd68b02f26001326426d895d7805b72c9
Author: Dan Klco <dk...@apache.org>
AuthorDate: Tue Sep 29 00:22:15 2020 -0400
Updated to the structure / dependencies of Sling Starter and the latest feature launcher release
---
feature/pom.xml | 32 +--
.../main/features/{cms_cms.json => app/cms.json} | 0
.../composum.json} | 1 -
.../main/features/{sling_sling.json => base.json} | 222 +++++++++------------
.../{launchpad_launchpad.json => boot.json} | 133 +++++++++++-
feature/src/main/features/boot_boot.json | 131 ------------
...-caconfig_sling-caconfig.json => caconfig.json} | 1 -
...scovery_sling-discovery.json => discovery.json} | 0
feature/src/main/features/distribution.json | 1 -
.../{sling-event_sling-event.json => event.json} | 0
...althcheck_healthcheck.json => healthcheck.json} | 0
...onexporter.json => models-jacksonexporter.json} | 0
.../main/features/node-store-segment/segment.json | 16 --
.../node-store}/composite-runtime.json | 17 +-
.../node-store}/composite-seed.json | 9 -
.../src/main/features/oak/node-store/segment.json | 13 ++
.../features/{oak_oak.json => oak/oak_base.json} | 112 ++++++++++-
feature/src/main/features/repoinit_repoinit.json | 74 -------
.../runmode-author.json => runmodes/author.json} | 1 +
.../renderer.json} | 1 +
.../standalone.json} | 1 +
.../{scripting_sling.json => scripting.json} | 0
.../src/main/features/standalone_standalone.json | 16 --
...ation_sling-validation.json => validation.json} | 0
feature/src/main/features/webapp_webapp.json | 4 -
feature/src/main/features/webconsole.json | 66 ++++++
26 files changed, 428 insertions(+), 423 deletions(-)
diff --git a/feature/pom.xml b/feature/pom.xml
index 0136f88..adc97c5 100644
--- a/feature/pom.xml
+++ b/feature/pom.xml
@@ -77,41 +77,41 @@
<aggregate>
<classifier>slingcms-standalone</classifier>
<filesInclude>**/*.json</filesInclude>
- <filesExclude>node-store-composite/composite-*.json</filesExclude>
- <filesExclude>runmode-author/*.json</filesExclude>
- <filesExclude>runmode-renderer/*.json</filesExclude>
+ <filesExclude>oak/node-store/composite-*.json</filesExclude>
+ <filesExclude>runmodes/author.json</filesExclude>
+ <filesExclude>runmodes/renderer.json</filesExclude>
<title>Sling CMS - Standalone</title>
</aggregate>
<aggregate>
<classifier>slingcms-author</classifier>
<filesInclude>**/*.json</filesInclude>
- <filesExclude>node-store-composite/composite-*.json</filesExclude>
- <filesExclude>runmode-renderer/*.json</filesExclude>
- <filesExclude>runmode-standalone/*.json</filesExclude>
+ <filesExclude>oak/node-store/composite-*.json</filesExclude>
+ <filesExclude>runmodes/standalone.json</filesExclude>
+ <filesExclude>runmodes/renderer.json</filesExclude>
<title>Sling CMS - Author</title>
</aggregate>
<aggregate>
<classifier>slingcms-renderer</classifier>
<filesInclude>**/*.json</filesInclude>
- <filesExclude>node-store-composite/composite-*.json</filesExclude>
- <filesExclude>runmode-author/*.json</filesExclude>
- <filesExclude>runmode-standalone/*.json</filesExclude>
+ <filesExclude>oak/node-store/composite-*.json</filesExclude>
+ <filesExclude>runmodes/standalone.json</filesExclude>
+ <filesExclude>runmodes/author.json</filesExclude>
<title>Sling CMS - Renderer</title>
</aggregate>
<aggregate>
<classifier>slingcms-composite-seed</classifier>
<filesInclude>**/*.json</filesInclude>
- <filesExclude>node-store-composite/composite-runtime.json</filesExclude>
- <filesExclude>node-store-segment/segment.json</filesExclude>
- <filesExclude>runmode*/*.json</filesExclude>
+ <filesExclude>oak/node-store/composite-seed.json</filesExclude>
+ <filesExclude>oak/node-store/segment.json</filesExclude>
+ <filesExclude>runmodes/*.json</filesExclude>
<title>Sling CMS - Composite Node Store Seed</title>
</aggregate>
<aggregate>
<classifier>slingcms-composite-runtime</classifier>
<filesInclude>**/*.json</filesInclude>
- <filesExclude>node-store-composite/composite-seed.json</filesExclude>
- <filesExclude>node-store-segment/segment.json</filesExclude>
- <filesExclude>runmode*/*.json</filesExclude>
+ <filesExclude>oak/node-store/composite-seed.json</filesExclude>
+ <filesExclude>oak/node-store/segment.json</filesExclude>
+ <filesExclude>runmodes/*.json</filesExclude>
<title>Sling CMS - Composite Node Store Runtime</title>
</aggregate>
</aggregates>
@@ -231,7 +231,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.feature.launcher</artifactId>
- <version>1.1.4</version>
+ <version>1.1.6</version>
</dependency>
</dependencies>
</project>
diff --git a/feature/src/main/features/cms_cms.json b/feature/src/main/features/app/cms.json
similarity index 100%
rename from feature/src/main/features/cms_cms.json
rename to feature/src/main/features/app/cms.json
diff --git a/feature/src/main/features/composum_composum-nodes.json b/feature/src/main/features/app/composum.json
similarity index 89%
rename from feature/src/main/features/composum_composum-nodes.json
rename to feature/src/main/features/app/composum.json
index 0d54fdf..042e1de 100644
--- a/feature/src/main/features/composum_composum-nodes.json
+++ b/feature/src/main/features/app/composum.json
@@ -1,6 +1,5 @@
{
- "id":"org.apache.sling:org.apache.sling.cms.feature:slingfeature:composum_composum-nodes:${cms.version}",
"bundles":[
{
"id":"com.composum.sling.core:composum-sling-core-commons:${composum.version}",
diff --git a/feature/src/main/features/sling_sling.json b/feature/src/main/features/base.json
similarity index 70%
rename from feature/src/main/features/sling_sling.json
rename to feature/src/main/features/base.json
index 2d2f1e3..4537744 100644
--- a/feature/src/main/features/sling_sling.json
+++ b/feature/src/main/features/base.json
@@ -1,6 +1,5 @@
{
- "id":"org.apache.sling:org.apache.sling.cms.feature:slingfeature:sling:${cms.version}",
"bundles":[
{
"id":"commons-codec:commons-codec:1.14",
@@ -8,7 +7,7 @@
},
{
"id":"commons-collections:commons-collections:3.2.2",
- "start-order":"10"
+ "start-order":"15"
},
{
"id":"javax.mail:mail:1.5.0-b01",
@@ -16,7 +15,7 @@
},
{
"id":"org.apache.commons:commons-collections4:4.4",
- "start-order":"10"
+ "start-order":"15"
},
{
"id":"org.apache.commons:commons-math:2.2",
@@ -28,15 +27,11 @@
},
{
"id":"org.apache.httpcomponents:httpclient-osgi:4.5.10",
- "start-order":"10"
+ "start-order":"15"
},
{
"id":"org.apache.httpcomponents:httpcore-osgi:4.4.12",
- "start-order":"10"
- },
- {
- "id":"org.apache.jackrabbit.vault:org.apache.jackrabbit.vault:3.4.4",
- "start-order":"20"
+ "start-order":"15"
},
{
"id":"org.apache.sling:org.apache.sling.adapter:2.1.10",
@@ -59,7 +54,7 @@
"start-order":"20"
},
{
- "id":"org.apache.sling:org.apache.sling.commons.fsclassloader:1.0.12",
+ "id":"org.apache.sling:org.apache.sling.commons.fsclassloader:1.0.14",
"start-order":"20"
},
{
@@ -87,10 +82,6 @@
"start-order":"20"
},
{
- "id":"org.apache.sling:org.apache.sling.installer.console:1.1.0",
- "start-order":"20"
- },
- {
"id":"org.apache.sling:org.apache.sling.installer.factory.packages:1.0.4",
"start-order":"20"
},
@@ -99,18 +90,6 @@
"start-order":"20"
},
{
- "id":"org.apache.sling:org.apache.sling.installer.provider.jcr:3.2.2",
- "start-order":"20"
- },
- {
- "id":"org.apache.sling:org.apache.sling.jcr.contentloader:2.3.0",
- "start-order":"20"
- },
- {
- "id":"org.apache.sling:org.apache.sling.jcr.resource:3.0.22",
- "start-order":"20"
- },
- {
"id":"org.apache.sling:org.apache.sling.models.api:1.3.8",
"start-order":"20"
},
@@ -119,16 +98,12 @@
"start-order":"20"
},
{
- "id":"org.apache.sling:org.apache.sling.resourceresolver:1.6.16",
- "start-order":"20"
- },
- {
- "id":"org.apache.sling:org.apache.sling.serviceuser.webconsole:1.0.2",
+ "id":"org.apache.sling:org.apache.sling.resourceresolver:1.7.0",
"start-order":"20"
},
{
"id":"org.apache.sling:org.apache.sling.serviceusermapper:1.4.4",
- "start-order":"20"
+ "start-order":"15"
},
{
"id":"org.apache.sling:org.apache.sling.servlets.get:2.1.40",
@@ -136,14 +111,14 @@
},
{
"id":"org.apache.sling:org.apache.sling.servlets.post:2.3.36",
- "start-order":"15"
+ "start-order":"20"
},
{
- "id":"org.apache.sling:org.apache.sling.servlets.resolver:2.7.2",
+ "id":"org.apache.sling:org.apache.sling.servlets.resolver:2.7.8",
"start-order":"20"
},
{
- "id":"org.apache.sling:org.apache.sling.xss:2.2.2",
+ "id":"org.apache.sling:org.apache.sling.xss:2.2.6",
"start-order":"20"
},
{
@@ -151,10 +126,6 @@
"start-order":"4"
},
{
- "id":"org.apache.felix:org.apache.felix.scr:2.1.20",
- "start-order":"4"
- },
- {
"id":"commons-fileupload:commons-fileupload:1.4",
"start-order":"5"
},
@@ -179,39 +150,23 @@
"start-order":"5"
},
{
- "id":"org.apache.felix:org.apache.felix.http.whiteboard:4.0.0",
- "start-order":"5"
- },
- {
- "id":"org.apache.felix:org.apache.felix.inventory:1.0.6",
+ "id":"org.apache.felix:org.apache.felix.http.jetty:4.0.18",
"start-order":"5"
},
{
- "id":"org.apache.felix:org.apache.felix.prefs:1.1.0",
+ "id":"org.apache.felix:org.apache.felix.http.servlet-api:1.1.2",
"start-order":"5"
},
{
- "id":"org.apache.felix:org.apache.felix.webconsole.plugins.ds:2.1.0",
- "start-order":"5"
- },
- {
- "id":"org.apache.felix:org.apache.felix.webconsole.plugins.event:1.1.8",
- "start-order":"5"
- },
- {
- "id":"org.apache.felix:org.apache.felix.webconsole.plugins.memoryusage:1.0.10",
- "start-order":"5"
- },
- {
- "id":"org.apache.felix:org.apache.felix.webconsole.plugins.obr:1.0.4",
+ "id":"org.apache.felix:org.apache.felix.http.whiteboard:4.0.0",
"start-order":"5"
},
{
- "id":"org.apache.felix:org.apache.felix.webconsole.plugins.packageadmin:1.0.4",
+ "id":"org.apache.felix:org.apache.felix.inventory:1.0.6",
"start-order":"5"
},
{
- "id":"org.apache.felix:org.apache.felix.webconsole:4.5.0",
+ "id":"org.apache.felix:org.apache.felix.prefs:1.1.0",
"start-order":"5"
},
{
@@ -219,11 +174,7 @@
"start-order":"5"
},
{
- "id":"org.apache.sling:org.apache.sling.auth.core:1.4.8",
- "start-order":"5"
- },
- {
- "id":"org.apache.sling:org.apache.sling.commons.log.webconsole:1.0.0",
+ "id":"org.apache.sling:org.apache.sling.auth.core:1.5.0",
"start-order":"5"
},
{
@@ -231,14 +182,6 @@
"start-order":"5"
},
{
- "id":"org.apache.sling:org.apache.sling.extensions.webconsolebranding:1.0.2",
- "start-order":"5"
- },
- {
- "id":"org.apache.sling:org.apache.sling.extensions.webconsolesecurityprovider:1.2.4",
- "start-order":"15"
- },
- {
"id":"org.apache.felix:org.apache.felix.http.sslfilter:1.2.6",
"start-order":"10"
},
@@ -259,83 +202,43 @@
"start-order":"10"
},
{
- "id":"com.google.guava:guava:15.0",
- "start-order":"15"
+ "id":"org.apache.tika:tika-parsers:1.24",
+ "start-order":"10"
},
{
"id":"io.dropwizard.metrics:metrics-core:3.2.6",
"start-order":"15"
},
{
- "id":"org.apache.jackrabbit:jackrabbit-data:${jackrabbit.version}",
- "start-order":"15"
- },
- {
- "id":"org.apache.jackrabbit:jackrabbit-jcr-commons:${jackrabbit.version}",
- "start-order":"15"
- },
- {
- "id":"org.apache.jackrabbit:jackrabbit-jcr-rmi:${jackrabbit.version}",
- "start-order":"15"
- },
- {
- "id":"org.apache.jackrabbit:jackrabbit-spi-commons:${jackrabbit.version}",
- "start-order":"15"
- },
- {
- "id":"org.apache.jackrabbit:jackrabbit-spi:${jackrabbit.version}",
- "start-order":"15"
- },
- {
- "id":"org.apache.jackrabbit:jackrabbit-webdav:${jackrabbit.version}",
- "start-order":"15"
- },
- {
"id":"org.apache.sling:org.apache.sling.commons.metrics:1.2.8",
"start-order":"15"
},
{
- "id":"org.apache.sling:org.apache.sling.jcr.api:2.4.0",
+ "id":"org.apache.sling:org.apache.sling.resource.filter:1.0.0",
"start-order":"15"
},
{
- "id":"org.apache.sling:org.apache.sling.jcr.base:3.1.0",
+ "id":"org.apache.sling:org.apache.sling.provisioning.model:1.8.6",
"start-order":"20"
},
{
- "id":"org.apache.sling:org.apache.sling.jcr.davex:1.3.10",
- "start-order":"15"
- },
- {
- "id":"org.apache.sling:org.apache.sling.jcr.jackrabbit.accessmanager:3.0.4",
+ "id":"org.apache.sling:org.apache.sling.repoinit.parser:1.6.2",
"start-order":"20"
},
{
- "id":"org.apache.sling:org.apache.sling.jcr.jackrabbit.usermanager:2.2.8",
+ "id":"org.apache.sling:org.apache.sling.jcr.repoinit:1.1.24",
"start-order":"20"
- },
- {
- "id":"org.apache.sling:org.apache.sling.jcr.jcr-wrapper:2.0.0",
- "start-order":"15"
- },
- {
- "id":"org.apache.sling:org.apache.sling.jcr.registration:1.0.6",
- "start-order":"15"
- },
- {
- "id":"org.apache.sling:org.apache.sling.jcr.webconsole:1.0.2",
- "start-order":"15"
- },
- {
- "id":"org.apache.sling:org.apache.sling.jcr.webdav:2.3.8",
- "start-order":"15"
- },
- {
- "id":"org.apache.sling:org.apache.sling.resource.filter:1.0.0",
- "start-order":"15"
}
],
"configurations":{
+ "org.apache.sling.commons.log.LogManager":{
+ "org.apache.sling.commons.log.packagingDataEnabled":true,
+ "org.apache.sling.commons.log.pattern":"%d{dd.MM.yyyy HH:mm:ss.SSS} *%level* [%thread] %logger %msg%n",
+ "org.apache.sling.commons.log.level":"info",
+ "org.apache.sling.commons.log.file":"logs/error.log",
+ "org.apache.sling.commons.log.file.number:Integer":"7",
+ "org.apache.sling.commons.log.file.size":"'.'yyyy-MM-dd"
+ },
"org.apache.sling.engine.impl.log.RequestLogger":{
"access.log.enabled":true,
"request.log.outputtype:Integer":"0",
@@ -371,16 +274,13 @@
"org.apache.sling.discovery.commons",
"org.apache.sling.discovery.base",
"org.apache.sling.discovery.oak",
- "org.apache.sling.extensions.webconsolesecurityprovider",
"org.apache.sling.i18n",
"org.apache.sling.jcr.base",
"org.apache.sling.jcr.contentloader",
"org.apache.sling.jcr.jackrabbit.usermanager",
"org.apache.sling.jcr.oak.server",
"org.apache.sling.jcr.repoinit",
- "org.apache.sling.jcr.webconsole",
- "org.apache.sling.servlets.post",
- "org.apache.sling.serviceuser.webconsole"
+ "org.apache.sling.servlets.post"
],
"whitelist.name":"sling"
},
@@ -428,5 +328,61 @@
"org.apache.sling.xss=sling-xss"
]
}
- }
-}
\ No newline at end of file
+ },
+ "repoinit:TEXT|true":[
+ "# general",
+ "create path (sling:OrderedFolder) /content",
+ "set ACL for everyone",
+ "allow jcr:read on /content",
+ "end",
+ "",
+ "# sling-mapping",
+ "create service user sling-mapping",
+ "",
+ "set ACL for sling-mapping",
+ "allow jcr:read on /",
+ "end",
+ "",
+ "# sling-readall",
+ "create service user sling-readall",
+ "",
+ "set ACL for sling-readall",
+ "allow jcr:read on /",
+ "end",
+ "",
+ "# sling-xss",
+ "create service user sling-xss",
+ "",
+ "create path (sling:Folder) /apps/sling/xss",
+ "",
+ "set ACL for sling-xss",
+ "allow jcr:read on /apps/sling/xss",
+ "end",
+ "",
+ "# sling-i18n",
+ "create service user sling-i18n",
+ "",
+ "set ACL for sling-i18n",
+ "allow jcr:read on /",
+ "end",
+ "",
+ "# sling-jcr-install",
+ "create service user sling-jcr-install",
+ "",
+ "# used for config OSGi writeback",
+ "create path (sling:Folder) /apps/sling/install",
+ "",
+ "set ACL for sling-jcr-install",
+ "allow jcr:read on /",
+ "allow rep:write on /apps/sling/install",
+ "end",
+ "",
+ "# content-package installer",
+ "create service user sling-package-install",
+ "",
+ "set ACL for sling-package-install",
+ "allow jcr:all on /",
+ "allow jcr:namespaceManagement,jcr:nodeTypeDefinitionManagement on :repository",
+ "end"
+ ]
+}
diff --git a/feature/src/main/features/launchpad_launchpad.json b/feature/src/main/features/boot.json
similarity index 82%
rename from feature/src/main/features/launchpad_launchpad.json
rename to feature/src/main/features/boot.json
index 91aa19b..ca0c4ae 100644
--- a/feature/src/main/features/launchpad_launchpad.json
+++ b/feature/src/main/features/boot.json
@@ -1,13 +1,138 @@
{
- "id":"org.apache.sling:org.apache.sling.cms.feature:slingfeature:launchpad:${cms.version}",
+ "variables": {
+ "sling.home": null
+ },
"bundles":[
{
- "id":"org.apache.sling:org.apache.sling.launchpad.base:6.0.2-2.6.36",
- "start-order":"20"
+ "id":"org.apache.aries:org.apache.aries.util:1.1.3",
+ "start-order":"1"
+ },
+ {
+ "id":"org.apache.commons:commons-lang3:3.9",
+ "start-order":"1"
+ },
+ {
+ "id":"org.apache.felix:org.apache.felix.configadmin:1.9.16",
+ "start-order":"1"
+ },
+ {
+ "id":"org.apache.felix:org.apache.felix.converter:1.0.14",
+ "start-order":"1"
+ },
+ {
+ "id":"org.apache.felix:org.apache.felix.eventadmin:1.5.0",
+ "start-order":"1"
+ },
+ {
+ "id":"org.apache.geronimo.specs:geronimo-annotation_1.3_spec:1.1",
+ "start-order":"1"
+ },
+ {
+ "id":"org.apache.geronimo.specs:geronimo-atinject_1.0_spec:1.1",
+ "start-order":"1"
+ },
+ {
+ "id":"org.apache.geronimo.specs:geronimo-ws-metadata_2.0_spec:1.1.3",
+ "start-order":"1"
+ },
+ {
+ "id":"org.apache.servicemix.bundles:org.apache.servicemix.bundles.jaxb-impl:2.2.11_1",
+ "start-order":"1"
+ },
+ {
+ "id":"org.apache.servicemix.bundles:org.apache.servicemix.bundles.saaj-impl:1.3.23_2",
+ "start-order":"1"
+ },
+ {
+ "id":"org.apache.servicemix.specs:org.apache.servicemix.specs.jaxb-api-2.2:2.9.0",
+ "start-order":"1"
+ },
+ {
+ "id":"org.apache.servicemix.specs:org.apache.servicemix.specs.jaxws-api-2.2:2.9.0",
+ "start-order":"1"
+ },
+ {
+ "id":"org.apache.servicemix.specs:org.apache.servicemix.specs.saaj-api-1.3:2.8.0",
+ "start-order":"1"
+ },
+ {
+ "id":"org.apache.sling:org.apache.sling.commons.johnzon:1.2.4",
+ "start-order":"1"
+ },
+ {
+ "id":"org.apache.sling:org.apache.sling.commons.log:5.1.12",
+ "start-order":"1"
+ },
+ {
+ "id":"org.apache.sling:org.apache.sling.commons.logservice:1.1.0",
+ "start-order":"1"
+ },
+ {
+ "id":"org.apache.sling:org.apache.sling.commons.osgi:2.4.0",
+ "start-order":"1"
+ },
+ {
+ "id":"org.apache.sling:org.apache.sling.installer.core:3.11.2",
+ "start-order":"1"
+ },
+ {
+ "id":"org.apache.sling:org.apache.sling.installer.factory.configuration:1.3.2",
+ "start-order":"1"
+ },
+ {
+ "id":"org.apache.sling:org.apache.sling.installer.provider.file:1.3.0",
+ "start-order":"1"
+ },
+ {
+ "id":"org.apache.sling:org.apache.sling.javax.activation:0.1.0",
+ "start-order":"1"
+ },
+ {
+ "id":"org.apache.sling:org.apache.sling.settings:1.4.0",
+ "start-order":"1"
+ },
+ {
+ "id":"org.jvnet.staxex:stax-ex:1.7.6",
+ "start-order":"1"
+ },
+ {
+ "id":"org.osgi:org.osgi.service.log:1.4.0",
+ "start-order":"1"
+ },
+ {
+ "id":"org.osgi:org.osgi.util.function:1.1.0",
+ "start-order":"1"
+ },
+ {
+ "id":"org.osgi:org.osgi.util.promise:1.1.1",
+ "start-order":"1"
+ },
+ {
+ "id":"org.osgi:org.osgi.util.pushstream:1.0.1",
+ "start-order":"1"
+ },
+ {
+ "id":"org.slf4j:jcl-over-slf4j:${slf4j.version}",
+ "start-order":"1"
+ },
+ {
+ "id":"org.slf4j:log4j-over-slf4j:${slf4j.version}",
+ "start-order":"1"
+ },
+ {
+ "id":"org.slf4j:slf4j-api:${slf4j.version}",
+ "start-order":"1"
+ },
+ {
+ "id":"org.apache.felix:org.apache.felix.scr:2.1.20",
+ "start-order":"1"
}
+
],
"framework-properties":{
+ "localIndexDir":"${sling.home}/repository/index",
+ "repository.home":"${sling.home}/repository",
"sling.jre.java.xml":",javax.xml;version=\"2.1.0\",javax.xml.datatype;uses:=\"javax.xml.namespace\";version=\"2.1.0\",javax.xml.namespace;version=\"2.1.0\",javax.xml.parsers;uses:=\"javax.xml.validation,org.w3c.dom,org.xml.sax,org.xml.sax.helpers\";version=\"2.1.0\",javax.xml.stream;uses:=\"javax.xml.namespace,javax.xml.stream.events,javax.xml.stream.util,javax.xml.transform\";version=\"1.0.0\",javax.xml.stream.events;uses:=\"javax.xml.namespace,javax.xml.stream\";version=\"1.0.0 [...]
"felix.systempackages.calculate.uses":"true",
"org.osgi.framework.system.packages":"org.osgi.framework;version=\"1.9\",org.osgi.framework.dto;version=\"1.8\";uses:=\"org.osgi.dto\",org.osgi.framework.hooks.bundle;version=\"1.1\";uses:=\"org.osgi.framework\",org.osgi.framework.hooks.resolver;version=\"1.0\";uses:=\"org.osgi.framework.wiring\",org.osgi.framework.hooks.service;version=\"1.1\";uses:=\"org.osgi.framework\",org.osgi.framework.hooks.weaving;version=\"1.1\";uses:=\"org.osgi.framework.wiring\",org.osgi.framework.laun [...]
@@ -16,4 +141,4 @@
"sling.jpms.java.xml":"{dollar}{sling.jre.java.xml},javax.xml.catalog;uses:=\"javax.xml.namespace\";version=\"1.0.0\"",
"sling.jre-1.8":",java.applet;version=\"{dollar}{felix.detect.java.version}\",java.awt;version=\"{dollar}{felix.detect.java.version}\",java.awt.color;version=\"{dollar}{felix.detect.java.version}\",java.awt.datatransfer;version=\"{dollar}{felix.detect.java.version}\",java.awt.dnd;version=\"{dollar}{felix.detect.java.version}\",java.awt.event;version=\"{dollar}{felix.detect.java.version}\",java.awt.font;version=\"{dollar}{felix.detect.java.version}\",java.awt.geom;version=\"{dolla [...]
}
-}
\ No newline at end of file
+}
diff --git a/feature/src/main/features/boot_boot.json b/feature/src/main/features/boot_boot.json
deleted file mode 100644
index 9b2a86f..0000000
--- a/feature/src/main/features/boot_boot.json
+++ /dev/null
@@ -1,131 +0,0 @@
-
-{
- "id":"org.apache.sling:org.apache.sling.cms.feature:slingfeature:boot:${cms.version}",
- "bundles":[
- {
- "id":"org.apache.aries:org.apache.aries.util:1.1.3",
- "start-order":"1"
- },
- {
- "id":"org.apache.commons:commons-lang3:3.9",
- "start-order":"1"
- },
- {
- "id":"org.apache.felix:org.apache.felix.configadmin:1.9.16",
- "start-order":"1"
- },
- {
- "id":"org.apache.felix:org.apache.felix.converter:1.0.14",
- "start-order":"1"
- },
- {
- "id":"org.apache.felix:org.apache.felix.eventadmin:1.5.0",
- "start-order":"1"
- },
- {
- "id":"org.apache.geronimo.specs:geronimo-annotation_1.3_spec:1.1",
- "start-order":"1"
- },
- {
- "id":"org.apache.geronimo.specs:geronimo-atinject_1.0_spec:1.1",
- "start-order":"1"
- },
- {
- "id":"org.apache.geronimo.specs:geronimo-ws-metadata_2.0_spec:1.1.3",
- "start-order":"1"
- },
- {
- "id":"org.apache.servicemix.bundles:org.apache.servicemix.bundles.jaxb-impl:2.2.11_1",
- "start-order":"1"
- },
- {
- "id":"org.apache.servicemix.bundles:org.apache.servicemix.bundles.saaj-impl:1.3.23_2",
- "start-order":"1"
- },
- {
- "id":"org.apache.servicemix.specs:org.apache.servicemix.specs.jaxb-api-2.2:2.9.0",
- "start-order":"1"
- },
- {
- "id":"org.apache.servicemix.specs:org.apache.servicemix.specs.jaxws-api-2.2:2.9.0",
- "start-order":"1"
- },
- {
- "id":"org.apache.servicemix.specs:org.apache.servicemix.specs.saaj-api-1.3:2.8.0",
- "start-order":"1"
- },
- {
- "id":"org.apache.sling:org.apache.sling.commons.johnzon:1.2.2",
- "start-order":"1"
- },
- {
- "id":"org.apache.sling:org.apache.sling.commons.log:5.1.12",
- "start-order":"1"
- },
- {
- "id":"org.apache.sling:org.apache.sling.commons.logservice:1.1.0",
- "start-order":"1"
- },
- {
- "id":"org.apache.sling:org.apache.sling.commons.osgi:2.4.0",
- "start-order":"1"
- },
- {
- "id":"org.apache.sling:org.apache.sling.installer.core:3.11.2",
- "start-order":"1"
- },
- {
- "id":"org.apache.sling:org.apache.sling.installer.factory.configuration:1.3.2",
- "start-order":"1"
- },
- {
- "id":"org.apache.sling:org.apache.sling.installer.provider.file:1.2.2",
- "start-order":"1"
- },
- {
- "id":"org.apache.sling:org.apache.sling.javax.activation:0.1.0",
- "start-order":"1"
- },
- {
- "id":"org.apache.sling:org.apache.sling.settings:1.3.10",
- "start-order":"1"
- },
- {
- "id":"org.jvnet.staxex:stax-ex:1.7.6",
- "start-order":"1"
- },
- {
- "id":"org.osgi:org.osgi.service.log:1.4.0",
- "start-order":"1"
- },
- {
- "id":"org.osgi:org.osgi.util.function:1.1.0",
- "start-order":"1"
- },
- {
- "id":"org.osgi:org.osgi.util.promise:1.1.1",
- "start-order":"1"
- },
- {
- "id":"org.osgi:org.osgi.util.pushstream:1.0.1",
- "start-order":"1"
- },
- {
- "id":"org.slf4j:jcl-over-slf4j:${slf4j.version}",
- "start-order":"1"
- },
- {
- "id":"org.slf4j:log4j-over-slf4j:${slf4j.version}",
- "start-order":"1"
- },
- {
- "id":"org.slf4j:slf4j-api:${slf4j.version}",
- "start-order":"1"
- }
- ],
- "framework-properties":{
- "sling.run.mode.install.options":"oak_tar,oak_mongo",
- "localIndexDir":"${sling.home}/repository/index",
- "repository.home":"${sling.home}/repository"
- }
-}
\ No newline at end of file
diff --git a/feature/src/main/features/sling-caconfig_sling-caconfig.json b/feature/src/main/features/caconfig.json
similarity index 87%
rename from feature/src/main/features/sling-caconfig_sling-caconfig.json
rename to feature/src/main/features/caconfig.json
index 1aa5d6b..36ac153 100644
--- a/feature/src/main/features/sling-caconfig_sling-caconfig.json
+++ b/feature/src/main/features/caconfig.json
@@ -1,6 +1,5 @@
{
- "id":"org.apache.sling:org.apache.sling.cms.feature:slingfeature:sling-caconfig:${cms.version}",
"bundles":[
{
"id":"org.apache.sling:org.apache.sling.caconfig.api:1.2.0",
diff --git a/feature/src/main/features/sling-discovery_sling-discovery.json b/feature/src/main/features/discovery.json
similarity index 100%
rename from feature/src/main/features/sling-discovery_sling-discovery.json
rename to feature/src/main/features/discovery.json
diff --git a/feature/src/main/features/distribution.json b/feature/src/main/features/distribution.json
index c471d7c..5f2e92f 100644
--- a/feature/src/main/features/distribution.json
+++ b/feature/src/main/features/distribution.json
@@ -1,5 +1,4 @@
{
- "id": "org.apache.sling:org.apache.sling.cms.feature:slingfeature:distribution:${cms.version}",
"bundles": [
{
"id": "org.apache.sling:org.apache.sling.distribution.api:0.4.0",
diff --git a/feature/src/main/features/sling-event_sling-event.json b/feature/src/main/features/event.json
similarity index 100%
rename from feature/src/main/features/sling-event_sling-event.json
rename to feature/src/main/features/event.json
diff --git a/feature/src/main/features/healthcheck_healthcheck.json b/feature/src/main/features/healthcheck.json
similarity index 100%
rename from feature/src/main/features/healthcheck_healthcheck.json
rename to feature/src/main/features/healthcheck.json
diff --git a/feature/src/main/features/sling-models-jacksonexporter_models-jacksonexporter.json b/feature/src/main/features/models-jacksonexporter.json
similarity index 100%
rename from feature/src/main/features/sling-models-jacksonexporter_models-jacksonexporter.json
rename to feature/src/main/features/models-jacksonexporter.json
diff --git a/feature/src/main/features/node-store-segment/segment.json b/feature/src/main/features/node-store-segment/segment.json
deleted file mode 100644
index 5d16577..0000000
--- a/feature/src/main/features/node-store-segment/segment.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "id": "org.apache.sling:org.apache.sling.cms.feature:slingfeature:segment:${cms.version}",
- "configurations": {
- "org.apache.jackrabbit.oak.segment.SegmentNodeStoreService": {
- "name": "Default NodeStore"
- },
- "org.apache.sling.commons.log.LogManager": {
- "org.apache.sling.commons.log.packagingDataEnabled": true,
- "org.apache.sling.commons.log.pattern": "%d{dd.MM.yyyy HH:mm:ss.SSS} *%level* [%thread] %logger %msg%n",
- "org.apache.sling.commons.log.level": "info",
- "org.apache.sling.commons.log.file": "logs/error.log",
- "org.apache.sling.commons.log.file.number:Integer": "7",
- "org.apache.sling.commons.log.file.size": "'.'yyyy-MM-dd"
- }
- }
-}
\ No newline at end of file
diff --git a/feature/src/main/features/node-store-composite/composite-runtime.json b/feature/src/main/features/oak/node-store/composite-runtime.json
similarity index 76%
rename from feature/src/main/features/node-store-composite/composite-runtime.json
rename to feature/src/main/features/oak/node-store/composite-runtime.json
index 5f11296..910374a 100644
--- a/feature/src/main/features/node-store-composite/composite-runtime.json
+++ b/feature/src/main/features/oak/node-store/composite-runtime.json
@@ -1,9 +1,9 @@
{
- "id": "org.apache.sling:org.apache.sling.cms.feature:slingfeature:composite-runtime:${cms.version}",
"configurations": {
"org.apache.jackrabbit.oak.segment.SegmentNodeStoreService": {
"name": "Default NodeStore",
- "standby": true
+ "standby": true,
+ "customBlobStore": true
},
"org.apache.jackrabbit.oak.composite.CompositeNodeStoreService": {
"seedMount": "libs",
@@ -37,6 +37,11 @@
"errorLabel": "versionable node",
"invalidNodeType": "mix:versionable"
},
+ "org.apache.jackrabbit.oak.plugins.blob.datastore.FileDataStore": {
+ "minRecordLength": 4096,
+ "path": "${sling.home}/repository/datastore",
+ "cacheSizeInMB": 128
+ },
"org.apache.jackrabbit.oak.segment.SegmentNodeStoreFactory~libs": {
"role": "composite-mount-libs",
"customBlobStore": false,
@@ -49,14 +54,6 @@
"registerDescriptors": true,
"dispatchChanges": true,
"repository.home": "sling/composite/repository-global"
- },
- "org.apache.sling.commons.log.LogManager": {
- "org.apache.sling.commons.log.packagingDataEnabled": true,
- "org.apache.sling.commons.log.pattern": "%d{dd.MM.yyyy HH:mm:ss.SSS} *%level* [%thread] %logger %msg%n",
- "org.apache.sling.commons.log.level": "info",
- "org.apache.sling.commons.log.file": "",
- "org.apache.sling.commons.log.file.number:Integer": "-1",
- "org.apache.sling.commons.log.file.size": ""
}
}
}
\ No newline at end of file
diff --git a/feature/src/main/features/node-store-composite/composite-seed.json b/feature/src/main/features/oak/node-store/composite-seed.json
similarity index 64%
rename from feature/src/main/features/node-store-composite/composite-seed.json
rename to feature/src/main/features/oak/node-store/composite-seed.json
index ad29a0f..390a31d 100644
--- a/feature/src/main/features/node-store-composite/composite-seed.json
+++ b/feature/src/main/features/oak/node-store/composite-seed.json
@@ -1,5 +1,4 @@
{
- "id": "org.apache.sling:org.apache.sling.cms.feature:slingfeature:composite-seed:${cms.version}",
"configurations": {
"org.apache.felix.hc.core.impl.servlet.HealthCheckExecutorServlet~default": {
"servletPath": "/system/health"
@@ -26,14 +25,6 @@
"/apps",
"/jcr:system/rep:permissionStore/oak:mount-libs-default"
]
- },
- "org.apache.sling.commons.log.LogManager": {
- "org.apache.sling.commons.log.packagingDataEnabled": true,
- "org.apache.sling.commons.log.pattern": "%d{dd.MM.yyyy HH:mm:ss.SSS} *%level* [%thread] %logger %msg%n",
- "org.apache.sling.commons.log.level": "info",
- "org.apache.sling.commons.log.file": "",
- "org.apache.sling.commons.log.file.number:Integer": "-1",
- "org.apache.sling.commons.log.file.size": ""
}
}
}
\ No newline at end of file
diff --git a/feature/src/main/features/oak/node-store/segment.json b/feature/src/main/features/oak/node-store/segment.json
new file mode 100644
index 0000000..a7e4eda
--- /dev/null
+++ b/feature/src/main/features/oak/node-store/segment.json
@@ -0,0 +1,13 @@
+{
+ "configurations": {
+ "org.apache.jackrabbit.oak.segment.SegmentNodeStoreService": {
+ "name": "Default NodeStore",
+ "customBlobStore": true
+ },
+ "org.apache.jackrabbit.oak.plugins.blob.datastore.FileDataStore": {
+ "minRecordLength": 4096,
+ "path": "${sling.home}/repository/datastore",
+ "cacheSizeInMB": 128
+ }
+ }
+}
\ No newline at end of file
diff --git a/feature/src/main/features/oak_oak.json b/feature/src/main/features/oak/oak_base.json
similarity index 50%
rename from feature/src/main/features/oak_oak.json
rename to feature/src/main/features/oak/oak_base.json
index 9ae10b6..a566fa1 100644
--- a/feature/src/main/features/oak_oak.json
+++ b/feature/src/main/features/oak/oak_base.json
@@ -1,12 +1,39 @@
{
- "id":"org.apache.sling:org.apache.sling.cms.feature:slingfeature:oak:${cms.version}",
"bundles":[
{
"id":"org.apache.felix:org.apache.felix.jaas:1.0.2",
"start-order":"10"
},
{
+ "id":"com.google.guava:guava:15.0",
+ "start-order":"15"
+ },
+ {
+ "id":"org.apache.jackrabbit:jackrabbit-data:${jackrabbit.version}",
+ "start-order":"15"
+ },
+ {
+ "id":"org.apache.jackrabbit:jackrabbit-jcr-commons:${jackrabbit.version}",
+ "start-order":"15"
+ },
+ {
+ "id":"org.apache.jackrabbit:jackrabbit-jcr-rmi:${jackrabbit.version}",
+ "start-order":"15"
+ },
+ {
+ "id":"org.apache.jackrabbit:jackrabbit-spi-commons:${jackrabbit.version}",
+ "start-order":"15"
+ },
+ {
+ "id":"org.apache.jackrabbit:jackrabbit-spi:${jackrabbit.version}",
+ "start-order":"15"
+ },
+ {
+ "id":"org.apache.jackrabbit:jackrabbit-webdav:${jackrabbit.version}",
+ "start-order":"15"
+ },
+ {
"id":"org.apache.jackrabbit:oak-api:${oak.version}",
"start-order":"15"
},
@@ -51,6 +78,10 @@
"start-order":"15"
},
{
+ "id":"org.apache.jackrabbit:oak-segment-tar:${oak.version}",
+ "start-order":"15"
+ },
+ {
"id":"org.apache.jackrabbit:oak-store-composite:${oak.version}",
"start-order":"15"
},
@@ -63,13 +94,60 @@
"start-order":"15"
},
{
- "id":"org.apache.sling:org.apache.sling.jcr.oak.server:1.2.4",
- "start-order":"20"
+ "id":"org.apache.jackrabbit:oak-authorization-principalbased:${oak.version}",
+ "start-order":"15"
},
{
- "id":"org.apache.jackrabbit:oak-segment-tar:${oak.version}",
- "run-modes":"oak_tar",
+ "id":"org.apache.sling:org.apache.sling.jcr.api:2.4.0",
+ "start-order":"15"
+ },
+ {
+ "id":"org.apache.sling:org.apache.sling.jcr.base:3.1.4",
+ "start-order":"15"
+ },
+ {
+ "id":"org.apache.sling:org.apache.sling.jcr.davex:1.3.10",
+ "start-order":"15"
+ },
+ {
+ "id":"org.apache.sling:org.apache.sling.jcr.jcr-wrapper:2.0.0",
+ "start-order":"15"
+ },
+ {
+ "id":"org.apache.sling:org.apache.sling.jcr.registration:1.0.6",
+ "start-order":"15"
+ },
+ {
+ "id":"org.apache.sling:org.apache.sling.jcr.webdav:2.3.8",
"start-order":"15"
+ },
+ {
+ "id":"org.apache.sling:org.apache.sling.jcr.oak.server:1.2.8",
+ "start-order":"16"
+ },
+ {
+ "id":"org.apache.sling:org.apache.sling.jcr.resource:3.0.22",
+ "start-order":"20"
+ },
+ {
+ "id":"org.apache.sling:org.apache.sling.installer.provider.jcr:3.3.0",
+ "start-order":"20"
+ },
+ {
+ "id":"org.apache.jackrabbit.vault:org.apache.jackrabbit.vault:3.4.6",
+ "start-order":"20"
+ },
+ {
+ "id":"org.apache.sling:org.apache.sling.jcr.contentloader:2.3.0",
+ "start-order":"20"
+ },
+ {
+ "id":"org.apache.sling:org.apache.sling.jcr.jackrabbit.accessmanager:3.0.6",
+ "start-order":"20"
+ },
+ {
+ "id":"org.apache.sling:org.apache.sling.jcr.jackrabbit.usermanager:2.2.10",
+ "start-order":"20"
}
],
"configurations":{
@@ -89,6 +167,9 @@
"importBehavior":"besteffort",
"usersPath":"/home/users"
},
+ "org.apache.jackrabbit.oak.security.authorization.AuthorizationConfigurationImpl":{
+ "importBehavior":"besteffort"
+ },
"org.apache.jackrabbit.oak.spi.security.user.action.DefaultAuthorizableActionProvider":{
"userPrivilegeNames":[
"jcr:all"
@@ -113,6 +194,23 @@
"jaas.controlFlag":"sufficient",
"jaas.classname":"org.apache.jackrabbit.oak.security.authentication.token.TokenLoginModule",
"jaas.ranking:Integer":"200"
- }
+ },
+ "org.apache.jackrabbit.oak.spi.security.authorization.principalbased.impl.PrincipalBasedAuthorizationConfiguration":{
+ "enableAggregationFilter":true
+ },
+ "org.apache.jackrabbit.oak.spi.security.authorization.principalbased.impl.FilterProviderImpl":{
+ "path":"/home/users/system/sling"
+ },
+ "org.apache.jackrabbit.oak.security.internal.SecurityProviderRegistration":{
+ "requiredServicePids":[
+ "org.apache.jackrabbit.oak.security.authorization.AuthorizationConfigurationImpl",
+ "org.apache.jackrabbit.oak.security.principal.PrincipalConfigurationImpl",
+ "org.apache.jackrabbit.oak.security.authentication.token.TokenConfigurationImpl",
+ "org.apache.jackrabbit.oak.spi.security.user.action.DefaultAuthorizableActionProvider",
+ "org.apache.jackrabbit.oak.security.authorization.restriction.RestrictionProviderImpl",
+ "org.apache.jackrabbit.oak.security.user.UserAuthenticationFactoryImpl",
+ "org.apache.jackrabbit.oak.spi.security.authorization.principalbased.impl.PrincipalBasedAuthorizationConfiguration"
+ ]
+ }
}
-}
\ No newline at end of file
+}
diff --git a/feature/src/main/features/repoinit_repoinit.json b/feature/src/main/features/repoinit_repoinit.json
deleted file mode 100644
index 86781de..0000000
--- a/feature/src/main/features/repoinit_repoinit.json
+++ /dev/null
@@ -1,74 +0,0 @@
-
-{
- "id":"org.apache.sling:org.apache.sling.cms.feature:slingfeature:repoinit:${cms.version}",
- "bundles":[
- {
- "id":"org.apache.sling:org.apache.sling.jcr.repoinit:1.1.24",
- "start-order":"20"
- },
- {
- "id":"org.apache.sling:org.apache.sling.provisioning.model:1.8.6",
- "start-order":"20"
- },
- {
- "id":"org.apache.sling:org.apache.sling.repoinit.parser:1.6.2",
- "start-order":"20"
- }
- ],
- "repoinit:TEXT|true":[
- "# general",
- "create path (sling:OrderedFolder) /content",
- "set ACL for everyone",
- "allow jcr:read\ton /content",
- "end",
- "",
- "# sling-mapping",
- "create service user sling-mapping",
- "",
- "set ACL for sling-mapping",
- "allow jcr:read on /",
- "end",
- "",
- "# sling-readall",
- "create service user sling-readall",
- "",
- "set ACL for sling-readall",
- "allow jcr:read on /",
- "end",
- "",
- "# sling-xss",
- "create service user sling-xss",
- "",
- "create path (sling:Folder) /apps/sling/xss",
- "",
- "set ACL for sling-xss",
- "allow jcr:read on /apps/sling/xss",
- "end",
- "",
- "# sling-i18n",
- "create service user sling-i18n",
- "",
- "set ACL for sling-i18n",
- "allow jcr:read on /",
- "end",
- "",
- "# sling-jcr-install",
- "create service user sling-jcr-install",
- "",
- "# used for config OSGi writeback",
- "create path (sling:Folder) /apps/sling/install",
- "",
- "set ACL for sling-jcr-install",
- "allow\tjcr:read\ton\t/",
- "allow\trep:write\ton /apps/sling/install",
- "end",
- "",
- "# content-package installer",
- "create service user sling-package-install",
- "",
- "set ACL for sling-package-install",
- "allow\tjcr:all on\t/",
- "allow jcr:namespaceManagement,jcr:nodeTypeDefinitionManagement on :repository",
- "end"
- ]
-}
\ No newline at end of file
diff --git a/feature/src/main/features/runmode-author/runmode-author.json b/feature/src/main/features/runmodes/author.json
similarity index 97%
rename from feature/src/main/features/runmode-author/runmode-author.json
rename to feature/src/main/features/runmodes/author.json
index 91c331c..61d9996 100644
--- a/feature/src/main/features/runmode-author/runmode-author.json
+++ b/feature/src/main/features/runmodes/author.json
@@ -5,6 +5,7 @@
"agentTarget": "(name=default)"
},
"org.apache.sling.cms.core.publication.PublicationManagerFactoryImpl": {
+ "instanceType": "AUTHOR",
"publicationMode": "CONTENT_DISTRIBUTION",
"agents": []
},
diff --git a/feature/src/main/features/runmode-renderer/runmode-renderer.json b/feature/src/main/features/runmodes/renderer.json
similarity index 97%
rename from feature/src/main/features/runmode-renderer/runmode-renderer.json
rename to feature/src/main/features/runmodes/renderer.json
index 7b3eb6c..8e78caa 100644
--- a/feature/src/main/features/runmode-renderer/runmode-renderer.json
+++ b/feature/src/main/features/runmodes/renderer.json
@@ -2,6 +2,7 @@
"id": "org.apache.sling:org.apache.sling.cms.feature:slingfeature:runmode-renderer:${cms.version}",
"configurations": {
"org.apache.sling.cms.core.publication.PublicationManagerFactoryImpl": {
+ "instanceType": "RENDERER",
"publicationMode": "CONTENT_DISTRIBUTION",
"agents": []
},
diff --git a/feature/src/main/features/runmode-standalone/runmode-standalone.json b/feature/src/main/features/runmodes/standalone.json
similarity index 93%
rename from feature/src/main/features/runmode-standalone/runmode-standalone.json
rename to feature/src/main/features/runmodes/standalone.json
index 0b3834b..4240732 100644
--- a/feature/src/main/features/runmode-standalone/runmode-standalone.json
+++ b/feature/src/main/features/runmodes/standalone.json
@@ -2,6 +2,7 @@
"id": "org.apache.sling:org.apache.sling.cms.feature:slingfeature:runmode-standalone:${cms.version}",
"configurations": {
"org.apache.sling.cms.core.publication.PublicationManagerFactoryImpl": {
+ "instanceType": "STANDALONE",
"publicationMode": "STANDALONE",
"agents": []
},
diff --git a/feature/src/main/features/scripting_sling.json b/feature/src/main/features/scripting.json
similarity index 100%
rename from feature/src/main/features/scripting_sling.json
rename to feature/src/main/features/scripting.json
diff --git a/feature/src/main/features/standalone_standalone.json b/feature/src/main/features/standalone_standalone.json
deleted file mode 100644
index e3eaae6..0000000
--- a/feature/src/main/features/standalone_standalone.json
+++ /dev/null
@@ -1,16 +0,0 @@
-
-{
- "id":"org.apache.sling:org.apache.sling.cms.feature:slingfeature:standalone:${cms.version}",
- "bundles":[
- {
- "id":"org.apache.felix:org.apache.felix.http.jetty:4.0.18",
- "run-modes":":standalone",
- "start-order":"5"
- },
- {
- "id":"org.apache.felix:org.apache.felix.http.servlet-api:1.1.2",
- "run-modes":":standalone",
- "start-order":"5"
- }
- ]
-}
\ No newline at end of file
diff --git a/feature/src/main/features/sling-validation_sling-validation.json b/feature/src/main/features/validation.json
similarity index 100%
rename from feature/src/main/features/sling-validation_sling-validation.json
rename to feature/src/main/features/validation.json
diff --git a/feature/src/main/features/webapp_webapp.json b/feature/src/main/features/webapp_webapp.json
deleted file mode 100644
index 524d3af..0000000
--- a/feature/src/main/features/webapp_webapp.json
+++ /dev/null
@@ -1,4 +0,0 @@
-
-{
- "id":"org.apache.sling:org.apache.sling.cms.feature:slingfeature:webapp:${cms.version}"
-}
\ No newline at end of file
diff --git a/feature/src/main/features/webconsole.json b/feature/src/main/features/webconsole.json
new file mode 100644
index 0000000..06156c5
--- /dev/null
+++ b/feature/src/main/features/webconsole.json
@@ -0,0 +1,66 @@
+{
+ "bundles": [
+ {
+ "id":"org.apache.felix:org.apache.felix.webconsole:4.5.0",
+ "start-order":"5"
+ },
+ {
+ "id":"org.apache.felix:org.apache.felix.webconsole.plugins.ds:2.1.0",
+ "start-order":"5"
+ },
+ {
+ "id":"org.apache.felix:org.apache.felix.webconsole.plugins.event:1.1.8",
+ "start-order":"5"
+ },
+ {
+ "id":"org.apache.felix:org.apache.felix.webconsole.plugins.memoryusage:1.0.10",
+ "start-order":"5"
+ },
+ {
+ "id":"org.apache.felix:org.apache.felix.webconsole.plugins.obr:1.0.4",
+ "start-order":"5"
+ },
+ {
+ "id":"org.apache.felix:org.apache.felix.webconsole.plugins.packageadmin:1.0.4",
+ "start-order":"5"
+ },
+ {
+ "id":"org.apache.sling:org.apache.sling.commons.log.webconsole:1.0.0",
+ "start-order":"5"
+ },
+ {
+ "id":"org.apache.sling:org.apache.sling.extensions.webconsolebranding:1.0.2",
+ "start-order":"5"
+ },
+ {
+ "id":"org.apache.felix:org.apache.felix.healthcheck.webconsoleplugin:2.0.2",
+ "start-order":"5"
+ },
+ {
+ "id":"org.apache.sling:org.apache.sling.extensions.webconsolesecurityprovider:1.2.4",
+ "start-order":"15"
+ },
+ {
+ "id":"org.apache.sling:org.apache.sling.jcr.webconsole:1.0.2",
+ "start-order":"15"
+ },
+ {
+ "id":"org.apache.sling:org.apache.sling.serviceuser.webconsole:1.0.2",
+ "start-order":"20"
+ },
+ {
+ "id":"org.apache.sling:org.apache.sling.installer.console:1.1.0",
+ "start-order":"20"
+ }
+ ],
+ "configurations": {
+ "org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment~webconsole":{
+ "whitelist.bundles":[
+ "org.apache.sling.extensions.webconsolesecurityprovider",
+ "org.apache.sling.jcr.webconsole",
+ "org.apache.sling.serviceuser.webconsole"
+ ],
+ "whitelist.name":"webconsole"
+ }
+ }
+}
\ No newline at end of file