Update of /var/cvs/src/org/mmbase/storage/implementation/database
In directory james.mmbase.org:/tmp/cvs-serv31977
Modified Files:
DatabaseStorageManagerFactory.java GenericDataSource.java
Log Message:
making sure that a datadir is present
See also:
http://cvs.mmbase.org/viewcvs/src/org/mmbase/storage/implementation/database
Index: DatabaseStorageManagerFactory.java
===================================================================
RCS file:
/var/cvs/src/org/mmbase/storage/implementation/database/DatabaseStorageManagerFactory.java,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- DatabaseStorageManagerFactory.java 12 Dec 2007 13:01:01 -0000 1.48
+++ DatabaseStorageManagerFactory.java 22 Feb 2008 12:27:48 -0000 1.49
@@ -14,8 +14,10 @@
import javax.naming.*;
import javax.sql.DataSource;
-import javax.servlet.ServletContext;
import java.io.*;
+import javax.servlet.ServletContext;
+import java.text.*;
+
import org.mmbase.module.core.MMBaseContext;
import org.mmbase.storage.*;
@@ -39,7 +41,7 @@
*
* @author Pierre van Rooden
* @since MMBase-1.7
- * @version $Id: DatabaseStorageManagerFactory.java,v 1.48 2007/12/12 13:01:01
michiel Exp $
+ * @version $Id: DatabaseStorageManagerFactory.java,v 1.49 2008/02/22 12:27:48
michiel Exp $
*/
public class DatabaseStorageManagerFactory extends
StorageManagerFactory<DatabaseStorageManager> {
@@ -367,17 +369,10 @@
if (basePath == BASE_PATH_UNSET) {
basePath = (String) getAttribute(Attributes.BINARY_FILE_PATH);
if (basePath == null || basePath.equals("")) {
- basePath = mmbase.getInitParameter("datadir");
- if (basePath == null || basePath.equals("")) {
- ServletContext sc = MMBaseContext.getServletContext();
- basePath = sc != null ? sc.getRealPath("/WEB-INF/data") :
null;
- if (basePath == null) {
- basePath = System.getProperty("user.dir") +
File.separator + "data";
- }
- }
-
+ basePath = getDataDir();
} else {
- java.io.File baseFile = new java.io.File(basePath);
+ MessageFormat mf = new MessageFormat(basePath);
+ java.io.File baseFile = new
java.io.File(mf.format(getDataDir()));
if (! baseFile.isAbsolute()) {
ServletContext sc = MMBaseContext.getServletContext();
String absolute = sc != null ? sc.getRealPath("/") +
File.separator : null;
@@ -388,6 +383,8 @@
if (basePath == null) {
log.warn("Cannot determin a Binary File Base Path");
return null;
+ } else {
+ log.service("Binary file base path " + basePath);
}
File baseDir = new File(basePath);
try {
Index: GenericDataSource.java
===================================================================
RCS file:
/var/cvs/src/org/mmbase/storage/implementation/database/GenericDataSource.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- GenericDataSource.java 15 Jun 2007 08:59:00 -0000 1.15
+++ GenericDataSource.java 22 Feb 2008 12:27:48 -0000 1.16
@@ -32,7 +32,7 @@
* @author Pierre van Rooden
* @author Michiel Meeuwissen
* @since MMBase-1.7
- * @version $Id: GenericDataSource.java,v 1.15 2007/06/15 08:59:00 michiel Exp
$
+ * @version $Id: GenericDataSource.java,v 1.16 2008/02/22 12:27:48 michiel Exp
$
*/
public final class GenericDataSource implements DataSource {
private static final Logger log =
Logging.getLoggerInstance(GenericDataSource.class);
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
