Author: olli
Date: Tue Oct 11 20:16:34 2016
New Revision: 1764341
URL: http://svn.apache.org/viewvc?rev=1764341&view=rev
Log:
use cfg format for DocumentNodeStoreService until KARAF-4760 is fixed
Added:
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.config
Modified:
sling/trunk/karaf/org.apache.sling.karaf-configs/pom.xml
sling/trunk/karaf/org.apache.sling.karaf-distribution/pom.xml
sling/trunk/karaf/org.apache.sling.karaf-features/src/main/feature/feature.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=1764341&r1=1764340&r2=1764341&view=diff
==============================================================================
--- sling/trunk/karaf/org.apache.sling.karaf-configs/pom.xml (original)
+++ sling/trunk/karaf/org.apache.sling.karaf-configs/pom.xml Tue Oct 11
20:16:34 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.config</file>
- <type>config</type>
+
<file>src/main/resources/org.apache.jackrabbit.oak.plugins.document.DocumentNodeStoreService.cfg</file>
+ <type>cfg</type>
</artifact>
<artifact>
<classifier>org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexProviderService</classifier>
Added:
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.cfg?rev=1764341&view=auto
==============================================================================
---
sling/trunk/karaf/org.apache.sling.karaf-configs/src/main/resources/org.apache.jackrabbit.oak.plugins.document.DocumentNodeStoreService.cfg
(added)
+++
sling/trunk/karaf/org.apache.sling.karaf-configs/src/main/resources/org.apache.jackrabbit.oak.plugins.document.DocumentNodeStoreService.cfg
Tue Oct 11 20:16:34 2016
@@ -0,0 +1,21 @@
+################################################################################
+#
+# 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"
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=1764341&r1=1764340&r2=1764341&view=diff
==============================================================================
--- sling/trunk/karaf/org.apache.sling.karaf-distribution/pom.xml (original)
+++ sling/trunk/karaf/org.apache.sling.karaf-distribution/pom.xml Tue Oct 11
20:16:34 2016
@@ -105,7 +105,7 @@
<artifactId>org.apache.sling.karaf-configs</artifactId>
<version>${project.version}</version>
<classifier>org.apache.jackrabbit.oak.plugins.document.DocumentNodeStoreService</classifier>
- <type>config</type>
+ <type>cfg</type>
<scope>runtime</scope>
</dependency>
<dependency>
Modified:
sling/trunk/karaf/org.apache.sling.karaf-features/src/main/feature/feature.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/karaf/org.apache.sling.karaf-features/src/main/feature/feature.xml?rev=1764341&r1=1764340&r2=1764341&view=diff
==============================================================================
---
sling/trunk/karaf/org.apache.sling.karaf-features/src/main/feature/feature.xml
(original)
+++
sling/trunk/karaf/org.apache.sling.karaf-features/src/main/feature/feature.xml
Tue Oct 11 20:16:34 2016
@@ -402,7 +402,7 @@
</feature>
<feature name="sling-launchpad-oak-mongo" version="${feature.version}">
<feature version="${feature.version}">sling-jcr-oak</feature>
- <configfile
finalname="/etc/org.apache.jackrabbit.oak.plugins.document.DocumentNodeStoreService.config">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.jackrabbit.oak.plugins.document.DocumentNodeStoreService</configfile>
+ <configfile
finalname="/etc/org.apache.jackrabbit.oak.plugins.document.DocumentNodeStoreService.cfg">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/cfg/org.apache.jackrabbit.oak.plugins.document.DocumentNodeStoreService</configfile>
<configfile
finalname="/etc/org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexProviderService.config">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexProviderService</configfile>
<feature version="${feature.version}">sling-launchpad-oak</feature>
<bundle dependency="true">mvn:org.mongodb/mongo-java-driver/2.14.3</bundle>
