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 2016/09/07 12:19:50 UTC
svn commit: r1759603 - in
/sling/trunk/karaf/org.apache.sling.karaf-distribution: pom.xml
src/main/resources/etc/custom.properties
Author: olli
Date: Wed Sep 7 12:19:50 2016
New Revision: 1759603
URL: http://svn.apache.org/viewvc?rev=1759603&view=rev
Log:
SLING-6043 Switch from inline configurations to config files
add config files and enable .config extension in Felix File Install
Added:
sling/trunk/karaf/org.apache.sling.karaf-distribution/src/main/resources/etc/custom.properties (with props)
Modified:
sling/trunk/karaf/org.apache.sling.karaf-distribution/pom.xml
Modified: sling/trunk/karaf/org.apache.sling.karaf-distribution/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/karaf/org.apache.sling.karaf-distribution/pom.xml?rev=1759603&r1=1759602&r2=1759603&view=diff
==============================================================================
--- sling/trunk/karaf/org.apache.sling.karaf-distribution/pom.xml (original)
+++ sling/trunk/karaf/org.apache.sling.karaf-distribution/pom.xml Wed Sep 7 12:19:50 2016
@@ -68,6 +68,142 @@
<type>xml</type>
<scope>runtime</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.karaf-configs</artifactId>
+ <version>${project.version}</version>
+ <classifier>org.apache.felix.jaas.Configuration.factory-GuestLoginModule</classifier>
+ <type>config</type>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.karaf-configs</artifactId>
+ <version>${project.version}</version>
+ <classifier>org.apache.felix.jaas.Configuration.factory-LoginModuleImpl</classifier>
+ <type>config</type>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.karaf-configs</artifactId>
+ <version>${project.version}</version>
+ <classifier>org.apache.felix.jaas.Configuration.factory-TokenLoginModule</classifier>
+ <type>config</type>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.karaf-configs</artifactId>
+ <version>${project.version}</version>
+ <classifier>org.apache.felix.jaas.ConfigurationSpi</classifier>
+ <type>config</type>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.karaf-configs</artifactId>
+ <version>${project.version}</version>
+ <classifier>org.apache.jackrabbit.oak.plugins.document.DocumentNodeStoreService</classifier>
+ <type>config</type>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.karaf-configs</artifactId>
+ <version>${project.version}</version>
+ <classifier>org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexProviderService</classifier>
+ <type>config</type>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.karaf-configs</artifactId>
+ <version>${project.version}</version>
+ <classifier>org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStoreService</classifier>
+ <type>config</type>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.karaf-configs</artifactId>
+ <version>${project.version}</version>
+ <classifier>org.apache.jackrabbit.oak.security.authentication.AuthenticationConfigurationImpl</classifier>
+ <type>config</type>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.karaf-configs</artifactId>
+ <version>${project.version}</version>
+ <classifier>org.apache.jackrabbit.oak.security.user.RandomAuthorizableNodeName</classifier>
+ <type>config</type>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.karaf-configs</artifactId>
+ <version>${project.version}</version>
+ <classifier>org.apache.jackrabbit.oak.security.user.UserConfigurationImpl</classifier>
+ <type>config</type>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.karaf-configs</artifactId>
+ <version>${project.version}</version>
+ <classifier>org.apache.jackrabbit.oak.spi.security.user.action.DefaultAuthorizableActionProvider</classifier>
+ <type>config</type>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.karaf-configs</artifactId>
+ <version>${project.version}</version>
+ <classifier>org.apache.sling.commons.messaging.mail.internal.SimpleMailBuilder</classifier>
+ <type>config</type>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.karaf-configs</artifactId>
+ <version>${project.version}</version>
+ <classifier>org.apache.sling.nosql.couchbase.client.CouchbaseClient.factory.config-default</classifier>
+ <type>config</type>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.karaf-configs</artifactId>
+ <version>${project.version}</version>
+ <classifier>org.apache.sling.nosql.couchbase.resourceprovider.CouchbaseNoSqlResourceProviderFactory.factory.config-default</classifier>
+ <type>config</type>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.karaf-configs</artifactId>
+ <version>${project.version}</version>
+ <classifier>org.apache.sling.nosql.mongodb.resourceprovider.MongoDBNoSqlResourceProviderFactory.factory.config-default</classifier>
+ <type>config</type>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.karaf-configs</artifactId>
+ <version>${project.version}</version>
+ <classifier>org.apache.sling.resourceresolver.impl.observation.OsgiObservationBridge</classifier>
+ <type>config</type>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.karaf-configs</artifactId>
+ <version>${project.version}</version>
+ <classifier>org.apache.sling.samples.fling.internal.WiserSmtpService</classifier>
+ <type>config</type>
+ <scope>runtime</scope>
+ </dependency>
</dependencies>
<build>
Added: sling/trunk/karaf/org.apache.sling.karaf-distribution/src/main/resources/etc/custom.properties
URL: http://svn.apache.org/viewvc/sling/trunk/karaf/org.apache.sling.karaf-distribution/src/main/resources/etc/custom.properties?rev=1759603&view=auto
==============================================================================
--- sling/trunk/karaf/org.apache.sling.karaf-distribution/src/main/resources/etc/custom.properties (added)
+++ sling/trunk/karaf/org.apache.sling.karaf-distribution/src/main/resources/etc/custom.properties Wed Sep 7 12:19:50 2016
@@ -0,0 +1,31 @@
+################################################################################
+#
+# 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.
+#
+################################################################################
+
+#
+# All the values specified here will override the default values given
+# in config.properties.
+#
+
+karaf.systemBundlesStartLevel=50
+
+#
+# You can place any customized configuration here.
+#
+
+felix.fileinstall.filter = .*\\.(cfg|config)
Propchange: sling/trunk/karaf/org.apache.sling.karaf-distribution/src/main/resources/etc/custom.properties
------------------------------------------------------------------------------
svn:executable = *