diff options
| author | Egil Moeller <egil.moller@freecode.no> | 2010-03-31 23:55:01 +0200 |
|---|---|---|
| committer | Egil Moeller <egil.moller@freecode.no> | 2010-03-31 23:55:01 +0200 |
| commit | 8cdacdd0e234318ca96410929cf122431a8ee0ed (patch) | |
| tree | 506f14293fc7dc50e8eb7d6d2a6093705c72fbe9 /infrastructure | |
| parent | e50028ed10e5ba0220ac3730dd3c0d698e315cdb (diff) | |
| parent | 8e23148936c5aa043e7f6bfe56edc8b0f3a20b43 (diff) | |
| download | etherpad-8cdacdd0e234318ca96410929cf122431a8ee0ed.tar.gz etherpad-8cdacdd0e234318ca96410929cf122431a8ee0ed.tar.xz etherpad-8cdacdd0e234318ca96410929cf122431a8ee0ed.zip | |
Merge branch 'john'
Diffstat (limited to 'infrastructure')
| -rw-r--r-- | infrastructure/net.appjet.oui/main.scala | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/infrastructure/net.appjet.oui/main.scala b/infrastructure/net.appjet.oui/main.scala index 42cd268..8181fdf 100644 --- a/infrastructure/net.appjet.oui/main.scala +++ b/infrastructure/net.appjet.oui/main.scala @@ -220,9 +220,9 @@ object main { val handler = new Context(server, "/", Context.NO_SESSIONS | Context.NO_SECURITY); handler.addServlet(new ServletHolder(new OuiServlet), "/"); -// val filterHolder = new FilterHolder(new MultipartFilter()); -// filterHolder.setInitParameter("uploadDir", System.getProperty("java.io.tmpdir")); -// handler.addFilter(filterHolder, "/*", 1); + val filterHolder = new FilterHolder(new MultipartFilter()); + filterHolder.setInitParameter("uploadDir", System.getProperty("java.io.tmpdir")); + handler.addFilter(filterHolder, "/*", 1); global.context = handler; |