[Fudaa-cvs-commit] fudaa_devel/dodico/src/org/fudaa/dodico/objet CDodico.java,1.7,1.8 CExec.java,1.8,1.9

[<de...@us...>]

Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/objet
In directory sc8-pr-cvs1:/tmp/cvs-serv21488/objet

Modified Files:
	CDodico.java CExec.java 
Log Message:
Maj general (CtuluLib)


Index: CDodico.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/objet/CDodico.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** CDodico.java	25 Nov 2003 10:11:46 -0000	1.7
--- CDodico.java	12 Dec 2003 10:30:54 -0000	1.8
***************
*** 28,31 ****
--- 28,33 ----
  import java.util.TimeZone;
  import java.util.Vector;
+ 
+ import org.fudaa.ctulu.CtuluLib;
  import org.omg.CORBA.BAD_CONTEXT;
  import org.omg.CORBA.BAD_INV_ORDER;
***************
*** 408,412 ****
        query= "HELO Dodico";
        // System.out.println("++ "+query);
!       sendmailout.write(query + DodicoLib.LINE_SEP);
        sendmailout.flush();
        answer= sendmailin.readLine();
--- 410,414 ----
        query= "HELO Dodico";
        // System.out.println("++ "+query);
!       sendmailout.write(query + CtuluLib.LINE_SEP);
        sendmailout.flush();
        answer= sendmailin.readLine();
***************
*** 414,418 ****
        query= "MAIL FROM: <" + _from + ">";
        // System.out.println("++ "+query);
!       sendmailout.write(query + DodicoLib.LINE_SEP);
        sendmailout.flush();
        answer= sendmailin.readLine();
--- 416,420 ----
        query= "MAIL FROM: <" + _from + ">";
        // System.out.println("++ "+query);
!       sendmailout.write(query + CtuluLib.LINE_SEP);
        sendmailout.flush();
        answer= sendmailin.readLine();
***************
*** 420,424 ****
        query= "RCPT TO: <" + _to + ">";
        // System.out.println("++ "+query);
!       sendmailout.write(query + DodicoLib.LINE_SEP);
        sendmailout.flush();
        answer= sendmailin.readLine();
--- 422,426 ----
        query= "RCPT TO: <" + _to + ">";
        // System.out.println("++ "+query);
!       sendmailout.write(query + CtuluLib.LINE_SEP);
        sendmailout.flush();
        answer= sendmailin.readLine();
***************
*** 426,430 ****
        query= "DATA";
        // System.out.println("++ "+query);
!       sendmailout.write(query + DodicoLib.LINE_SEP);
        sendmailout.flush();
        answer= sendmailin.readLine();
--- 428,432 ----
        query= "DATA";
        // System.out.println("++ "+query);
!       sendmailout.write(query + CtuluLib.LINE_SEP);
        sendmailout.flush();
        answer= sendmailin.readLine();
***************
*** 432,440 ****
        // send the body of the e-mail here
        Date date_written= new Date();
!       sendmailout.write("Date: " + date_written + DodicoLib.LINE_SEP);
!       sendmailout.write("From: " + _from + DodicoLib.LINE_SEP);
!       sendmailout.write("To: " + _to + DodicoLib.LINE_SEP);
!       sendmailout.write("Subject: " + _subject + DodicoLib.LINE_SEP);
!       sendmailout.write(DodicoLib.LINE_SEP);
        sendmailout.write(_texte + "\r\n\r\n");
        sendmailout.write(".\r\n");
--- 434,442 ----
        // send the body of the e-mail here
        Date date_written= new Date();
!       sendmailout.write("Date: " + date_written + CtuluLib.LINE_SEP);
!       sendmailout.write("From: " + _from + CtuluLib.LINE_SEP);
!       sendmailout.write("To: " + _to + CtuluLib.LINE_SEP);
!       sendmailout.write("Subject: " + _subject + CtuluLib.LINE_SEP);
!       sendmailout.write(CtuluLib.LINE_SEP);
        sendmailout.write(_texte + "\r\n\r\n");
        sendmailout.write(".\r\n");
***************
*** 444,448 ****
        query= "QUIT";
        // System.out.println("++ "+query);
!       sendmailout.write(query + DodicoLib.LINE_SEP);
        sendmailout.flush();
        answer= sendmailin.readLine();
--- 446,450 ----
        query= "QUIT";
        // System.out.println("++ "+query);
!       sendmailout.write(query + CtuluLib.LINE_SEP);
        sendmailout.flush();
        answer= sendmailin.readLine();

