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/12/21 14:25:18 UTC
svn commit: r1775435 - in /sling/trunk/karaf/org.apache.sling.karaf-configs:
./ src/main/resources/
Author: olli
Date: Wed Dec 21 14:25:18 2016
New Revision: 1775435
URL: http://svn.apache.org/viewvc?rev=1775435&view=rev
Log:
SLING-6426 Use Felix Configuration Admin format for all configurations
Added:
sling/trunk/karaf/org.apache.sling.karaf-configs/src/main/resources/org.apache.jackrabbit.oak.plugins.document.DocumentNodeStoreService.config
- copied, changed from r1775383, sling/trunk/karaf/org.apache.sling.karaf-configs/src/main/resources/org.apache.jackrabbit.oak.plugins.document.DocumentNodeStoreService.cfg
Removed:
sling/trunk/karaf/org.apache.sling.karaf-configs/src/main/resources/org.apache.jackrabbit.oak.plugins.document.DocumentNodeStoreService.cfg
Modified:
sling/trunk/karaf/org.apache.sling.karaf-configs/pom.xml
Modified: sling/trunk/karaf/org.apache.sling.karaf-configs/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/karaf/org.apache.sling.karaf-configs/pom.xml?rev=1775435&r1=1775434&r2=1775435&view=diff
==============================================================================
--- sling/trunk/karaf/org.apache.sling.karaf-configs/pom.xml (original)
+++ sling/trunk/karaf/org.apache.sling.karaf-configs/pom.xml Wed Dec 21 14:25:18 2016
@@ -79,8 +79,8 @@
</artifact>
<artifact>
<classifier>org.apache.jackrabbit.oak.plugins.document.DocumentNodeStoreService</classifier>
- <file>src/main/resources/org.apache.jackrabbit.oak.plugins.document.DocumentNodeStoreService.cfg</file>
- <type>cfg</type>
+ <file>src/main/resources/org.apache.jackrabbit.oak.plugins.document.DocumentNodeStoreService.config</file>
+ <type>config</type>
</artifact>
<artifact>
<classifier>org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexProviderService</classifier>
Copied: sling/trunk/karaf/org.apache.sling.karaf-configs/src/main/resources/org.apache.jackrabbit.oak.plugins.document.DocumentNodeStoreService.config (from r1775383, sling/trunk/karaf/org.apache.sling.karaf-configs/src/main/resources/org.apache.jackrabbit.oak.plugins.document.DocumentNodeStoreService.cfg)
URL: http://svn.apache.org/viewvc/sling/trunk/karaf/org.apache.sling.karaf-configs/src/main/resources/org.apache.jackrabbit.oak.plugins.document.DocumentNodeStoreService.config?p2=sling/trunk/karaf/org.apache.sling.karaf-configs/src/main/resources/org.apache.jackrabbit.oak.plugins.document.DocumentNodeStoreService.config&p1=sling/trunk/karaf/org.apache.sling.karaf-configs/src/main/resources/org.apache.jackrabbit.oak.plugins.document.DocumentNodeStoreService.cfg&r1=1775383&r2=1775435&rev=1775435&view=diff
==============================================================================
--- sling/trunk/karaf/org.apache.sling.karaf-configs/src/main/resources/org.apache.jackrabbit.oak.plugins.document.DocumentNodeStoreService.cfg (original)
+++ sling/trunk/karaf/org.apache.sling.karaf-configs/src/main/resources/org.apache.jackrabbit.oak.plugins.document.DocumentNodeStoreService.config Wed Dec 21 14:25:18 2016
@@ -1,21 +1,2 @@
-################################################################################
-#
-# 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.
-#
-################################################################################
-
mongouri="mongodb://localhost:27017"
db="sling"