You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by bd...@apache.org on 2013/10/24 11:19:51 UTC
svn commit: r1535323 - in /sling/trunk/bundles/jcr: it-jackrabbit-oak/
it-jackrabbit-oak/pom.xml
oak-server/src/main/java/org/apache/sling/oak/server/Activator.java
Author: bdelacretaz
Date: Thu Oct 24 09:19:50 2013
New Revision: 1535323
URL: http://svn.apache.org/r1535323
Log:
SLING-2788 - put Oak data under Sling home folder
Modified:
sling/trunk/bundles/jcr/it-jackrabbit-oak/ (props changed)
sling/trunk/bundles/jcr/it-jackrabbit-oak/pom.xml
sling/trunk/bundles/jcr/oak-server/src/main/java/org/apache/sling/oak/server/Activator.java
Propchange: sling/trunk/bundles/jcr/it-jackrabbit-oak/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Oct 24 09:19:50 2013
@@ -3,6 +3,7 @@ sling
bin
logs
jackrabbit
+oak
derby.log
*.iml
*.ipr
@@ -13,3 +14,4 @@ derby.log
.externalToolBuilders
maven-eclipse.xml
oak-server-default-NodeStore
+
Modified: sling/trunk/bundles/jcr/it-jackrabbit-oak/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/it-jackrabbit-oak/pom.xml?rev=1535323&r1=1535322&r2=1535323&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/it-jackrabbit-oak/pom.xml (original)
+++ sling/trunk/bundles/jcr/it-jackrabbit-oak/pom.xml Thu Oct 24 09:19:50 2013
@@ -95,22 +95,6 @@
</executions>
</plugin>
<plugin>
- <artifactId>maven-clean-plugin</artifactId>
- <configuration>
- <filesets>
- <fileset>
- <directory>${basedir}</directory>
- <includes>
- <include>derby.log</include>
- </includes>
- </fileset>
- <fileset>
- <directory>jackrabbit</directory>
- </fileset>
- </filesets>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
@@ -126,9 +110,9 @@
<fileset>
<directory>${basedir}</directory>
<includes>
- <include>oak-server-default-NodeStore</include>
<include>sling</include>
<include>jackrabbit</include>
+ <include>oak</include>
<include>derby.log</include>
</includes>
</fileset>
Modified: sling/trunk/bundles/jcr/oak-server/src/main/java/org/apache/sling/oak/server/Activator.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/oak-server/src/main/java/org/apache/sling/oak/server/Activator.java?rev=1535323&r1=1535322&r2=1535323&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/oak-server/src/main/java/org/apache/sling/oak/server/Activator.java (original)
+++ sling/trunk/bundles/jcr/oak-server/src/main/java/org/apache/sling/oak/server/Activator.java Thu Oct 24 09:19:50 2013
@@ -17,6 +17,7 @@
*/
package org.apache.sling.oak.server;
+import java.io.File;
import java.util.Hashtable;
import org.osgi.framework.BundleActivator;
@@ -64,10 +65,20 @@ public class Activator implements Bundle
return;
}
- // Else create a default NodeStore config
+ // else setup Oak data folder
+ final String SLING_HOME = "sling.home";
+ final String oakRepoPath = "oak/repository";
+ final String slingHome = context.getProperty(SLING_HOME);
+ final File repositoryHome = slingHome == null ? new File(oakRepoPath) : new File(slingHome, oakRepoPath);
+ repositoryHome.mkdirs();
+ if(!repositoryHome.isDirectory()) {
+ throw new IllegalStateException("Cannot create or access " + repositoryHome.getAbsolutePath());
+ }
+
+ // and create a default NodeStore config
final Hashtable<String, String> props = new Hashtable<String, String>();
- props.put("name", "Default NodeStore config from the oak-server bundle");
- props.put("repository.home", "oak-server-default-NodeStore");
+ props.put("name", "Default NodeStore config created by " + getClass().getName());
+ props.put("repository.home", repositoryHome.getAbsolutePath());
Configuration config = ca.getConfiguration(nodeStoreServicePid);
config.setBundleLocation(null);
config.update(props);