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/execution.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 'infrastructure/net.appjet.oui/execution.scala')
-rw-r--r-- | infrastructure/net.appjet.oui/execution.scala | 5 |
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(); |