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 fe...@apache.org on 2004/09/26 22:13:41 UTC
cvs commit: jakarta-taglibs-sandbox/mailer2/xml mailer2.xml
felipeal 2004/09/26 13:13:41
Modified: mailer2/src/org/apache/taglibs/mailer2 MailTag.java
ReplyToTag.java
mailer2/xml mailer2.xml
Log:
applied Jeroen changes
Revision Changes Path
1.3 +31 -36 jakarta-taglibs-sandbox/mailer2/src/org/apache/taglibs/mailer2/MailTag.java
Index: MailTag.java
===================================================================
RCS file: /home/cvs/jakarta-taglibs-sandbox/mailer2/src/org/apache/taglibs/mailer2/MailTag.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MailTag.java 14 Aug 2004 12:24:36 -0000 1.2
+++ MailTag.java 26 Sep 2004 20:13:41 -0000 1.3
@@ -239,9 +239,9 @@
if (localFrom == null) {
localFrom = pageContext.getServletContext().getInitParameter(FROM);
}
- if (localFrom != null) {
+ if (localFrom != null) {
message.setFrom(new InternetAddress(localFrom));
- }
+ }
/* Add the recipients given in the to, cc and bcc attributes */
if (getTo() != null) {
@@ -297,11 +297,11 @@
/* Set importance headers */
if (getImportance() != null) {
/* Add additional Microsoft'isms to prevent spam scanners to report this mail as spam */
- if ("high".equals(getImportance())) {
+ if ("high".equals(getImportance())) {
message.addHeader("X-Priority", "1");
- } else if ("normail".equals(getImportance())) {
+ } else if ("normail".equals(getImportance())) {
message.addHeader("X-Priority", "3");
- } else if ("low".equals(getImportance())) {
+ } else if ("low".equals(getImportance())) {
message.addHeader("X-Priority", "5");
}
message.addHeader("Importance", getImportance());
@@ -396,7 +396,7 @@
* @return The scopeType as found in PageContext
* @throws JspException For an invalid scope
*/
- public static int getScopeType(String scope) throws JspException {
+ public static int getScopeType(String scope) throws JspException {
int scopeType;
if ("request".equals(scope)) {
scopeType = PageContext.REQUEST_SCOPE;
@@ -460,8 +460,8 @@
props.put("mail.smtp.auth", "true");
authenticator = new MailAuthenticator(localUser, localPassword);
}
-
- sessionobj = Session.getInstance(props, authenticator);
+
+ sessionobj = Session.getInstance(props, authenticator);
}
} catch (NamingException ex) {
throw new JspException("mt:mail: NamingException " + ex.getExplanation());
@@ -477,35 +477,26 @@
/* Set SMTP server name */
String localServer = server;
if (localServer == null) {
- localServer = (String) pageContext.findAttribute(SERVER);
- }
- if (localServer == null) {
+ localServer = (String) pageContext.findAttribute(SERVER);
+ }
+ if (localServer == null) {
localServer = pageContext.getServletContext().getInitParameter(SERVER);
}
if (localServer == null) {
localServer = "localhost";
}
- props.put("mail.smtp.host", localServer);
- /**
- * Store the server name in page scope, so additional sign and/or encrypt
- * tags access the same SMTP server and port, as these tags have to create a
- * new MimeMessage(Session) object without having access to MailTag's
- * server and/or port attributes.
- */
- pageContext.setAttribute(SERVER, localServer);
-
/* Set SMTP server port */
int localPort = port;
if (localPort == 0) {
try {
- localPort = Integer.parseInt((String) pageContext.findAttribute(PORT));
- } catch (NumberFormatException ex) {
- /* Ignore */
- }
- }
- if (localPort == 0) {
- try {
+ localPort = Integer.parseInt((String) pageContext.findAttribute(PORT));
+ } catch (NumberFormatException ex) {
+ /* Ignore */
+ }
+ }
+ if (localPort == 0) {
+ try {
localPort = Integer.parseInt(pageContext.getServletConfig().getInitParameter(PORT));
} catch (NumberFormatException ex) {
/* Ignore */
@@ -515,15 +506,9 @@
/* SMTP default port number */
localPort = 25;
}
- props.put("mail.smtp.port", Integer.toString(localPort));
-
- /**
- * Store the server port in page scope, so additional sign and/or encrypt
- * tags access the same SMTP server and port, as these tags have to create a
- * new MimeMessage(Session) object without having access to MailTag's
- * server and/or port attributes.
- */
- pageContext.setAttribute(PORT, Integer.toString(localPort));
+
+ props.put("mail.smtp.host", localServer);
+ props.put("mail.smtp.port", Integer.toString(localPort));
/* Set properties to deal will SendFailedExceptions: send to all legal addresses */
props.put("mail.smtp.sendpartial", "true");
@@ -531,6 +516,16 @@
props.put("mail.smtp.dsn.notify", "FAILURE");
/* Set amount of message to get returned */
props.put("mail.smtp.dsn.ret", "FULL");
+
+ /**
+ * Store server name and port in page scope, so additional sign and/or encrypt tags
+ * access the same SMTP server and port, as these tags have to create a new
+ * MimeMessage(Session) object without having access to MailTag's server and/or port
+ * attributes.
+ */
+ pageContext.setAttribute(SERVER, localServer);
+ pageContext.setAttribute(PORT, Integer.toString(localPort));
+
return props;
}
1.3 +25 -25 jakarta-taglibs-sandbox/mailer2/src/org/apache/taglibs/mailer2/ReplyToTag.java
Index: ReplyToTag.java
===================================================================
RCS file: /home/cvs/jakarta-taglibs-sandbox/mailer2/src/org/apache/taglibs/mailer2/ReplyToTag.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ReplyToTag.java 14 Aug 2004 12:24:36 -0000 1.2
+++ ReplyToTag.java 26 Sep 2004 20:13:41 -0000 1.3
@@ -53,9 +53,9 @@
private String name = null;
/**
- * The body content of the tag.
+ * The body content of the tag.
*/
- protected String body = null;
+ protected String body = null;
/**
* Default zero-arg constructor.
@@ -68,7 +68,7 @@
* Reset attributes with no corresponding getters and setters to
* enable tag reuse.
*/
- body = null;
+ body = null;
return EVAL_BODY_BUFFERED;
}
@@ -77,10 +77,10 @@
BodyContent content = getBodyContent();
if (content != null) {
if (address != null) {
- throw new JspException("mt:replyto: cannot have both an address attribute and body content");
+ throw new JspException("mt:replyto: cannot have both an address attribute and body content");
}
- body = content.getString();
+ body = content.getString();
content.clearBody();
}
@@ -96,7 +96,7 @@
localAddress = getBody();
}
if (localAddress == null) {
- throw new JspException("mt:replyto: no recipient specified in address attribute or body content");
+ throw new JspException("mt:replyto: no recipient specified in address attribute or body content");
}
String localName = name;
@@ -105,12 +105,12 @@
}
try {
- mailTag.addReplyTo(new InternetAddress(address, name));
+ mailTag.addReplyTo(new InternetAddress(localAddress, localName));
} catch (UnsupportedEncodingException ex) {
/* Ignore */
}
- } else {
- throw new JspException("mt:replyto should be child of mt:mail");
+ } else {
+ throw new JspException("mt:replyto should be child of mt:mail");
}
return SKIP_BODY;
@@ -160,20 +160,20 @@
public void setName(String name) {
this.name = name;
}
-
- /**
- * Returns the body content.
- * @return The body content
- */
- protected String getBody() {
- return body;
- }
-
- /**
- * Sets the body content.
- * @param body The body content
- */
- protected void setBody(String body) {
- this.body = body;
- }
+
+ /**
+ * Returns the body content.
+ * @return The body content
+ */
+ protected String getBody() {
+ return body;
+ }
+
+ /**
+ * Sets the body content.
+ * @param body The body content
+ */
+ protected void setBody(String body) {
+ this.body = body;
+ }
}
1.3 +38 -39 jakarta-taglibs-sandbox/mailer2/xml/mailer2.xml
Index: mailer2.xml
===================================================================
RCS file: /home/cvs/jakarta-taglibs-sandbox/mailer2/xml/mailer2.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mailer2.xml 14 Aug 2004 12:24:36 -0000 1.2
+++ mailer2.xml 26 Sep 2004 20:13:41 -0000 1.3
@@ -10,7 +10,7 @@
<!-- Version number of this tagib -->
<tlib-version>1.0</tlib-version>
<!-- Minimum version of JSP spec required -->
- <jsp-version>1.2</jsp-version>
+ <jsp-version>2.0</jsp-version>
<!-- jakarta-taglib name of this tag library -->
<short-name>mailer2</short-name>
<!-- URI of taglib -->
@@ -32,7 +32,7 @@
<li>Send messages in a background thread for better response times, or directly to get better feedback</li>
<li>Use JSTL 1.1 EL throughout</li>
<li>PLAIN or LOGIN SMTP authentication</li>
- <li>Configure server, port, username and password with context-params in the application's web.xml</li>
+ <li>Configure server, port, username and password with context-params in the application's web.xml</li>
<li>Load previosly stored messages, or save messages to disk</li>
<li>S/MIME sign or sign and encrypt messages using a <a href="http://www.bouncycastle.org">Legion of the Bouncy Castle</a> implementation of the S/MIME protocol</li>
</ul>
@@ -50,7 +50,7 @@
<requirements-info>
This tag library requires the following:
<ul>
- <li><a href="http://java.sun.com/j2se/">JDK 1.4</a> or higher</li>
+ <li><a href="http://java.sun.com/j2se/">JDK 1.4</a> or higher</li>
<li>mail.jar and activation.jar from a <a href="http://java.sun.com/j2ee/">J2EE 1.4</a> distribution</li>
<li>bcprov-jdkX-Y.jar and bcmail-jdkX-Y.jar from <a href="http://www.bouncycastle.org">http://www.bouncycastle.org</a> where X is the JVM version and Y is the current BC version, e.g. <a href="http://www.bouncycastle.org/download/bcprov-jdk14-124.jar">bcprov-jdk14-124.jar</a> and <a href="http://www.bouncycastle.org/download/bcmail-jdk14-124.jar">bcmail-jdk14-124.jar</a></li>
<li>JSP 2.0 container, like <a href="http://jakarta.apache.org/tomcat/">Tomcat 5.x</a> or <a href="http://www.caucho.com/">Resin 3.x</a></li>
@@ -63,7 +63,7 @@
<name>mail</name>
<tag-class>org.apache.taglibs.mailer2.MailTag</tag-class>
<body-content>JSP</body-content>
- <description><![CDATA[JSP tag <mt:mail> is used to construct an e-mail message. It is the root element of this tag library. <mt:mail> can have the following child tags: <mt:addrecipient>, <mt:attach>, <mt:header>, or <mt:part>. The message will be sent unless the var attribute has been set.]]></description>
+ <description><![CDATA[JSP tag <mt:mail> constructs an e-mail message. It is the root element of this tag library. <mt:mail> can have the following child tags: <mt:addrecipient>, <mt:attach>, <mt:header>, or <mt:part>. The message will be sent unless the var attribute has been set.]]></description>
<display-name>mt:mail</display-name>
<availability>1.0</availability>
<restrictions>None</restrictions>
@@ -197,7 +197,7 @@
</attribute>
<example>
<usage>
- <comment>Example usage of the mail tag. Note: the use of the cid: URL scheme to access an embedded logo in an HTML formatted mail message</comment>
+ <comment>Example usage of the <mt:mail> tag. Note: the use of the cid: URL scheme to access an embedded logo in an HTML formatted mail message</comment>
<code><![CDATA[
<mt:mail subject="Test mail" from="john.doe@example.com"
to="jane.doe@example.com" server="smtp.example.com">
@@ -207,7 +207,7 @@
<mt:mail subject="Test mail" from="john.doe@example.com" server="smtp.example.com">
<mt:addrecipient type="to">jane.doe@example.com</mt:addrecipient>
Hi Jane, attached is the file you requested.
- <mt:attach filename="c:/work/document.doc"/>
+ <mt:attach filename="c:/work/document.doc"/>
</mt:mail>
<mt:mail subject="Test mail" from="john.doe@example.com"
@@ -237,13 +237,12 @@
</html>
<mt:attach url="http://jakarta.apache.org/images/jakarta-logo.gif"/>
</mt:part>
-</mt:mail>
-]]></code>
+</mt:mail>]]></code>
</usage>
</example>
</tag>
<tag>
- <description><![CDATA[JSP tag <mt:header> is used to set additional headers in an e-mail message. It is a child of <mt:mail> or <mt:part>.]]></description>
+ <description><![CDATA[JSP tag <mt:header> adds additional headers to an e-mail message. It is a child of <mt:mail> or <mt:part>.]]></description>
<display-name>mt:header</display-name>
<name>header</name>
<tag-class>org.apache.taglibs.mailer2.HeaderTag</tag-class>
@@ -266,7 +265,7 @@
</attribute>
<example>
<usage>
- <comment>Example usage of the mail tag. Note: the use of the cid: URL scheme to access an embedded logo in an HTML formatted mail message</comment>
+ <comment>Example usage of the <mt:header> tag.</comment>
<code><![CDATA[
<mt:header name="Precedence" value="Bulk"/>
@@ -276,7 +275,7 @@
</example>
</tag>
<tag>
- <description><![CDATA[JSP tag <mt:addrecipient> is used to add recipients to an e-mail message. It is a child of <mt:mail>.]]></description>
+ <description><![CDATA[JSP tag <mt:addrecipient> adds to, cc, or bcc recipients to an e-mail message. It is a child of <mt:mail>.]]></description>
<display-name>mt:addrecipient</display-name>
<name>addrecipient</name>
<tag-class>org.apache.taglibs.mailer2.AddRecipientTag</tag-class>
@@ -306,7 +305,7 @@
</attribute>
<example>
<usage>
- <comment>Example usage of the addrecipient tag.</comment>
+ <comment>Example usage of the <mt:addrecipient> tag.</comment>
<code><![CDATA[
<mt:addrecipient type="to" address="john.doe@example.com"/>
@@ -318,7 +317,7 @@
</example>
</tag>
<tag>
- <description><![CDATA[JSP tag <mt:attach> is used to add attachments. It is a child of <mt:mail> or <mt:part>. Either the url, or the file, or the message or both name and type attributes should be present. If the url attribute is present, the name and type are derived from the HTTP response. If the filename attribute is present, the name and type are also automatically derived. If the message attribute is present, the type is "message/rc822" and the name is the subject of the attached message. If both name and type are present, the body content of the tag is added as an attachment.]]></description>
+ <description><![CDATA[JSP tag <mt:attach> is used to add attachments to an e-mail message. It is a child of <mt:mail> or <mt:part>. Either the url, or the file, or the message or both name and type attributes should be present. If the url attribute is present, the name and type are derived from the HTTP response. If the filename attribute is present, the name and type are also automatically derived from the filename and a MIME type table. If the message attribute is present, the type is "message/rc822" and the name is the subject of the attached message. If both name and type are present, the body content of the tag is added as an attachment.]]></description>
<display-name>mt:attach</display-name>
<name>attach</name>
<tag-class>org.apache.taglibs.mailer2.AttachTag</tag-class>
@@ -361,7 +360,7 @@
<availability>1.0</availability>
</attribute>
<attribute>
- <description>A Message object stored with a previous &lt;mt:mail var="..."&gt;</description>
+ <description>A Message object stored with a previous <mt:mail var="..."></description>
<name>message</name>
<required>no</required>
<rtexprvalue>yes</rtexprvalue>
@@ -370,9 +369,9 @@
</attribute>
<example>
<usage>
- <comment>Example usage of the attach tag.</comment>
+ <comment>Example usage of the <mt:attach> tag.</comment>
<code><![CDATA[
-<mt:attach filename="c:/temp/example.txt"/>
+<mt:attach filename="c:/temp/example.txt"/>
<mt:attach url="http://jakarta.apache.org/images/jakarta-logo.gif"/>
@@ -398,7 +397,7 @@
</example>
</tag>
<tag>
- <description><![CDATA[JSP tag <mt:part> is used to create a multipart mail. It is used for HTML and plain text multipart mail alternatives or multipart/digest messages that contain several messages. It is a child of <mt:mail>. Allowed children are <mt:header> and <mt:attach>. Multiple <mt:parts> can be added to an <mt:mail> tag. The type attribute of <mt:mail> should then be one of the multipart/* variants, e.g. multipart/mixed, multipart/related or multipart/alternative. The attachments inside <mt:part> and its optional body content are assumed to be multipart/related. This enables the creation of HTML formatted e-mail. References to images should be be made using cid: URLs. ]]></description>
+ <description><![CDATA[JSP tag <mt:part> is used to create a multipart mail. It is used for HTML and plain text multipart mail alternatives or multipart/digest messages that contain several messages. It is a child of <mt:mail>. Allowed children are <mt:header> and <mt:attach>. Multiple <mt:parts> can be added to an <mt:mail> tag. The type attribute of <mt:mail> should then be one of the multipart/* variants, e.g. multipart/mixed, multipart/related or multipart/alternative. The attachments inside <mt:part> and its optional body content are assumed to be multipart/related. This enables the creation of HTML formatted e-mail. References to images should be be made using cid: URLs. ]]></description>
<display-name>mt:part</display-name>
<name>part</name>
<tag-class>org.apache.taglibs.mailer2.PartTag</tag-class>
@@ -426,7 +425,7 @@
</example>
</tag>
<tag>
- <description><![CDATA[JSP tag <mt:send> is used to send a previously stored message. <mt:send> does not have any child tags.]]></description>
+ <description><![CDATA[JSP tag <mt:send> sends a previously stored message. <mt:send> does not have any child tags.]]></description>
<display-name>mt:send</display-name>
<name>send</name>
<tag-class>org.apache.taglibs.mailer2.SendTag</tag-class>
@@ -450,19 +449,19 @@
</attribute>
<example>
<usage>
- <comment>Example usage of the send tag.</comment>
+ <comment>Example usage of the <mt:send> tag.</comment>
<code><![CDATA[
<mt:mail var="message" subject="Test mail" from="john.doe@example.com"
to="jane.doe@example.com" server="smtp.example.com">
Hi Jane, here's my first mail
</mt:mail>
-</mt:send message="${message}" background="true"/>
+<mt:send message="${message}" background="true"/>
]]></code>
</usage>
</example>
</tag>
<tag>
- <description><![CDATA[JSP tag <mt:replyto> is used to add reply-to addresses to an e-mail message. It is a child of mt:mail.]]></description>
+ <description><![CDATA[JSP tag <mt:replyto> adds a reply-to address to an e-mail message. It is a child of mt:mail.]]></description>
<display-name>mt:replyto</display-name>
<name>replyto</name>
<tag-class>org.apache.taglibs.mailer2.ReplyToTag</tag-class>
@@ -485,7 +484,7 @@
</attribute>
<example>
<usage>
- <comment>Example usage of the replyto tag.</comment>
+ <comment>Example usage of the <mt:replyto> tag.</comment>
<code><![CDATA[
<mt:replyto address="john.doe@example.com"/>
@@ -497,7 +496,7 @@
</tagtoc>
<tagtoc name="S/MIME signing and encryption tags">
<tag>
- <description><![CDATA[JSP tag <mt:sign> is used to S/MIME sign a previously stored message. <mt:sign> does not have any child tags.]]></description>
+ <description><![CDATA[JSP tag <mt:sign> is used to S/MIME sign a previously stored message. <mt:sign> does not have any child tags.]]></description>
<display-name>mt:sign</display-name>
<name>sign</name>
<tag-class>org.apache.taglibs.mailer2.SignTag</tag-class>
@@ -556,21 +555,21 @@
</attribute>
<example>
<usage>
- <comment>Example usage of the sign tag.</comment>
+ <comment>Example usage of the <mt:sign> tag.</comment>
<code><![CDATA[
<mt:mail var="message" subject="Signed Mail" from="john.doe@example.com"
to="jane.doe@example.com" server="smtp.example.com">
Hi Jane, this mail has been signed.
</mt:mail>
-</mt:sign message="${message}" var="signedMessage" keystore="keystore.p12"
+<mt:sign message="${message}" var="signedMessage" keystore="keystore.p12"
alias="johndoe" storepass="secret"/>
-</mt:send message="${signedMessage}"/>
+<mt:send message="${signedMessage}"/>
]]></code>
</usage>
</example>
</tag>
<tag>
- <description><![CDATA[JSP tag <mt:encrypt> is used to S/MIME encrypt a previously stored message. <mt:encrypt> does not have any child tags.]]></description>
+ <description><![CDATA[JSP tag <mt:encrypt> is used to S/MIME sign and encrypt a previously stored message. <mt:encrypt> does not have any child tags.]]></description>
<display-name>mt:encrypt</display-name>
<name>encrypt</name>
<tag-class>org.apache.taglibs.mailer2.EncryptTag</tag-class>
@@ -629,15 +628,15 @@
</attribute>
<example>
<usage>
- <comment>Example usage of the encrypt tag.</comment>
+ <comment>Example usage of the <mt:encrypt> tag.</comment>
<code><![CDATA[
<mt:mail var="message" subject="Encrypted Mail" from="john.doe@example.com"
to="jane.doe@example.com" server="smtp.example.com">
Hi Jane, this mail has been signed and encrypted.
</mt:mail>
-</mt:encrypt message="${message}" var="encryptedMessage" keystore="keystore.p12"
+<mt:encrypt message="${message}" var="encryptedMessage" keystore="keystore.p12"
alias="johndoe" storepass="secret"/>
-</mt:send message="${encryptedMessage}"/>
+<mt:send message="${encryptedMessage}"/>
]]></code>
</usage>
</example>
@@ -645,7 +644,7 @@
</tagtoc>
<tagtoc name="Loading and saving messages">
<tag>
- <description><![CDATA[JSP tag <mt:save> is used to save a previously stored message to the file system. <mt:save> does not have any child tags.]]></description>
+ <description><![CDATA[JSP tag <mt:save> is used to save a previously stored message to the file system. <mt:save> does not have any child tags.]]></description>
<display-name>mt:save</display-name>
<name>save</name>
<tag-class>org.apache.taglibs.mailer2.SaveTag</tag-class>
@@ -662,27 +661,27 @@
</attribute>
<attribute>
<description>The location to save the message</description>
- <name>filename</name>
+ <name>filename</name>
<required>yes</required>
<rtexprvalue>yes</rtexprvalue>
<availability>1.0</availability>
</attribute>
<example>
<usage>
- <comment>Example usage of the save tag.</comment>
+ <comment>Example usage of the <mt:save> tag.</comment>
<code><![CDATA[
<mt:mail var="message" subject="Test mail" from="john.doe@example.com"
to="jane.doe@example.com" server="smtp.example.com">
Hi Jane, here's my first mail
</mt:mail>
-</mt:sign message="${message}" var="signedMessage" .../>
-<mt:save message="${signedMessage}" filename="signed.message"/>
+<mt:sign message="${message}" var="signedMessage" .../>
+<mt:save message="${signedMessage}" filename="signed.message"/>
]]></code>
</usage>
</example>
</tag>
<tag>
- <description><![CDATA[JSP tag <mt:load> is used to load a message from the file system. <mt:load> does not have any child tags.]]></description>
+ <description><![CDATA[JSP tag <mt:load> is used to load a message from the file system. <mt:load> does not have any child tags.]]></description>
<display-name>mt:load</display-name>
<name>load</name>
<tag-class>org.apache.taglibs.mailer2.LoadTag</tag-class>
@@ -691,7 +690,7 @@
<restrictions>None</restrictions>
<attribute>
<description>The location to load the message from</description>
- <name>filename</name>
+ <name>filename</name>
<required>yes</required>
<rtexprvalue>yes</rtexprvalue>
<availability>1.0</availability>
@@ -712,9 +711,9 @@
</attribute>
<example>
<usage>
- <comment>Example usage of the load tag.</comment>
+ <comment>Example usage of the <mt:load> tag.</comment>
<code><![CDATA[
-<mt:load var="message" filename="signed.message"/>
+<mt:load var="message" filename="signed.message"/>
<mt:send message="${message}"/>
]]></code>
</usage>
---------------------------------------------------------------------
To unsubscribe, e-mail: taglibs-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: taglibs-dev-help@jakarta.apache.org