Update of /var/cvs/src/org/mmbase/storage
In directory james.mmbase.org:/tmp/cvs-serv32026
Modified Files:
StorageManagerFactory.java
Log Message:
a method to determin the 'datadir' (should perhaps be moved to mmbase.java
itself)
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/storage
Index: StorageManagerFactory.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/storage/StorageManagerFactory.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- StorageManagerFactory.java 17 Sep 2007 17:22:30 -0000 1.32
+++ StorageManagerFactory.java 22 Feb 2008 12:28:19 -0000 1.33
@@ -11,6 +11,7 @@
import java.util.*;
import org.xml.sax.InputSource;
+import javax.servlet.ServletContext;
import org.mmbase.storage.search.SearchQueryHandler;
import org.mmbase.storage.util.*;
@@ -34,7 +35,7 @@
*
* @author Pierre van Rooden
* @since MMBase-1.7
- * @version $Id: StorageManagerFactory.java,v 1.32 2007/09/17 17:22:30 michiel
Exp $
+ * @version $Id: StorageManagerFactory.java,v 1.33 2008/02/22 12:28:19 michiel
Exp $
*/
public abstract class StorageManagerFactory<SM extends StorageManager> {
@@ -656,5 +657,18 @@
return TimeZone.getDefault().getOffset(time);
}
+ protected String getDataDir() {
+ String dataDir = mmbase.getInitParameter("datadir");
+ if (dataDir == null || dataDir.equals("")) {
+ ServletContext sc = MMBaseContext.getServletContext();
+ dataDir = sc != null ? sc.getRealPath("/WEB-INF/data") : null;
+ if (dataDir == null) {
+ dataDir = System.getProperty("user.dir") +
java.io.File.separator + "data";
+ }
+ }
+ log.info("MMBase data dir: " + dataDir);
+ return dataDir;
+ }
+
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
