From: adam <adam@megacz.com>
Date: Sun, 9 Jul 2006 06:50:34 +0000 (+0000)
Subject: resolve
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=84fb12d742444760d08b9e9ad2f6176190b24df9;p=org.ibex.mail.git

resolve

darcs-hash:20060709065034-5007d-9f39dceb3e3b762c0c51d6be5553da43dfba9685.gz
---

diff --git a/src/org/ibex/mail/Main.java b/src/org/ibex/mail/Main.java
index c90236c..cfad5c1 100644
--- a/src/org/ibex/mail/Main.java
+++ b/src/org/ibex/mail/Main.java
@@ -25,8 +25,9 @@ public class Main implements Listener {
             else if (conn.getLocalPort() == 119)  new NNTP.Listener(auth).handleRequest(conn);
             //else if (conn.getLocalPort() == 110)  new POP3.Listener(auth).handleRequest(conn);
             else if (conn.getLocalPort() == 8099) GMail.handleRequest(conn);
-            else if (conn.getLocalPort() == 8080) Jetty.instance().accept(conn);
-            else if (conn.getLocalPort() == 80)   Jetty.instance().accept(conn);
+            //            else if (conn.getLocalPort() == 8080) Jetty.instance().accept(conn);
+            //else if (conn.getLocalPort() == 443) Jetty.instance().accept(conn);
+            //else if (conn.getLocalPort() == 80)   Jetty.instance().accept(conn);
 	    else return false;
 	    return true;
         } finally {
diff --git a/src/org/ibex/mail/Message.java b/src/org/ibex/mail/Message.java
index 882ca9f..46435f3 100644
--- a/src/org/ibex/mail/Message.java
+++ b/src/org/ibex/mail/Message.java
@@ -127,6 +127,7 @@ public class Message extends MIME.Part {
     }
 
     // this is belived to be compliant with QSBMF (http://cr.yp.to/proto/qsbmf.txt)
+v v v v v v v
     public Message bounce(String reason) {
         if (envelopeFrom==null || envelopeFrom.toString().equals("")) return null;
 
@@ -159,6 +160,27 @@ public class Message extends MIME.Part {
             return null;
         }
     }
+*************
+v v v v v v v
+    public Message bounce(String reason) {
+        Log.warn(Message.class, "bounce not implemented");
+        return null;
+    }  // FIXME!
+    
+*************
+    public Message bounce(String reason) {
+        Log.warn(Message.class, "bounce not implemented");
+    }  // FIXME!
+    
+^ ^ ^ ^ ^ ^ ^
+    public String summary() {
+        return
+            "          Subject: " + subject + "\n" +
+            "     EnvelopeFrom: " + envelope.from + "\n" +
+            "       EnvelopeTo: " + envelope.to + "\n" +
+            "        MessageId: " + messageid;
+    }
+^ ^ ^ ^ ^ ^ ^
 
     public String toString() { throw new RuntimeException("Message.toString() called"); }
     public String summary() { return "[" + envelopeFrom + " -> " + envelopeTo + "] " + subject; }
diff --git a/src/org/ibex/mail/target/Script.java b/src/org/ibex/mail/target/Script.java
index 0206e90..b7de2ed 100644
--- a/src/org/ibex/mail/target/Script.java
+++ b/src/org/ibex/mail/target/Script.java
@@ -4,6 +4,7 @@
 
 package org.ibex.mail.target;
 import org.ibex.js.*;
+import org.ibex.io.*;
 import org.ibex.util.*;
 import org.ibex.mail.*;
 import org.ibex.mail.filter.*;