Changeset fbbab0d

Timestamp:

Dec 23, 2011 1:01:40 AM (9 years ago)

Author:

zzz <zzz@…>

Branches:

master

Children:

41ea292

Parents:

56901e5

Message:

mods to compile with Jetty 6

Location:

apps/susimail/src/src/org/mortbay

Files:

• servlet/MultiPartRequest.java (modified) (12 diffs)
• util/LineInput.java (modified) (3 diffs)

apps/susimail/src/src/org/mortbay/servlet/MultiPartRequest.java

@@ -28 +28 @@
 import javax.servlet.http.HttpServletRequest;
 
-import org.apache.commons.logging.Log;
-import org.mortbay.log.LogFactory;
-import org.mortbay.http.HttpFields;
+//import org.apache.commons.logging.Log;
+//import org.mortbay.log.LogFactory;
+import org.mortbay.jetty.HttpHeaders;
 import org.mortbay.util.LineInput;
 import org.mortbay.util.MultiMap;
@@ -49 +49 @@
  * </pre>
  *
+ * Modded to compile with Jetty 6 for I2P
+ *
  * @version $Id: MultiPartRequest.java,v 1.16 2005/12/02 20:13:52 gregwilkins Exp $
  * @author  Greg Wilkins
@@ -55 +57 @@
 public class MultiPartRequest
 {
-    private static Log log = LogFactory.getLog(MultiPartRequest.class);
+    //private static Log log = LogFactory.getLog(MultiPartRequest.class);
 
     /* ------------------------------------------------------------ */
@@ -77 +79 @@
     {
         _request=request;
-        String content_type = request.getHeader(HttpFields.__ContentType);
+        String content_type = request.getHeader(HttpHeaders.CONTENT_TYPE);
         if (!content_type.startsWith("multipart/form-data"))
             throw new IOException("Not multipart/form-data request");
 
-        if(log.isDebugEnabled())log.debug("Multipart content type = "+content_type);
+        //if(log.isDebugEnabled())log.debug("Multipart content type = "+content_type);
         _encoding = request.getCharacterEncoding();
         if (_encoding != null)
@@ -92 +94 @@
             value(content_type.substring(content_type.indexOf("boundary=")));
         
-        if(log.isDebugEnabled())log.debug("Boundary="+_boundary);
+        //if(log.isDebugEnabled())log.debug("Boundary="+_boundary);
         _byteBoundary= (_boundary+"--").getBytes(StringUtil.__ISO_8859_1);
         
@@ -137 +139 @@
             catch (UnsupportedEncodingException uee) 
             {
-                if (log.isDebugEnabled())log.debug("Invalid character set: " + uee);
+                //if (log.isDebugEnabled())log.debug("Invalid character set: " + uee);
                 return null;
             }
@@ -171 +173 @@
             catch (UnsupportedEncodingException uee) 
             {
-                if (log.isDebugEnabled())log.debug("Invalid character set: " + uee);
+                //if (log.isDebugEnabled())log.debug("Invalid character set: " + uee);
                 return null;
             }
@@ -265 +267 @@
         if (!line.equals(_boundary))
         {
-            log.warn(line);
+            //log.warn(line);
             throw new IOException("Missing initial multi part boundary");
         }
@@ -282 +284 @@
                     break;
 
-                if(log.isDebugEnabled())log.debug("LINE="+line);
+                //if(log.isDebugEnabled())log.debug("LINE="+line);
                 
                 // place part header key and value in map
@@ -292 +294 @@
                     String ev = (String) part._headers.get(key);
                     part._headers.put(key,(ev!=null)?(ev+';'+value):value);
-                    if(log.isDebugEnabled())log.debug(key+": "+value);
+                    //if(log.isDebugEnabled())log.debug(key+": "+value);
                     if (key.equals("content-disposition"))
                         content_disposition=value;
@@ -322 +324 @@
             if (!form_data)
             {
-                log.warn("Non form-data part in multipart/form-data");
+                //log.warn("Non form-data part in multipart/form-data");
                 continue;
             }
             if (part._name==null || part._name.length()==0)
             {
-                log.warn("Part with no name in multipart/form-data");
+                //log.warn("Part with no name in multipart/form-data");
                 continue;
             }
-            if(log.isDebugEnabled())log.debug("name="+part._name);
-            if(log.isDebugEnabled())log.debug("filename="+part._filename);
+            //if(log.isDebugEnabled())log.debug("name="+part._name);
+            //if(log.isDebugEnabled())log.debug("filename="+part._filename);
             _partMap.add(part._name,part);
             part._data=readBytes();
@@ -407 +409 @@
             if (_char==10) _char=-2;  
         }
-        if(log.isTraceEnabled())log.trace(baos.toString());
+        //if(log.isTraceEnabled())log.trace(baos.toString());
         return baos.toByteArray();
     }

apps/susimail/src/src/org/mortbay/util/LineInput.java

@@ -23 +23 @@
 import java.io.UnsupportedEncodingException;
 
-import org.apache.commons.logging.Log;
-import org.mortbay.log.LogFactory;
+//import org.apache.commons.logging.Log;
+//import org.mortbay.log.LogFactory;
 
 
@@ -52 +52 @@
 public class LineInput extends FilterInputStream                           
 {
-    private static Log log = LogFactory.getLog(LineInput.class);
+    //private static Log log = LogFactory.getLog(LineInput.class);
 
     /* ------------------------------------------------------------ */
@@ -202 +202 @@
             catch(UnsupportedEncodingException e)
             {
-                log.warn(LogSupport.EXCEPTION,e);
+                //log.warn(LogSupport.EXCEPTION,e);
             }
         }