Update of /var/cvs/src/org/mmbase/storage
In directory james.mmbase.org:/tmp/cvs-serv8078
Modified Files:
Tag: MMBase-1_8
StorageManagerFactory.java
Log Message:
MMB-1551
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/storage
See also: http://www.mmbase.org/jira/browse/MMB-1551
Index: StorageManagerFactory.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/storage/StorageManagerFactory.java,v
retrieving revision 1.27.2.1
retrieving revision 1.27.2.2
diff -u -b -r1.27.2.1 -r1.27.2.2
--- StorageManagerFactory.java 13 Sep 2007 12:39:52 -0000 1.27.2.1
+++ StorageManagerFactory.java 10 Jun 2008 11:16:32 -0000 1.27.2.2
@@ -12,6 +12,7 @@
import java.util.*;
import org.xml.sax.InputSource;
+import javax.servlet.ServletContext;
import org.mmbase.storage.search.SearchQueryHandler;
import org.mmbase.storage.util.*;
@@ -36,7 +37,7 @@
*
* @author Pierre van Rooden
* @since MMBase-1.7
- * @version $Id: StorageManagerFactory.java,v 1.27.2.1 2007/09/13 12:39:52
nklasens Exp $
+ * @version $Id: StorageManagerFactory.java,v 1.27.2.2 2008/06/10 11:16:32
michiel Exp $
*/
public abstract class StorageManagerFactory {
@@ -660,5 +661,17 @@
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";
+ }
+ }
+ return dataDir;
+ }
+
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
