Author: henning
Date: Mon Aug 29 03:48:44 2005
New Revision: 264107
URL: http://svn.apache.org/viewcvs?rev=264107&view=rev
Log:
Update commons-email reference to 1.0-rc6 (will be 1.0 at final
release).
Modified:
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/project.xml
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/velocity/VelocityEmail.java
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/velocity/VelocityHtmlEmail.java
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/changes.xml
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/project.xml
URL:
http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/project.xml?rev=264107&r1=264106&r2=264107&view=diff
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/project.xml (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/project.xml Mon Aug 29
03:48:44 2005
@@ -42,7 +42,7 @@
well. In other words, we strive to make portions of Turbine easily
available for use in other applications.
</description>
- <url>http://jakarta.apache.org/turbine/turbine/turbine-2.3.1/</url>
+ <url>http://jakarta.apache.org/turbine/development/turbine-2.3/</url>
<issueTrackingUrl>http://issues.apache.org/scarab/issues</issueTrackingUrl>
<siteAddress>people.apache.org</siteAddress>
<siteDirectory>/www/jakarta.apache.org/turbine/turbine/development/turbine-2.3/</siteDirectory>
@@ -402,7 +402,7 @@
<dependency>
<groupId>commons-email</groupId>
<artifactId>commons-email</artifactId>
- <version>20030310.165926</version>
+ <version>1.0-rc6</version>
<url>http://jakarta.apache.org/commons/sandbox/email/</url>
<type>jar</type>
</dependency>
@@ -494,6 +494,7 @@
<groupId>javamail</groupId>
<artifactId>javamail</artifactId>
<version>1.3.1</version>
+ <version>1.3.2</version>
<url>http://java.sun.com/products/javamail/</url>
<type>jar</type>
</dependency>
@@ -635,6 +636,7 @@
<version>3.1.1</version>
<type>plugin</type>
</dependency>
+
<dependency>
<groupId>maven</groupId>
<artifactId>maven-ant-plugin</artifactId>
@@ -716,7 +718,7 @@
<dependency>
<groupId>maven</groupId>
<artifactId>maven-xdoc-plugin</artifactId>
- <version>1.9.1</version>
+ <version>1.9.2</version>
<type>plugin</type>
</dependency>
</dependencies>
@@ -748,7 +750,7 @@
<aspectSourceDirectory/>
</build>
- <reports>
+ <reports>
<report>maven-jdepend-plugin</report>
<report>maven-checkstyle-plugin</report>
<report>maven-changes-plugin</report>
Modified:
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/velocity/VelocityEmail.java
URL:
http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/velocity/VelocityEmail.java?rev=264107&r1=264106&r2=264107&view=diff
==============================================================================
---
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/velocity/VelocityEmail.java
(original)
+++
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/velocity/VelocityEmail.java
Mon Aug 29 03:48:44 2005
@@ -16,13 +16,12 @@
* limitations under the License.
*/
-import javax.mail.MessagingException;
-
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.commons.mail.EmailException;
import org.apache.commons.mail.SimpleEmail;
import org.apache.turbine.Turbine;
@@ -138,11 +137,11 @@
* @param toName A String with the TO toName.
* @param toEmail A String with the TO toEmail.
* @deprecated use addTo(email,name) instead
- * @throws MessagingException email address could not be parsed
+ * @throws EmailException email address could not be parsed
* @return A VelocityEmail (self).
*/
public VelocityEmail setTo(String toName, String toEmail)
- throws MessagingException
+ throws EmailException
{
addTo(toEmail,toName);
return this;
@@ -237,10 +236,10 @@
* the value of mail.server will be used from TR.props. If that
* value was not set, localhost is used.
*
- * @throws MessagingException Failure during merging the velocity
+ * @throws EmailException Failure during merging the velocity
* template or sending the email.
*/
- public void send() throws MessagingException
+ public String send() throws EmailException
{
String body = null;
try
@@ -250,7 +249,7 @@
}
catch (Exception e)
{
- throw new MessagingException(
+ throw new EmailException(
"Could not render velocitty template", e);
}
@@ -263,7 +262,7 @@
setMsg(body);
setHostName(getMailServer());
- super.send();
+ return super.send();
}
/**
Modified:
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/velocity/VelocityHtmlEmail.java
URL:
http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/velocity/VelocityHtmlEmail.java?rev=264107&r1=264106&r2=264107&view=diff
==============================================================================
---
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/velocity/VelocityHtmlEmail.java
(original)
+++
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/velocity/VelocityHtmlEmail.java
Mon Aug 29 03:48:44 2005
@@ -20,13 +20,12 @@
import java.util.Hashtable;
-import javax.mail.MessagingException;
-
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.commons.mail.EmailException;
import org.apache.commons.mail.HtmlEmail;
import org.apache.turbine.Turbine;
@@ -187,9 +186,9 @@
/**
* Actually send the mail.
*
- * @exception MessagingException thrown if mail cannot be sent.
+ * @exception EmailException thrown if mail cannot be sent.
*/
- public void send() throws MessagingException
+ public String send() throws EmailException
{
context.put("mail", this);
@@ -208,10 +207,10 @@
}
catch (Exception e)
{
- throw new MessagingException("Cannot parse velocity template", e);
+ throw new EmailException("Cannot parse velocity template", e);
}
setHostName(getMailServer());
- super.send();
+ return super.send();
}
/**
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/changes.xml
URL:
http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/changes.xml?rev=264107&r1=264106&r2=264107&view=diff
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/changes.xml
(original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/changes.xml Mon Aug
29 03:48:44 2005
@@ -28,6 +28,10 @@
<body>
<release version="2.3.2-dev" date="in CVS">
<action type="update" dev="henning">
+ Bump javamail to version 1.3.2<br/>
+ Build with commons-email 1.0-RC6.
+ </action>
+ <action type="fix" dev="henning">
Fix the build process bug that let some of the reports end up in wrong
directories.
</action>
<action type="update" dev="henning">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
