incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fmesc...@apache.org
Subject svn commit: r652632 - /incubator/sling/trunk/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/Activator.java
Date Thu, 01 May 2008 19:16:18 GMT
Author: fmeschbe
Date: Thu May  1 12:16:17 2008
New Revision: 652632

URL: http://svn.apache.org/viewvc?rev=652632&view=rev
Log:
SLING-407 Use the current working directory as the parent for the repository
folder if sling.home is not set (previous fix did not really work)

Modified:
    incubator/sling/trunk/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/Activator.java

Modified: incubator/sling/trunk/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/Activator.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/Activator.java?rev=652632&r1=652631&r2=652632&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/Activator.java
(original)
+++ incubator/sling/trunk/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/Activator.java
Thu May  1 12:16:17 2008
@@ -167,19 +167,16 @@
     }
     
     private void initDefaultConfig(Hashtable<String, String> props, BundleContext bundleContext)
throws IOException {
-        File slingHome;
+        File homeDir;
         String slingHomePath = bundleContext.getProperty("sling.home");
         if (slingHomePath != null) {
-            slingHome = new File(slingHomePath);
+            homeDir = new File(slingHomePath, getRepositoryName());
         } else {
-            slingHome = new File("");
+            homeDir = new File(getRepositoryName());
         }
-        
-        // ensure slingHome is an absolute file and log its value
-        log.info("Creating default config, sling.home=" + slingHome);
 
         // make sure jackrabbit home exists
-        File homeDir = new File(slingHome, this.getRepositoryName());
+        log.info("Creating default config for Jackrabbit in " + homeDir);
         if (!homeDir.isDirectory()) {
             if (!homeDir.mkdirs()) {
                 log.info("verifyConfiguration: Cannot create Jackrabbit home "



Mime
View raw message