Author: epugh
Date: Tue Oct 18 19:15:50 2005
New Revision: 326327
URL: http://svn.apache.org/viewcvs?rev=326327&view=rev
Log:
Finally able to use commons-email-1.0! Fix project.xml to work with Maven 1.1
Modified:
jakarta/turbine/core/trunk/project.xml
jakarta/turbine/core/trunk/src/java/org/apache/turbine/util/velocity/VelocityEmail.java
jakarta/turbine/core/trunk/src/java/org/apache/turbine/util/velocity/VelocityHtmlEmail.java
Modified: jakarta/turbine/core/trunk/project.xml
URL:
http://svn.apache.org/viewcvs/jakarta/turbine/core/trunk/project.xml?rev=326327&r1=326326&r2=326327&view=diff
==============================================================================
--- jakarta/turbine/core/trunk/project.xml (original)
+++ jakarta/turbine/core/trunk/project.xml Tue Oct 18 19:15:50 2005
@@ -48,28 +48,28 @@
<url>http://cvs.apache.org/viewcvs/jakarta-turbine-2/</url>
</repository>
-<releases>
- <release>
- <version>2.1</version>
+<versions>
+ <version>
+ <id>2.1</id>
<tag>TURBINE_2_1</tag>
- </release>
- <release>
- <version>2.2</version>
+ </version>
+ <version>
+ <id>2.2</id>
<tag>TURBINE_2_2_0</tag>
- </release>
- <release>
- <version>2.3-rc1</version>
+ </version>
+ <version>
+ <id>2.3-rc1</id>
<tag>TURBINE_2_3_RC1</tag>
- </release>
- <release>
- <version>2.3-rc2</version>
+ </version>
+ <version>
+ <id>2.3-rc2</id>
<tag>TURBINE_2_3_RC2</tag>
- </release>
- <release>
- <version>2.3</version>
+ </version>
+ <version>
+ <id>2.3</id>
<tag>TURBINE_2_3</tag>
- </release>
- </releases>
+ </version>
+ </versions>
<mailingLists>
<mailingList>
@@ -421,7 +421,7 @@
</dependency>
<dependency>
<id>commons-configuration</id>
- <version>1.0</version>
+ <version>1.1</version>
<url>http://jakarta.apache.org/commons/configuration/</url>
</dependency>
<dependency>
@@ -431,7 +431,7 @@
</dependency>
<dependency>
<id>commons-email</id>
- <version>20030310.165926</version>
+ <version>1.0</version>
<url>http://jakarta.apache.org/commons/sandbox/email/</url>
</dependency>
<dependency>
@@ -451,7 +451,7 @@
</dependency>
<dependency>
<id>commons-pool</id>
- <version>1.1</version>
+ <version>1.2</version>
<url>http://jakarta.apache.org/commons/pool/</url>
</dependency>
<dependency>
@@ -637,9 +637,6 @@
<excludes>
</excludes>
</unitTest>
- <integrationUnitTestSourceDirectory/>
- <integrationUnitTest/>
- <aspectSourceDirectory/>
</build>
<reports>
Modified:
jakarta/turbine/core/trunk/src/java/org/apache/turbine/util/velocity/VelocityEmail.java
URL:
http://svn.apache.org/viewcvs/jakarta/turbine/core/trunk/src/java/org/apache/turbine/util/velocity/VelocityEmail.java?rev=326327&r1=326326&r2=326327&view=diff
==============================================================================
---
jakarta/turbine/core/trunk/src/java/org/apache/turbine/util/velocity/VelocityEmail.java
(original)
+++
jakarta/turbine/core/trunk/src/java/org/apache/turbine/util/velocity/VelocityEmail.java
Tue Oct 18 19:15:50 2005
@@ -18,20 +18,16 @@
*/
-import javax.mail.MessagingException;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.WordUtils;
-
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;
import org.apache.turbine.TurbineConstants;
import org.apache.turbine.services.velocity.TurbineVelocity;
-
import org.apache.velocity.context.Context;
/**
@@ -145,7 +141,7 @@
* @return A VelocityEmail (self).
*/
public VelocityEmail setTo(String toName, String toEmail)
- throws MessagingException
+ throws EmailException
{
addTo(toEmail,toName);
return this;
@@ -240,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
@@ -253,7 +249,7 @@
}
catch (Exception e)
{
- throw new MessagingException(
+ throw new EmailException(
"Could not render velocitty template", e);
}
@@ -266,7 +262,7 @@
setMsg(body);
setHostName(getMailServer());
- super.send();
+ return super.send();
}
/**
Modified:
jakarta/turbine/core/trunk/src/java/org/apache/turbine/util/velocity/VelocityHtmlEmail.java
URL:
http://svn.apache.org/viewcvs/jakarta/turbine/core/trunk/src/java/org/apache/turbine/util/velocity/VelocityHtmlEmail.java?rev=326327&r1=326326&r2=326327&view=diff
==============================================================================
---
jakarta/turbine/core/trunk/src/java/org/apache/turbine/util/velocity/VelocityHtmlEmail.java
(original)
+++
jakarta/turbine/core/trunk/src/java/org/apache/turbine/util/velocity/VelocityHtmlEmail.java
Tue Oct 18 19:15:50 2005
@@ -19,24 +19,18 @@
import java.net.URL;
-
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;
import org.apache.turbine.TurbineConstants;
import org.apache.turbine.pipeline.PipelineData;
import org.apache.turbine.services.velocity.TurbineVelocity;
import org.apache.turbine.util.RunData;
-
import org.apache.velocity.context.Context;
/**
@@ -202,9 +196,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);
@@ -223,10 +217,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();
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
