diff options
author | Jeff Mitchell <etherpad@jefferai.org> | 2010-04-07 19:04:22 -0400 |
---|---|---|
committer | Jeff Mitchell <etherpad@jefferai.org> | 2010-04-07 19:04:22 -0400 |
commit | 674d560a2fdbedbda0a3fc3328be102e884b345b (patch) | |
tree | fe509b6ebb5965c4fcb9c8d5cf1136300e9f903f /infrastructure/net.appjet.oui/main.scala | |
parent | 387dea459220cb13e3710af298d7829223917376 (diff) | |
download | etherpad-674d560a2fdbedbda0a3fc3328be102e884b345b.tar.gz etherpad-674d560a2fdbedbda0a3fc3328be102e884b345b.tar.xz etherpad-674d560a2fdbedbda0a3fc3328be102e884b345b.zip |
Add REMOVED_COS_OF_COS markers so those that want to enable support provided by cos.jar can easily find what to uncomment.
Diffstat (limited to 'infrastructure/net.appjet.oui/main.scala')
-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); |