You are viewing a plain text version of this content. The canonical link for it is here.
Posted to taglibs-dev@jakarta.apache.org by ca...@apache.org on 2001/12/05 00:17:41 UTC

cvs commit: jakarta-taglibs/mailer/src/org/apache/taglibs/mailer MailTag.java

catlett     01/12/04 15:17:41

  Modified:    mailer/src/org/apache/taglibs/mailer MailTag.java
  Log:
  changed the dependencies back to taglibs 1.1 spec
  
  Revision  Changes    Path
  1.6       +19 -11    jakarta-taglibs/mailer/src/org/apache/taglibs/mailer/MailTag.java
  
  Index: MailTag.java
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/mailer/src/org/apache/taglibs/mailer/MailTag.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- MailTag.java	2001/11/30 20:02:03	1.5
  +++ MailTag.java	2001/12/04 23:17:41	1.6
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-taglibs/mailer/src/org/apache/taglibs/mailer/MailTag.java,v 1.5 2001/11/30 20:02:03 catlett Exp $
  - * $Revision: 1.5 $
  - * $Date: 2001/11/30 20:02:03 $
  + * $Header: /home/cvs/jakarta-taglibs/mailer/src/org/apache/taglibs/mailer/MailTag.java,v 1.6 2001/12/04 23:17:41 catlett Exp $
  + * $Revision: 1.6 $
  + * $Date: 2001/12/04 23:17:41 $
    *
    * ====================================================================
    *
  @@ -104,6 +104,16 @@
    *	       	<rtexprval>false</rtexprval>
    *     	</attribute>
    *      <attribute>
  + *              <name>user</name>
  + *              <required>false</required>
  + *              <rtexprvalue>false</rtexprvalue>
  + *      </attribute>
  + *      <attribute>
  + *              <name>password</name>
  + *              <required>false</required>
  + *              <rtexprvalue>false</rtexprvalue>
  + *      </attribute>
  + *      <attribute>
    *              <name>server</name>
    *              <required>false</required>
    *              <rtexprvalue>false</rtexprvalue>
  @@ -278,25 +288,23 @@
   	    props.put("mail.smtp.dsn.ret", "FULL");
   	    // create new piece of mail for the smtp mail session check if 
   	    // authentication is required for the mail server
  -
  -
  -	    //the use of authentication is a work in progress
   
  -	    if (authentication)
  -		if (user == null) {
  +	    if (authentication) {
   		    // create the session with an authenticator object
   		    // better way to do authentication
   		    props.put("mail.smtp.auth", "true");
   		    sessionobj = Session.getDefaultInstance(props, 
   					 new MailAuthenticator(user, password));
  -		}
  -	    else
  +	    } else
   		sessionobj = Session.getDefaultInstance(props, null);
   
   	    message = new MimeMessage(sessionobj);
   	}
   
  -        return EVAL_BODY_BUFFERED;  // evaluate the body of this tag
  +	// taglibs 1.1
  +        return EVAL_BODY_INCLUDE;  // evaluate the body of this tag
  +	// taglibs 1.2
  +        // return EVAL_BODY_BUFFERED;  // evaluate the body of this tag
       }
   
       /**
  
  
  

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>