diff options
| author | Peter Martischka <pita@pitapoison.de> | 2010-04-08 14:20:23 +0200 |
|---|---|---|
| committer | Peter Martischka <pita@pitapoison.de> | 2010-04-08 14:20:23 +0200 |
| commit | 5ff65ce80e04028fc9ff299534f92e2836c3636a (patch) | |
| tree | bbe0c73d0bffc64adffecb34a9a745819c864539 /infrastructure/net.appjet.oui/main.scala | |
| parent | 9c1dfc38451a4ee70c99de16bd5799cbe0c69730 (diff) | |
| parent | ef71f285a7263c4df76057baf528e943c8870efb (diff) | |
| download | etherpad-5ff65ce80e04028fc9ff299534f92e2836c3636a.tar.gz etherpad-5ff65ce80e04028fc9ff299534f92e2836c3636a.tar.xz etherpad-5ff65ce80e04028fc9ff299534f92e2836c3636a.zip | |
Merge branch 'jefferai' of git://github.com/jefferai/pad
Diffstat (limited to '')
| -rw-r--r-- | infrastructure/net.appjet.oui/main.scala | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/infrastructure/net.appjet.oui/main.scala b/infrastructure/net.appjet.oui/main.scala index 42cd268..67c1f6f 100644 --- a/infrastructure/net.appjet.oui/main.scala +++ b/infrastructure/net.appjet.oui/main.scala @@ -32,7 +32,7 @@ import org.mortbay.jetty.handler.{HandlerCollection, RequestLogHandler, HandlerL import org.mortbay.jetty.{Server, NCSARequestLog, Request, Response}; import org.mortbay.servlet.GzipFilter; -// removed due to license restrictions +// removed due to license restrictions; REMOVED_COS_OF_COS // import com.oreilly.servlet.MultipartFilter; import net.appjet.common.util.{BetterFile, HttpServletRequestFactory}; @@ -220,6 +220,8 @@ object main { val handler = new Context(server, "/", Context.NO_SESSIONS | Context.NO_SECURITY); handler.addServlet(new ServletHolder(new OuiServlet), "/"); +// removed due to license restrictions; REMOVED_COS_OF_COS + // val filterHolder = new FilterHolder(new MultipartFilter()); // filterHolder.setInitParameter("uploadDir", System.getProperty("java.io.tmpdir")); // handler.addFilter(filterHolder, "/*", 1); |