Update of /var/cvs/applications/resources/src/org/mmbase/servlet
In directory james.mmbase.org:/tmp/cvs-serv2670
Modified Files:
FileServlet.java
Log Message:
using MMBase.getDataDir rather then doing it itself
See also:
http://cvs.mmbase.org/viewcvs/applications/resources/src/org/mmbase/servlet
Index: FileServlet.java
===================================================================
RCS file:
/var/cvs/applications/resources/src/org/mmbase/servlet/FileServlet.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- FileServlet.java 26 Jul 2007 14:38:26 -0000 1.6
+++ FileServlet.java 3 Sep 2008 17:17:35 -0000 1.7
@@ -26,7 +26,7 @@
* Straight-forward filter which can serve files from one directory (the
directory 'files' in the
* mmbase 'datadir') outside the web application root.
*
- * @version $Id: FileServlet.java,v 1.6 2007/07/26 14:38:26 michiel Exp $
+ * @version $Id: FileServlet.java,v 1.7 2008/09/03 17:17:35 michiel Exp $
* @author Michiel Meeuwissen
* @since MMBase-1.9
* @see AttachmentServlet
@@ -48,26 +48,13 @@
}
log = Logging.getLoggerInstance(FileServlet.class);
}
+
public static void init(HttpServletResponse res) {
if (files == null) {
if (log == null) {
log = Logging.getLoggerInstance(FileServlet.class);
}
- String dataDir = MMBase.getMMBase().getInitParameter("datadir");
- if (dataDir != null && ! "".equals(dataDir)) {
- File data;
- if (dataDir.startsWith(".")) {
- data = new File(new
File(MMBaseContext.getServletContext().getRealPath("WEB-INF/data/")), dataDir);
- } else if (dataDir.startsWith("/")) {
- data = new File(dataDir);
- } else {
- data = new
File(MMBaseContext.getServletContext().getRealPath(dataDir));
- }
- files = new File(data, "files");
- } else {
- files = new
File(MMBaseContext.getServletContext().getRealPath("WEB-INF/data/files"));
- }
-
+ files = MMBase.getMMBase().getDataDir();
if (! files.exists()) {
if (files.mkdirs()) {
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
