You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ol...@apache.org on 2020/11/26 21:50:32 UTC
[sling-org-apache-sling-karaf-features] 02/02: SLING-9944 Bundle
configurations and reference via classpath protocol
This is an automated email from the ASF dual-hosted git repository.
olli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-karaf-features.git
commit 0e7dc32b27cd38912fbd4496e656ffeb86663678
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Thu Nov 26 22:48:13 2020 +0100
SLING-9944 Bundle configurations and reference via classpath protocol
---
src/main/feature/feature.xml | 95 +++++++++++++++++++++++---------------------
1 file changed, 50 insertions(+), 45 deletions(-)
diff --git a/src/main/feature/feature.xml b/src/main/feature/feature.xml
index d716cad..27a79a4 100644
--- a/src/main/feature/feature.xml
+++ b/src/main/feature/feature.xml
@@ -20,7 +20,7 @@
<features name="sling-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.5.0">
<!-- Apache Sling -->
<feature name="sling" version="${project.version}">
- <config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_resourceresolver">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_resourceresolver</config>
+ <config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_resourceresolver">classpath:org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_resourceresolver.config</config>
<bundle>mvn:org.apache.sling/org.apache.sling.api/2.22.0</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.auth.core/1.5.0</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.engine/2.7.2</bundle>
@@ -35,6 +35,7 @@
<feature>eventadmin</feature>
<feature>scr</feature>
<feature>management</feature>
+ <feature prerequisite="true">pax-url-classpath</feature>
<feature version="${project.version}">sling-commons-fsclassloader</feature>
<feature version="${project.version}">sling-commons-osgi</feature>
<feature version="${project.version}">sling-commons-scheduler</feature>
@@ -151,8 +152,8 @@
<feature version="${project.version}">sling</feature>
</feature>
<feature name="sling-caconfig" version="${project.version}">
- <config external="true" name="org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_caconfig">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_caconfig</config>
- <config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_caconfig">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_caconfig</config>
+ <config external="true" name="org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_caconfig">classpath:org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_caconfig.config</config>
+ <config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_caconfig">classpath:org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_caconfig.config</config>
<bundle>mvn:org.apache.sling/org.apache.sling.caconfig.api/1.2.0</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.caconfig.impl/1.5.0</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.caconfig.spi/1.3.4</bundle>
@@ -163,8 +164,8 @@
<feature>webconsole</feature>
</feature>
<feature name="sling-clam" version="${project.version}">
- <config external="true" name="org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_clam">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_clam</config>
- <config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_clam">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_clam</config>
+ <config external="true" name="org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_clam">classpath:org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_clam.config</config>
+ <config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_clam">classpath:org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_clam.config</config>
<bundle>mvn:org.apache.sling/org.apache.sling.clam/1.1.0</bundle>
<!-- dependencies -->
<feature version="${project.version}">sling</feature>
@@ -178,9 +179,9 @@
<feature version="${project.version}">sling</feature>
</feature>
<feature name="sling-discovery-oak" version="${project.version}">
- <config external="true" name="org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment~sling_discovery">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment~sling_discovery</config>
- <config external="true" name="org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_discovery">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_discovery</config>
- <config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_discovery">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_discovery</config>
+ <config external="true" name="org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment~sling_discovery">classpath:org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment~sling_discovery.config</config>
+ <config external="true" name="org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_discovery">classpath:org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_discovery.config</config>
+ <config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_discovery">classpath:org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_discovery.config</config>
<bundle>mvn:org.apache.sling/org.apache.sling.discovery.base/2.0.8</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.discovery.commons/1.0.20</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.discovery.oak/1.2.30</bundle>
@@ -209,8 +210,8 @@
<feature version="${project.version}">jackrabbit-vault</feature>
</feature>
<feature name="sling-event" version="${project.version}">
- <config external="true" name="org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_event">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_event</config>
- <config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_event">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_event</config>
+ <config external="true" name="org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_event">classpath:org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_event.config</config>
+ <config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_event">classpath:org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_event.config</config>
<bundle>mvn:org.apache.sling/org.apache.sling.event/4.2.12</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.event.dea/1.1.4</bundle>
<!-- dependencies -->
@@ -243,8 +244,8 @@
<feature version="${project.version}">sling-scripting</feature>
</feature>
<feature name="sling-i18n" version="${project.version}">
- <config external="true" name="org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_i18n">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_i18n</config>
- <config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_i18n">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_i18n</config>
+ <config external="true" name="org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_i18n">classpath:org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_i18n.config</config>
+ <config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_i18n">classpath:org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_i18n.config</config>
<bundle>mvn:org.apache.sling/org.apache.sling.i18n/2.5.14</bundle>
<!-- dependencies -->
<feature version="${project.version}">sling</feature>
@@ -294,7 +295,7 @@
<bundle dependency="true">mvn:org.apache.felix/org.apache.felix.inventory/1.0.6</bundle>
</feature>
<feature name="sling-resource-presence" version="${project.version}">
- <config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_resource_presence">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_resource_presence</config>
+ <config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_resource_presence">classpath:org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_resource_presence.config</config>
<bundle>mvn:org.apache.sling/org.apache.sling.resource.presence/0.0.2</bundle>
<!-- dependencies -->
<feature version="${project.version}">sling</feature>
@@ -305,7 +306,7 @@
<feature version="${project.version}">sling</feature>
</feature>
<feature name="sling-rewriter" version="${project.version}">
- <config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_rewriter">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_rewriter</config>
+ <config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_rewriter">classpath:org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_rewriter.config</config>
<bundle>mvn:org.apache.sling/org.apache.sling.rewriter/1.2.2</bundle>
<!-- dependencies -->
<feature version="${project.version}">sling</feature>
@@ -323,8 +324,8 @@
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.urlrewritefilter/4.0.4_1</bundle>
</feature>
<feature name="sling-validation" version="${project.version}">
- <config external="true" name="org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_validation">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_validation</config>
- <config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_validation">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_validation</config>
+ <config external="true" name="org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_validation">classpath:org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_validation.config</config>
+ <config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_validation">classpath:org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_validation.config</config>
<bundle>mvn:org.apache.sling/org.apache.sling.validation.api/1.0.0</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.validation.core/1.0.4</bundle>
<!-- dependencies -->
@@ -333,8 +334,8 @@
<feature version="${project.version}">sling-servlets</feature>
</feature>
<feature name="sling-xss" version="${project.version}">
- <config external="true" name="org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_xss">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_xss</config>
- <config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_xss">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_xss</config>
+ <config external="true" name="org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_xss">classpath:org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_xss.config</config>
+ <config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_xss">classpath:org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_xss.config</config>
<bundle>mvn:org.apache.sling/org.apache.sling.xss/2.2.6</bundle>
<!-- dependencies -->
<feature version="${project.version}">sling</feature>
@@ -372,8 +373,8 @@
<feature version="${project.version}">sling-installer</feature>
</feature>
<feature name="sling-installer-provider-jcr" version="${project.version}">
- <config external="true" name="org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_installer_jcr">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_installer_jcr</config>
- <config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_installer_jcr">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_installer_jcr</config>
+ <config external="true" name="org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_installer_jcr">classpath:org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_installer_jcr.config</config>
+ <config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_installer_jcr">classpath:org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_installer_jcr.config</config>
<bundle>mvn:org.apache.sling/org.apache.sling.installer.provider.jcr/3.3.0</bundle>
<!-- dependencies -->
<feature version="${project.version}">sling-installer</feature>
@@ -381,10 +382,10 @@
</feature>
<!-- Apache Sling JCR -->
<feature name="sling-jcr" version="${project.version}">
- <config external="true" name="org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment~sling_jcr">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment~sling_jcr</config>
- <config external="true" name="org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_jcr_contentloader">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_jcr_contentloader</config>
- <config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_jcr_resource">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_jcr_resource</config>
- <config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_jcr_contentloader">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_jcr_contentloader</config>
+ <config external="true" name="org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment~sling_jcr">classpath:org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment~sling_jcr.config</config>
+ <config external="true" name="org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_jcr_contentloader">classpath:org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_jcr_contentloader.config</config>
+ <config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_jcr_resource">classpath:org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_jcr_resource.config</config>
+ <config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_jcr_contentloader">classpath:org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_jcr_contentloader.config</config>
<bundle>mvn:org.apache.sling/org.apache.sling.jcr.api/2.4.0</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.jcr.base/3.1.6</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.jcr.contentloader/2.4.0</bundle>
@@ -427,17 +428,17 @@
<feature name="sling-quickstart-oak" version="${project.version}"><!-- hidden="true" -->
<!-- Sling with Oak Repository and Felix Web Console -->
<!-- http://jackrabbit.apache.org/oak/docs/osgi_config.html -->
- <config external="true" name="org.apache.felix.jaas.Configuration.factory~GuestLoginModule">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.felix.jaas.Configuration.factory~GuestLoginModule</config>
- <config external="true" name="org.apache.felix.jaas.Configuration.factory~LoginModuleImpl">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.felix.jaas.Configuration.factory~LoginModuleImpl</config>
- <config external="true" name="org.apache.felix.jaas.Configuration.factory~TokenLoginModule">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.felix.jaas.Configuration.factory~TokenLoginModule</config>
- <config external="true" name="org.apache.felix.jaas.ConfigurationSpi">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.felix.jaas.ConfigurationSpi</config>
- <config external="true" name="org.apache.jackrabbit.oak.security.authentication.AuthenticationConfigurationImpl">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.jackrabbit.oak.security.authentication.AuthenticationConfigurationImpl</config>
- <config external="true" name="org.apache.jackrabbit.oak.security.user.UserConfigurationImpl">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.jackrabbit.oak.security.user.UserConfigurationImpl</config>
- <config external="true" name="org.apache.jackrabbit.oak.security.user.RandomAuthorizableNodeName">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.jackrabbit.oak.security.user.RandomAuthorizableNodeName</config>
- <config external="true" name="org.apache.jackrabbit.oak.spi.security.user.action.DefaultAuthorizableActionProvider">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.jackrabbit.oak.spi.security.user.action.DefaultAuthorizableActionProvider</config>
- <config external="true" name="org.apache.sling.jcr.repoinit.RepositoryInitializer~sling">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling</config>
- <config external="true" name="org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_mapping">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_mapping</config>
- <config external="true" name="org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_readall">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_readall</config>
+ <config external="true" name="org.apache.felix.jaas.Configuration.factory~GuestLoginModule">classpath:org.apache.felix.jaas.Configuration.factory~GuestLoginModule.config</config>
+ <config external="true" name="org.apache.felix.jaas.Configuration.factory~LoginModuleImpl">classpath:org.apache.felix.jaas.Configuration.factory~LoginModuleImpl.config</config>
+ <config external="true" name="org.apache.felix.jaas.Configuration.factory~TokenLoginModule">classpath:org.apache.felix.jaas.Configuration.factory~TokenLoginModule.config</config>
+ <config external="true" name="org.apache.felix.jaas.ConfigurationSpi">classpath:org.apache.felix.jaas.ConfigurationSpi.config</config>
+ <config external="true" name="org.apache.jackrabbit.oak.security.authentication.AuthenticationConfigurationImpl">classpath:org.apache.jackrabbit.oak.security.authentication.AuthenticationConfigurationImpl.config</config>
+ <config external="true" name="org.apache.jackrabbit.oak.security.user.UserConfigurationImpl">classpath:org.apache.jackrabbit.oak.security.user.UserConfigurationImpl.config</config>
+ <config external="true" name="org.apache.jackrabbit.oak.security.user.RandomAuthorizableNodeName">classpath:org.apache.jackrabbit.oak.security.user.RandomAuthorizableNodeName.config</config>
+ <config external="true" name="org.apache.jackrabbit.oak.spi.security.user.action.DefaultAuthorizableActionProvider">classpath:org.apache.jackrabbit.oak.spi.security.user.action.DefaultAuthorizableActionProvider.config</config>
+ <config external="true" name="org.apache.sling.jcr.repoinit.RepositoryInitializer~sling">classpath:org.apache.sling.jcr.repoinit.RepositoryInitializer~sling.config</config>
+ <config external="true" name="org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_mapping">classpath:org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_mapping.config</config>
+ <config external="true" name="org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_readall">classpath:org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_readall.config</config>
<!-- dependencies -->
<feature>webconsole</feature>
<feature version="${project.version}">sling</feature>
@@ -454,8 +455,8 @@
<bundle>mvn:org.apache.felix/org.apache.felix.webconsole.plugins.packageadmin/1.0.4</bundle>
</feature>
<feature name="sling-quickstart-oak-tar" version="${project.version}">
- <config external="true" name="org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexProviderService">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexProviderService</config>
- <config external="true" name="org.apache.jackrabbit.oak.segment.SegmentNodeStoreService">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.jackrabbit.oak.segment.SegmentNodeStoreService</config>
+ <config external="true" name="org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexProviderService">classpath:org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexProviderService.config</config>
+ <config external="true" name="org.apache.jackrabbit.oak.segment.SegmentNodeStoreService">classpath:org.apache.jackrabbit.oak.segment.SegmentNodeStoreService.config</config>
<feature version="${project.version}">sling-quickstart-oak</feature>
<bundle>mvn:org.apache.jackrabbit/oak-lucene/1.34.0</bundle>
<bundle>mvn:org.apache.jackrabbit/oak-segment-tar/1.34.0</bundle>
@@ -472,8 +473,8 @@
</capability>
</feature>
<feature name="sling-quickstart-oak-mongo" version="${project.version}">
- <config external="true" name="org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexProviderService">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexProviderService</config>
- <config external="true" name="org.apache.jackrabbit.oak.plugins.document.DocumentNodeStoreService">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.jackrabbit.oak.plugins.document.DocumentNodeStoreService</config>
+ <config external="true" name="org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexProviderService">classpath:org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexProviderService.config</config>
+ <config external="true" name="org.apache.jackrabbit.oak.plugins.document.DocumentNodeStoreService">classpath:org.apache.jackrabbit.oak.plugins.document.DocumentNodeStoreService.config</config>
<feature version="${project.version}">sling-quickstart-oak</feature>
<bundle>mvn:org.apache.jackrabbit/oak-lucene/1.34.0</bundle>
<bundle>mvn:org.apache.jackrabbit/oak-store-document/1.34.0</bundle>
@@ -489,8 +490,8 @@
</feature>
<!-- Apache Sling Scripting -->
<feature name="sling-scripting" version="${project.version}">
- <config external="true" name="org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_scripting">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_scripting</config>
- <config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_scripting">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_scripting</config>
+ <config external="true" name="org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_scripting">classpath:org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_scripting.config</config>
+ <config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_scripting">classpath:org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_scripting.config</config>
<bundle>mvn:org.apache.sling/org.apache.sling.scripting.api/2.2.0</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.scripting.core/2.2.0</bundle>
<!-- dependencies -->
@@ -542,7 +543,7 @@
<feature version="${project.version}">sling-caconfig</feature>
</feature>
<feature name="sling-scripting-htl" version="${project.version}">
- <config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_scripting_htl">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_scripting_htl</config>
+ <config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_scripting_htl">classpath:org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_scripting_htl.config</config>
<bundle>mvn:org.apache.sling/org.apache.sling.scripting.sightly/1.3.2-1.4.0</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.scripting.sightly.compiler/1.2.6-1.4.0</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.scripting.sightly.compiler.java/1.2.0-1.4.0</bundle>
@@ -561,7 +562,7 @@
<bundle dependency="true">mvn:org.antlr/antlr4-runtime/4.8-1</bundle>
</feature>
<feature name="sling-scripting-thymeleaf" version="${project.version}">
- <config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_scripting_thymeleaf">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_scripting_thymeleaf</config>
+ <config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_scripting_thymeleaf">classpath:org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_scripting_thymeleaf.config</config>
<bundle>mvn:org.apache.sling/org.apache.sling.scripting.thymeleaf/2.0.2</bundle>
<!-- dependencies -->
<feature version="${project.version}">thymeleaf</feature>
@@ -571,7 +572,7 @@
</feature>
<!-- Apache Sling Servlets -->
<feature name="sling-servlets" version="${project.version}">
- <config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_servlets">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_servlets</config>
+ <config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_servlets">classpath:org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_servlets.config</config>
<bundle>mvn:org.apache.sling/org.apache.sling.servlets.get/2.1.40</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.servlets.post/2.3.36</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.servlets.resolver/2.6.4</bundle>
@@ -682,7 +683,7 @@
<!-- Apache Sling Samples -->
<!-- Composum -->
<feature name="composum-nodes" version="${project.version}">
- <config external="true" name="org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment~composum_nodes">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment~composum_nodes</config>
+ <config external="true" name="org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment~composum_nodes">classpath:org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment~composum_nodes.config</config>
<bundle>mvn:com.composum.nodes/composum-nodes-commons/2.1.1</bundle>
<bundle>mvn:com.composum.nodes/composum-nodes-console/2.1.1</bundle>
<bundle>mvn:com.composum.nodes/composum-nodes-jslibs/2.1.1</bundle>
@@ -720,4 +721,8 @@
<bundle dependency="true">mvn:org.apache.aries/org.apache.aries.util/1.1.3</bundle>
<feature version="${project.version}">asm</feature>
</feature>
+ <!-- Pax URL Classpath (KARAF-6904) -->
+ <feature name="pax-url-classpath" version="${project.version}">
+ <bundle>mvn:org.ops4j.pax.url/pax-url-classpath/2.6.3</bundle>
+ </feature>
</features>