From a70e040e33250e88e42727bacae6925dbfd2b8be Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Wed, 21 Nov 2012 21:21:38 +0000
Subject: [PATCH] susimail compile fixes for Jetty 7. Untested.
---
apps/susimail/build.xml | 1 +
.../src/src/org/mortbay/servlet/MultiPartRequest.java | 6 +++---
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/apps/susimail/build.xml b/apps/susimail/build.xml
index 27a65e7c17..3714da3f8b 100644
--- a/apps/susimail/build.xml
+++ b/apps/susimail/build.xml
@@ -20,6 +20,7 @@
<pathelement location="../jetty/jettylib/javax.servlet.jar" />
<pathelement location="../jetty/jettylib/org.mortbay.jetty.jar" />
<pathelement location="../jetty/jettylib/jetty-util.jar" />
+ <pathelement location="../jetty/jettylib/jetty-http.jar" />
<pathelement location="../../core/java/build/i2p.jar" />
</classpath>
</javac>
diff --git a/apps/susimail/src/src/org/mortbay/servlet/MultiPartRequest.java b/apps/susimail/src/src/org/mortbay/servlet/MultiPartRequest.java
index 5effd4ea57..5491f6b96f 100644
--- a/apps/susimail/src/src/org/mortbay/servlet/MultiPartRequest.java
+++ b/apps/susimail/src/src/org/mortbay/servlet/MultiPartRequest.java
@@ -29,10 +29,10 @@ import javax.servlet.http.HttpServletRequest;
//import org.apache.commons.logging.Log;
//import org.mortbay.log.LogFactory;
-import org.mortbay.jetty.HttpHeaders;
+import org.eclipse.jetty.http.HttpHeaders;
+import org.eclipse.jetty.util.MultiMap;
+import org.eclipse.jetty.util.StringUtil;
import org.mortbay.util.LineInput;
-import org.mortbay.util.MultiMap;
-import org.mortbay.util.StringUtil;
/* ------------------------------------------------------------ */
/** Multipart Form Data request.
--
GitLab