You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2017/10/18 23:27:36 UTC

[sling-org-apache-sling-karaf-configs] 18/39: SLING-6426 Use Felix Configuration Admin format for all configurations

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-karaf-configs.git

commit 1a8494cb8903ae918b4bb90f79bf1d962e43108c
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Wed Dec 21 14:25:18 2016 +0000

    SLING-6426 Use Felix Configuration Admin format for all configurations
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1775435 13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml                                             |  4 ++--
 ...ak.plugins.document.DocumentNodeStoreService.cfg | 21 ---------------------
 ...plugins.document.DocumentNodeStoreService.config |  2 ++
 3 files changed, 4 insertions(+), 23 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1c5c380..fe78c3e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>
diff --git a/src/main/resources/org.apache.jackrabbit.oak.plugins.document.DocumentNodeStoreService.cfg b/src/main/resources/org.apache.jackrabbit.oak.plugins.document.DocumentNodeStoreService.cfg
deleted file mode 100644
index a16b733..0000000
--- a/src/main/resources/org.apache.jackrabbit.oak.plugins.document.DocumentNodeStoreService.cfg
+++ /dev/null
@@ -1,21 +0,0 @@
-################################################################################
-#
-#    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"
diff --git a/src/main/resources/org.apache.jackrabbit.oak.plugins.document.DocumentNodeStoreService.config b/src/main/resources/org.apache.jackrabbit.oak.plugins.document.DocumentNodeStoreService.config
new file mode 100644
index 0000000..4d31389
--- /dev/null
+++ b/src/main/resources/org.apache.jackrabbit.oak.plugins.document.DocumentNodeStoreService.config
@@ -0,0 +1,2 @@
+mongouri="mongodb://localhost:27017"
+db="sling"

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.