Changeset 3714 for print

Timestamp:

12/21/10 11:49:23 (17 months ago)

Author:

jeichar

Message:

allow temp dir to be overriden in the web.xml r=elemoine closes #537

Location:

print/trunk

Files:

• docs/installation.txt (modified) (1 diff)
• src/main/java/org/mapfish/print/servlet/MapPrinterServlet.java (modified) (2 diffs)

print/trunk/docs/installation.txt

@@ -153 +153 @@
 3. Add a config.yaml file (from the `samples <https://trac.mapfish.org/trac/mapfish/browser/print/trunk/samples>`_, for example) to the root of your web application. 
 
+Configuring Servlet Temp Directory
+++++++++++++++++++++++++++++++++++
+By default the default servlet temporary directory will be used but that behaviour can be overridden setting the init-param *tempdir*.  If this parameter is set the servlet must have write access to the directory.
+
 Ruby on rails
-++++++++++++++
+~~~~~~~~~~~~~
 
 TODO write the doc.
 
 Command line
-+++++++++++++
+~~~~~~~~~~~~
 
 For debugging or calling from other environments, you can run the print module from the command line.

print/trunk/src/main/java/org/mapfish/print/servlet/MapPrinterServlet.java

@@ -45 +45 @@
 public class MapPrinterServlet extends BaseMapServlet {
     private static final long serialVersionUID = -4706371598927161642L;
-    
+    private static final String CONTEXT_TEMPDIR = "javax.servlet.context.tempdir";
+
     private static final String INFO_URL = "/info.json";
     private static final String PRINT_URL = "/print.pdf";
@@ -364 +365 @@
     protected File getTempDir() {
         if (tempDir == null) {
-            tempDir = new File((File) getServletContext().
-                    getAttribute("javax.servlet.context.tempdir"), "mapfish-print");
-            tempDir.mkdirs();
+            String tempDirPath = getInitParameter("tempdir");
+            if (tempDirPath != null) {
+                tempDir = new File(tempDirPath);
+            } else {
+                tempDir = (File) getServletContext().getAttribute(CONTEXT_TEMPDIR);
+            }
+            if (!tempDir.exists() && !tempDir.mkdirs()) {
+                throw new RuntimeException("unable to create dir:" + tempDir);
+            }
+
         }
         LOGGER.debug("Using '" + tempDir.getAbsolutePath() + "' as temporary directory");