diff options
| author | Egil Moeller <egil.moller@freecode.no> | 2010-04-01 01:50:14 +0200 |
|---|---|---|
| committer | Egil Moeller <egil.moller@freecode.no> | 2010-04-01 01:50:14 +0200 |
| commit | c3b6fb9386a4e1cfca02e61c2ea4fb14c6afc7fc (patch) | |
| tree | ee34d696447bdf94d8f7fa382630974c89d01b86 | |
| parent | 8cdacdd0e234318ca96410929cf122431a8ee0ed (diff) | |
| download | etherpad-c3b6fb9386a4e1cfca02e61c2ea4fb14c6afc7fc.tar.gz etherpad-c3b6fb9386a4e1cfca02e61c2ea4fb14c6afc7fc.tar.xz etherpad-c3b6fb9386a4e1cfca02e61c2ea4fb14c6afc7fc.zip | |
Revert "Fixed .txt file import - NOT open office import, just basic text import"
Reverting as this patch breaks the build - dependency on unfree libraries from O'Reilly that aren't available.
This reverts commit e24352483b7efc151e6b5995bddac3c89d04a6cc.
Diffstat (limited to '')
| -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 8181fdf..42cd268 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; |