Index: CExec.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/objet/CExec.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** CExec.java	11 Dec 2003 12:41:27 -0000	1.8
--- CExec.java	12 Dec 2003 10:30:54 -0000	1.9
***************
*** 13,17 ****
  import java.io.InputStreamReader;
  import java.io.PrintStream;
! import org.fudaa.dodico.commun.DodicoLib;
  import org.fudaa.dodico.commun.DodicoResource;
  /**
--- 13,19 ----
  import java.io.InputStreamReader;
  import java.io.PrintStream;
! 
! import org.fudaa.ctulu.CtuluLib;
! 
  import org.fudaa.dodico.commun.DodicoResource;
  /**
***************
*** 107,111 ****
        //sous windows, il arrivre que la lecture du flux soit bloquee.
        if (_th.isBlocked()) {
!         if ((DodicoLib.DEBUG) && (err_ != null)) {
            err_.println(_th.getName() + " " + DodicoResource.getS("bloqué "));
          }
--- 109,113 ----
        //sous windows, il arrivre que la lecture du flux soit bloquee.
        if (_th.isBlocked()) {
!         if (CtuluLib.DEBUG && (err_ != null)) {
            err_.println(_th.getName() + " " + DodicoResource.getS("bloqué "));
          }
***************
*** 122,126 ****
        }
      } catch (SecurityException _e) {
!       DodicoLib.error(_e.getMessage());
      }
    }
--- 124,128 ----
        }
      } catch (SecurityException _e) {
!       CtuluLib.error(_e.getMessage());
      }
    }
***************
*** 144,148 ****
            "*****  " + cmd_[0] + " " + DodicoResource.getS("lance") + " *****");
        Thread.currentThread().setPriority(Thread.MIN_PRIORITY);
!       if (DodicoLib.DEBUG)
          System.out.println("lancement processus");
        if (execDirectory_ != null)
--- 146,150 ----
            "*****  " + cmd_[0] + " " + DodicoResource.getS("lance") + " *****");
        Thread.currentThread().setPriority(Thread.MIN_PRIORITY);
!       if (CtuluLib.DEBUG)
          System.out.println("lancement processus");
        if (execDirectory_ != null)
***************
*** 176,180 ****
          }
        }
!       if (DodicoLib.DEBUG) {
          System.out.println("fin processus");
        }
--- 178,182 ----
          }
        }
!       if (CtuluLib.DEBUG) {
          System.out.println("fin processus");
        }
***************
*** 204,212 ****
        //      try
        //      {
!       //        if (DodicoLib.DEBUG)
        //          System.out.println("fermeture sortie standard");
        //        if (psIn != null)
        //          psIn.close();
!       //        if (DodicoLib.DEBUG)
        //          System.out.println("sortie standard fermee");
        //      }
--- 206,214 ----
        //      try
        //      {
!       //        if (CtuluLib.DEBUG)
        //          System.out.println("fermeture sortie standard");
        //        if (psIn != null)
        //          psIn.close();
!       //        if (CtuluLib.DEBUG)
        //          System.out.println("sortie standard fermee");
        //      }
***************
*** 220,228 ****
        //      try
        //      {
!       //        if (DodicoLib.DEBUG)
        //          System.out.println("fermeture sortie erreur");
        //        if (psErr != null)
        //          psErr.close();
!       //        if (DodicoLib.DEBUG)
        //          System.out.println("sortie erreur fermee");
        //        Thread.currentThread().setPriority(oldpriority);
--- 222,230 ----
        //      try
        //      {
!       //        if (CtuluLib.DEBUG)
        //          System.out.println("fermeture sortie erreur");
        //        if (psErr != null)
        //          psErr.close();
!       //        if (CtuluLib.DEBUG)
        //          System.out.println("sortie erreur fermee");
        //        Thread.currentThread().setPriority(oldpriority);
***************
*** 236,240 ****
        //      }
      }
!     if (DodicoLib.DEBUG)
        System.out.println("CExec.exec() terminee");
    }
--- 238,242 ----
        //      }
      }
!     if (CtuluLib.DEBUG)
        System.out.println("CExec.exec() terminee");
    }
***************
*** 289,293 ****
    //    c.setOutStream(System.out);
    //    c.exec();
!   //    if (DodicoLib.DEBUG)
    //      System.out.println("exec terminé");
    //  }
--- 291,295 ----
    //    c.setOutStream(System.out);
    //    c.exec();
!   //    if (CtuluLib.DEBUG)
    //      System.out.println("exec terminé");
    //  }