You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by to...@apache.org on 2015/03/23 20:48:18 UTC

svn commit: r1668705 - in /sling/trunk/contrib/sling-s3: crank-s3.d/30-config-s3.txt crank.d/20-properties.txt crank.d/30-config-oak-segment.txt

Author: tomekr
Date: Mon Mar 23 19:48:18 2015
New Revision: 1668705

URL: http://svn.apache.org/r1668705
Log:
SLING-4502 Replace sling dir with ${sling.home} placeholder

Modified:
    sling/trunk/contrib/sling-s3/crank-s3.d/30-config-s3.txt
    sling/trunk/contrib/sling-s3/crank.d/20-properties.txt
    sling/trunk/contrib/sling-s3/crank.d/30-config-oak-segment.txt

Modified: sling/trunk/contrib/sling-s3/crank-s3.d/30-config-s3.txt
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/sling-s3/crank-s3.d/30-config-s3.txt?rev=1668705&r1=1668704&r2=1668705&view=diff
==============================================================================
--- sling/trunk/contrib/sling-s3/crank-s3.d/30-config-s3.txt (original)
+++ sling/trunk/contrib/sling-s3/crank-s3.d/30-config-s3.txt Mon Mar 23 19:48:18 2015
@@ -4,7 +4,7 @@ config org.apache.jackrabbit.oak.plugins
   s3Bucket=${s3Bucket}
   s3Region=${s3Region}
   s3EndPoint=${s3EndPoint}
-  path=sling/oak
+  path=${sling.home}/oak
 
   connectionTimeout=120000
   socketTimeout=120000

Modified: sling/trunk/contrib/sling-s3/crank.d/20-properties.txt
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/sling-s3/crank.d/20-properties.txt?rev=1668705&r1=1668704&r2=1668705&view=diff
==============================================================================
--- sling/trunk/contrib/sling-s3/crank.d/20-properties.txt (original)
+++ sling/trunk/contrib/sling-s3/crank.d/20-properties.txt Mon Mar 23 19:48:18 2015
@@ -1,8 +1,8 @@
 # Set OSGi framework properties
 osgi.property org.osgi.service.http.port ${port}
 osgi.property sling.home ${sling.home}
-osgi.property repository.home sling/oak/repository
-osgi.property org.osgi.framework.storage sling/osgi.framework.storage
+osgi.property repository.home ${sling.home}/oak/repository
+osgi.property org.osgi.framework.storage ${sling.home}/osgi.framework.storage
 osgi.property org.apache.sling.commons.log.level INFO
 osgi.property org.apache.sling.commons.log.file logs/error.log
 osgi.property org.apache.sling.commons.log.file.number 5

Modified: sling/trunk/contrib/sling-s3/crank.d/30-config-oak-segment.txt
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/sling-s3/crank.d/30-config-oak-segment.txt?rev=1668705&r1=1668704&r2=1668705&view=diff
==============================================================================
--- sling/trunk/contrib/sling-s3/crank.d/30-config-oak-segment.txt (original)
+++ sling/trunk/contrib/sling-s3/crank.d/30-config-oak-segment.txt Mon Mar 23 19:48:18 2015
@@ -1,4 +1,4 @@
 config org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStoreService
   name=Default NodeStore
-  repository.home=sling/oak/repository
+  repository.home=${sling.home}/oak/repository
   customBlobStore=${customBlobStore}