summaryrefslogtreecommitdiffstats
path: root/infrastructure/net.appjet.oui/execution.scala
diff options
context:
space:
mode:
authorJeff Mitchell <etherpad@jefferai.org>2010-04-07 19:04:22 -0400
committerJeff Mitchell <etherpad@jefferai.org>2010-04-07 19:04:22 -0400
commit674d560a2fdbedbda0a3fc3328be102e884b345b (patch)
treefe509b6ebb5965c4fcb9c8d5cf1136300e9f903f /infrastructure/net.appjet.oui/execution.scala
parent387dea459220cb13e3710af298d7829223917376 (diff)
downloadetherpad-674d560a2fdbedbda0a3fc3328be102e884b345b.tar.gz
etherpad-674d560a2fdbedbda0a3fc3328be102e884b345b.tar.bz2
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/execution.scala')
-rw-r--r--infrastructure/net.appjet.oui/execution.scala5
1 files changed, 5 insertions, 0 deletions
diff --git a/infrastructure/net.appjet.oui/execution.scala b/infrastructure/net.appjet.oui/execution.scala
index 63749b1..f4f4d9e 100644
--- a/infrastructure/net.appjet.oui/execution.scala
+++ b/infrastructure/net.appjet.oui/execution.scala
@@ -34,6 +34,9 @@ import net.appjet.common.util.{HttpServletRequestFactory, BetterFile};
import Util.enumerationToRichEnumeration;
+// Removed due to licensing issues; REMOVED_COS_OF_COS
+// import com.oreilly.servlet.MultipartFilter;
+
class RequestWrapper(val req: HttpServletRequest) {
req.setCharacterEncoding("UTF-8");
// private lazy val parameterNames =
@@ -124,6 +127,8 @@ class RequestWrapper(val req: HttpServletRequest) {
else
null;
}
+
+ // Depends on cos.jar; REMOVED_COS_OF_COS
def files(globalScope: Scriptable): Object = {
// if (! req.isInstanceOf[com.oreilly.servlet.MultipartWrapper]) {
new ScriptableAdapter();