[commons-email] branch master updated (aee9bcf -> 54ef498)
This is an automated email from the ASF dual-hosted git repository. sgoeschl pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/commons-email.git. from aee9bcf Merge pull request #9 from gitmotte/master add 476706c EMAIL-190 Travis build fails for JDK 7 & 11 new 54ef498 Merge pull request #12 from apache/EMAIL-190 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .travis.yml | 4 +++- pom.xml | 10 +- src/changes/changes.xml | 6 ++ 3 files changed, 14 insertions(+), 6 deletions(-)
[commons-email] 01/01: Merge pull request #12 from apache/EMAIL-190
This is an automated email from the ASF dual-hosted git repository. sgoeschl pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-email.git commit 54ef498f5f7bf91bea182678625af92fffa19963 Merge: aee9bcf 476706c Author: Siegfried Goeschl AuthorDate: Fri Mar 6 00:03:38 2020 +0100 Merge pull request #12 from apache/EMAIL-190 EMAIL-190 Travis build fails for JDK 7 & 11 .travis.yml | 4 +++- pom.xml | 10 +- src/changes/changes.xml | 6 ++ 3 files changed, 14 insertions(+), 6 deletions(-)
[commons-email] 01/01: EMAIL-190 Travis build fails for JDK 7 & 11
This is an automated email from the ASF dual-hosted git repository.
sgoeschl pushed a commit to branch EMAIL-190
in repository https://gitbox.apache.org/repos/asf/commons-email.git
commit 476706ce7173c0ecceeacc793abd223eb5296408
Author: Siegfried Goeschl
AuthorDate: Thu Mar 5 23:14:10 2020 +0100
EMAIL-190 Travis build fails for JDK 7 & 11
---
.travis.yml | 4 +++-
pom.xml | 10 +-
src/changes/changes.xml | 6 ++
3 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 128b1d4..72fe3cd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,9 +17,11 @@ language: java
sudo: false
jdk:
- - openjdk7
- openjdk8
+ - openjdk9
+ - openjdk10
- openjdk11
+ - openjdk12
after_success:
- mvn clean cobertura:cobertura coveralls:report
diff --git a/pom.xml b/pom.xml
index 1c7519e..b1385ce 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
org.apache.commons
commons-parent
- 47
+ 50
4.0.0
commons-email
@@ -242,7 +242,7 @@
junit
junit
-4.12
+4.13
test
@@ -305,8 +305,8 @@
UTF-8
-1.7.3
-3.6
+2.0.5
+4.2
3.0.5
@@ -447,7 +447,7 @@
org.apache.maven.plugins
maven-pmd-plugin
-3.9.0
+3.13.0
${maven.compiler.target}
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index bb45840..30d7fbc 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -23,6 +23,12 @@
+
+Fix broken JDK 1.9 build by updating "easymock" and other dependencies.
+
+
+Change from javax.mail:1.6.1 to jakarta.mail:1.6.4.
+
Upgrade javax.mail dependency to 1.6.1, so that i18n is supported for
email addresses.
[commons-email] branch EMAIL-190 created (now 476706c)
This is an automated email from the ASF dual-hosted git repository. sgoeschl pushed a change to branch EMAIL-190 in repository https://gitbox.apache.org/repos/asf/commons-email.git. at 476706c EMAIL-190 Travis build fails for JDK 7 & 11 This branch includes the following new commits: new 476706c EMAIL-190 Travis build fails for JDK 7 & 11 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[commons-email] branch master updated: javax.mail:1.6.1 -> jakarta.mail:1.6.4
This is an automated email from the ASF dual-hosted git repository. sgoeschl pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-email.git The following commit(s) were added to refs/heads/master by this push: new ffd4451 javax.mail:1.6.1 -> jakarta.mail:1.6.4 new aee9bcf Merge pull request #9 from gitmotte/master ffd4451 is described below commit ffd44512d23458323fa9505ed246afe69d3418a2 Author: gitmotte AuthorDate: Mon Oct 7 23:38:29 2019 +0200 javax.mail:1.6.1 -> jakarta.mail:1.6.4 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 59ee1ef..1c7519e 100644 --- a/pom.xml +++ b/pom.xml @@ -236,8 +236,8 @@ com.sun.mail -javax.mail -1.6.1 +jakarta.mail +1.6.4 junit
svn commit: r1802528 - /commons/proper/email/trunk/pom.xml
Author: sgoeschl Date: Thu Jul 20 19:42:42 2017 New Revision: 1802528 URL: http://svn.apache.org/viewvc?rev=1802528&view=rev Log: Update release version from 1.4 to 1.5 Modified: commons/proper/email/trunk/pom.xml Modified: commons/proper/email/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/pom.xml?rev=1802528&r1=1802527&r2=1802528&view=diff == --- commons/proper/email/trunk/pom.xml (original) +++ commons/proper/email/trunk/pom.xml Thu Jul 20 19:42:42 2017 @@ -291,7 +291,7 @@ org.apache.commons.mail EMAIL 12310474 -1.4 +1.5 RC1
svn commit: r1802527 - /commons/proper/email/trunk/RELEASE-NOTES.txt
Author: sgoeschl Date: Thu Jul 20 19:34:23 2017 New Revision: 1802527 URL: http://svn.apache.org/viewvc?rev=1802527&view=rev Log: Update release notes for upcoming commons-email 1.5 release Modified: commons/proper/email/trunk/RELEASE-NOTES.txt Modified: commons/proper/email/trunk/RELEASE-NOTES.txt URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/RELEASE-NOTES.txt?rev=1802527&r1=1802526&r2=1802527&view=diff == --- commons/proper/email/trunk/RELEASE-NOTES.txt (original) +++ commons/proper/email/trunk/RELEASE-NOTES.txt Thu Jul 20 19:34:23 2017 @@ -1,5 +1,5 @@ Commons Email Package - Version 1.4 + Version 1.5 Release Notes INTRODUCTION: @@ -15,8 +15,45 @@ downloads, reports, and bug status: http://commons.apache.org/email/ -This is a minor release which adds some new features and fixes several bugs -present in the 1.3.3 release. All current users are encouraged to upgrade. +This is a major release which adds some new features and fixes several bugs +present in the 1.4.0 release. All current users are encouraged to upgrade. + +CHANGES FROM 1.4: +- + +== Compatibility == + +* Java 6 or later is required. + +* JavaMail dependency has been upgraded to version 1.5.6, + as a consequence, the maven dependency has changed to: + + +com.sun.mail +javax.mail +1.5.6 + + +== New Features == + +* Add Support for International Domain Names. This change requires JDK 1.6+. +Issue: EMAIL-160 + +* Add Email#getHeader(String) and Email#getHeaders() methods. +Issue: EMAIL-154. Thanks to Ken Geis, Balachandran Sivakumar + +== Updates == + +* Update Oracle JavaMail dependency from 1.5.2 to 1.5.6. + Issue: EMAIL-165. + +* Remove "javax.activation" dependency since it is included in JDK 1.6 + Issue: EMAIL-161. + +== Fixed Bugs == + +* DataSourceClassPathResolver doesn't close InputStream when resolving resources +Issue: EMAIL-167. Thanks to Lucian Burja. CHANGES FROM 1.3.3: -
svn commit: r1802526 - in /commons/proper/email/trunk/src/main/java/org/apache/commons/mail: Email.java EmailUtils.java resolver/DataSourceClassPathResolver.java
Author: sgoeschl
Date: Thu Jul 20 19:33:41 2017
New Revision: 1802526
URL: http://svn.apache.org/viewvc?rev=1802526&view=rev
Log:
Code cosmetic - fix a couple of Checkstyle warnings
Modified:
commons/proper/email/trunk/src/main/java/org/apache/commons/mail/Email.java
commons/proper/email/trunk/src/main/java/org/apache/commons/mail/EmailUtils.java
commons/proper/email/trunk/src/main/java/org/apache/commons/mail/resolver/DataSourceClassPathResolver.java
Modified:
commons/proper/email/trunk/src/main/java/org/apache/commons/mail/Email.java
URL:
http://svn.apache.org/viewvc/commons/proper/email/trunk/src/main/java/org/apache/commons/mail/Email.java?rev=1802526&r1=1802525&r2=1802526&view=diff
==
--- commons/proper/email/trunk/src/main/java/org/apache/commons/mail/Email.java
(original)
+++ commons/proper/email/trunk/src/main/java/org/apache/commons/mail/Email.java
Thu Jul 20 19:33:41 2017
@@ -1237,7 +1237,8 @@ public abstract class Email
* @return An Email.
* @since 1.0
*/
-public Email setSubject(final String aSubject) {
+public Email setSubject(final String aSubject)
+{
this.subject =
EmailUtils.replaceEndOfLineCharactersWithSpaces(aSubject);
return this;
}
Modified:
commons/proper/email/trunk/src/main/java/org/apache/commons/mail/EmailUtils.java
URL:
http://svn.apache.org/viewvc/commons/proper/email/trunk/src/main/java/org/apache/commons/mail/EmailUtils.java?rev=1802526&r1=1802525&r2=1802526&view=diff
==
---
commons/proper/email/trunk/src/main/java/org/apache/commons/mail/EmailUtils.java
(original)
+++
commons/proper/email/trunk/src/main/java/org/apache/commons/mail/EmailUtils.java
Thu Jul 20 19:33:41 2017
@@ -271,14 +271,15 @@ final class EmailUtils
/**
* Replaces end-of-line characters with spaces.
- *
+ *
* @param input the input string to be scanned.
* @return a clean string
*/
-static String replaceEndOfLineCharactersWithSpaces(final String input) {
+static String replaceEndOfLineCharactersWithSpaces(final String input)
+{
return input == null ? null : input.replace('\n', ' ').replace('\r', '
');
}
-
+
/**
* Encodes an input string according to RFC 2392. Unsafe characters are
escaped.
*
Modified:
commons/proper/email/trunk/src/main/java/org/apache/commons/mail/resolver/DataSourceClassPathResolver.java
URL:
http://svn.apache.org/viewvc/commons/proper/email/trunk/src/main/java/org/apache/commons/mail/resolver/DataSourceClassPathResolver.java?rev=1802526&r1=1802525&r2=1802526&view=diff
==
---
commons/proper/email/trunk/src/main/java/org/apache/commons/mail/resolver/DataSourceClassPathResolver.java
(original)
+++
commons/proper/email/trunk/src/main/java/org/apache/commons/mail/resolver/DataSourceClassPathResolver.java
Thu Jul 20 19:33:41 2017
@@ -101,7 +101,8 @@ public class DataSourceClassPathResolver
// similar to other DataSource implementations, e.g.
FileDataSource, URLDataSource
ds.setName(DataSourceClassPathResolver.class.getResource(resourceName).toString());
result = ds;
-} finally
+}
+finally
{
is.close();
}
svn commit: r1802211 - in /commons/proper/email/trunk/src: main/java/org/apache/commons/mail/Email.java test/java/org/apache/commons/mail/EmailTest.java
Author: sgoeschl
Date: Mon Jul 17 21:01:14 2017
New Revision: 1802211
URL: http://svn.apache.org/viewvc?rev=1802211&view=rev
Log:
Allow the usage of an empty string as bounce address - this fixes a tiny
incompatibility introduced by a re-factoring.
Modified:
commons/proper/email/trunk/src/main/java/org/apache/commons/mail/Email.java
commons/proper/email/trunk/src/test/java/org/apache/commons/mail/EmailTest.java
Modified:
commons/proper/email/trunk/src/main/java/org/apache/commons/mail/Email.java
URL:
http://svn.apache.org/viewvc/commons/proper/email/trunk/src/main/java/org/apache/commons/mail/Email.java?rev=1802211&r1=1802210&r2=1802211&view=diff
==
--- commons/proper/email/trunk/src/main/java/org/apache/commons/mail/Email.java
(original)
+++ commons/proper/email/trunk/src/main/java/org/apache/commons/mail/Email.java
Mon Jul 17 21:01:14 2017
@@ -1282,7 +1282,7 @@ public abstract class Email
}
else
{
-this.bounceAddress = null;
+this.bounceAddress = email;
}
return this;
Modified:
commons/proper/email/trunk/src/test/java/org/apache/commons/mail/EmailTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/email/trunk/src/test/java/org/apache/commons/mail/EmailTest.java?rev=1802211&r1=1802210&r2=1802211&view=diff
==
---
commons/proper/email/trunk/src/test/java/org/apache/commons/mail/EmailTest.java
(original)
+++
commons/proper/email/trunk/src/test/java/org/apache/commons/mail/EmailTest.java
Mon Jul 17 21:01:14 2017
@@ -1286,7 +1286,7 @@ public class EmailTest extends AbstractE
public void testSetNullAndEmptyBounceAddress()
{
assertNull(email.setBounceAddress(null).getBounceAddress());
-assertNull(email.setBounceAddress("").getBounceAddress());
+assertEquals("", email.setBounceAddress("").getBounceAddress());
}
@Test(expected = RuntimeException.class)
svn commit: r1777032 - in /commons/proper/email/trunk: pom.xml src/changes/changes.xml
Author: sgoeschl Date: Mon Jan 2 22:24:46 2017 New Revision: 1777032 URL: http://svn.apache.org/viewvc?rev=1777032&view=rev Log: EMAIL-165 Upgrade from javax.mail-1.5.5 to 1.5.6 Modified: commons/proper/email/trunk/pom.xml commons/proper/email/trunk/src/changes/changes.xml Modified: commons/proper/email/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/pom.xml?rev=1777032&r1=1777031&r2=1777032&view=diff == --- commons/proper/email/trunk/pom.xml (original) +++ commons/proper/email/trunk/pom.xml Mon Jan 2 22:24:46 2017 @@ -230,7 +230,7 @@ com.sun.mail javax.mail -1.5.5 +1.5.6 junit Modified: commons/proper/email/trunk/src/changes/changes.xml URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/src/changes/changes.xml?rev=1777032&r1=1777031&r2=1777032&view=diff == --- commons/proper/email/trunk/src/changes/changes.xml (original) +++ commons/proper/email/trunk/src/changes/changes.xml Mon Jan 2 22:24:46 2017 @@ -23,6 +23,9 @@ + +Upgrade to javax.mail-1.5.6 + Remove "javax.activation" dependency since it is included in JDK 1.6 and update to javax.mail-1.5.5
svn commit: r1777030 - in /commons/proper/email/trunk: ./ src/main/java/org/apache/commons/mail/ src/main/java/org/apache/commons/mail/util/ src/test/java/org/apache/commons/mail/ src/test/java/org/ap
Author: sgoeschl
Date: Mon Jan 2 22:18:55 2017
New Revision: 1777030
URL: http://svn.apache.org/viewvc?rev=1777030&view=rev
Log:
Clean up source code and improve tests
Modified:
commons/proper/email/trunk/NOTICE.txt
commons/proper/email/trunk/src/main/java/org/apache/commons/mail/Email.java
commons/proper/email/trunk/src/main/java/org/apache/commons/mail/util/IDNEmailAddressConverter.java
commons/proper/email/trunk/src/test/java/org/apache/commons/mail/EmailTest.java
commons/proper/email/trunk/src/test/java/org/apache/commons/mail/util/IDNEmailAddressConverterTest.java
Modified: commons/proper/email/trunk/NOTICE.txt
URL:
http://svn.apache.org/viewvc/commons/proper/email/trunk/NOTICE.txt?rev=1777030&r1=1777029&r2=1777030&view=diff
==
--- commons/proper/email/trunk/NOTICE.txt (original)
+++ commons/proper/email/trunk/NOTICE.txt Mon Jan 2 22:18:55 2017
@@ -1,5 +1,5 @@
Apache Commons Email
-Copyright 2001-2016 The Apache Software Foundation
+Copyright 2001-2017 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
Modified:
commons/proper/email/trunk/src/main/java/org/apache/commons/mail/Email.java
URL:
http://svn.apache.org/viewvc/commons/proper/email/trunk/src/main/java/org/apache/commons/mail/Email.java?rev=1777030&r1=1777029&r2=1777030&view=diff
==
--- commons/proper/email/trunk/src/main/java/org/apache/commons/mail/Email.java
(original)
+++ commons/proper/email/trunk/src/main/java/org/apache/commons/mail/Email.java
Mon Jan 2 22:18:55 2017
@@ -1206,12 +1206,12 @@ public abstract class Email
/**
* Gets the specified header.
*
- * @param header A string with the header.
+ * @param header A string with the header.
* @return The value of the header, or null if no such header.
*/
public String getHeader(final String header)
{
-return headers.get(header);
+return this.headers.get(header);
}
/**
@@ -1223,7 +1223,7 @@ public abstract class Email
{
return this.headers;
}
-
+
/**
* Set the email subject.
*
@@ -1262,7 +1262,24 @@ public abstract class Email
public Email setBounceAddress(final String email)
{
checkSessionAlreadyInitialized();
-this.bounceAddress = email;
+
+if (email != null && !email.isEmpty())
+{
+try
+{
+this.bounceAddress = createInternetAddress(email, null,
this.charset).getAddress();
+}
+catch (EmailException e)
+{
+// Can't throw 'EmailException' to keep backward-compatibility
+throw new IllegalArgumentException("Failed to set the bounce
address : " + email, e);
+}
+}
+else
+{
+this.bounceAddress = null;
+}
+
return this;
}
@@ -1911,7 +1928,7 @@ public abstract class Email
private InternetAddress createInternetAddress(final String email, final
String name, final String charsetName)
throws EmailException
{
-InternetAddress address = null;
+InternetAddress address;
try
{
Modified:
commons/proper/email/trunk/src/main/java/org/apache/commons/mail/util/IDNEmailAddressConverter.java
URL:
http://svn.apache.org/viewvc/commons/proper/email/trunk/src/main/java/org/apache/commons/mail/util/IDNEmailAddressConverter.java?rev=1777030&r1=1777029&r2=1777030&view=diff
==
---
commons/proper/email/trunk/src/main/java/org/apache/commons/mail/util/IDNEmailAddressConverter.java
(original)
+++
commons/proper/email/trunk/src/main/java/org/apache/commons/mail/util/IDNEmailAddressConverter.java
Mon Jan 2 22:18:55 2017
@@ -18,8 +18,6 @@ package org.apache.commons.mail.util;
import javax.mail.internet.InternetAddress;
import java.net.IDN;
-import java.util.ArrayList;
-import java.util.Collection;
/**
* Converts email addresses containing International Domain Names into an ASCII
@@ -33,10 +31,13 @@ import java.util.Collection;
* @version $Id$
* @since 1.5
*/
-public class IDNEmailAddressConverter {
-
+public class IDNEmailAddressConverter
+{
/**
* Convert an email address to its ASCII representation using "Punycode".
+ *
+ * @param email email address.
+ * @return The ASCII representation
*/
public String toASCII(final String email)
{
@@ -47,64 +48,68 @@ public class IDNEmailAddressConverter {
return email;
}
-return getLocalPart(email, idx) + "@" +
IDN.toASCII(getDomainPart(email, idx));
-}
-
-/**
-
svn commit: r1728015 - /commons/proper/email/trunk/src/main/java/org/apache/commons/mail/Email.java
Author: sgoeschl
Date: Mon Feb 1 21:50:39 2016
New Revision: 1728015
URL: http://svn.apache.org/viewvc?rev=1728015&view=rev
Log:
[EMAIL-162] Remove usage of deprecated constants in Email.java
Modified:
commons/proper/email/trunk/src/main/java/org/apache/commons/mail/Email.java
Modified:
commons/proper/email/trunk/src/main/java/org/apache/commons/mail/Email.java
URL:
http://svn.apache.org/viewvc/commons/proper/email/trunk/src/main/java/org/apache/commons/mail/Email.java?rev=1728015&r1=1728014&r2=1728015&view=diff
==
--- commons/proper/email/trunk/src/main/java/org/apache/commons/mail/Email.java
(original)
+++ commons/proper/email/trunk/src/main/java/org/apache/commons/mail/Email.java
Mon Feb 1 21:50:39 2016
@@ -560,12 +560,12 @@ public abstract class Email
EmailUtils.notNull(aSession, "no mail session supplied");
final Properties sessionProperties = aSession.getProperties();
-final String auth = sessionProperties.getProperty(MAIL_SMTP_AUTH);
+final String auth =
sessionProperties.getProperty(EmailConstants.MAIL_SMTP_AUTH);
if ("true".equalsIgnoreCase(auth))
{
-final String userName =
sessionProperties.getProperty(MAIL_SMTP_USER);
-final String password =
sessionProperties.getProperty(MAIL_SMTP_PASSWORD);
+final String userName =
sessionProperties.getProperty(EmailConstants.MAIL_SMTP_USER);
+final String password =
sessionProperties.getProperty(EmailConstants.MAIL_SMTP_PASSWORD);
if (EmailUtils.isNotEmpty(userName) &&
EmailUtils.isNotEmpty(password))
{
@@ -629,11 +629,11 @@ public abstract class Email
if (this.session == null)
{
final Properties properties = new
Properties(System.getProperties());
-properties.setProperty(MAIL_TRANSPORT_PROTOCOL, SMTP);
+properties.setProperty(EmailConstants.MAIL_TRANSPORT_PROTOCOL,
EmailConstants.SMTP);
if (EmailUtils.isEmpty(this.hostName))
{
-this.hostName = properties.getProperty(MAIL_HOST);
+this.hostName =
properties.getProperty(EmailConstants.MAIL_HOST);
}
if (EmailUtils.isEmpty(this.hostName))
@@ -641,9 +641,9 @@ public abstract class Email
throw new EmailException("Cannot find valid hostname for mail
session");
}
-properties.setProperty(MAIL_PORT, this.smtpPort);
-properties.setProperty(MAIL_HOST, this.hostName);
-properties.setProperty(MAIL_DEBUG, String.valueOf(this.debug));
+properties.setProperty(EmailConstants.MAIL_PORT, this.smtpPort);
+properties.setProperty(EmailConstants.MAIL_HOST, this.hostName);
+properties.setProperty(EmailConstants.MAIL_DEBUG,
String.valueOf(this.debug));
properties.setProperty(EmailConstants.MAIL_TRANSPORT_STARTTLS_ENABLE,
isStartTLSEnabled() ? "true" : "false");
@@ -657,15 +657,15 @@ public abstract class Email
if (this.authenticator != null)
{
-properties.setProperty(MAIL_SMTP_AUTH, "true");
+properties.setProperty(EmailConstants.MAIL_SMTP_AUTH, "true");
}
if (isSSLOnConnect())
{
-properties.setProperty(MAIL_PORT, this.sslSmtpPort);
-properties.setProperty(MAIL_SMTP_SOCKET_FACTORY_PORT,
this.sslSmtpPort);
-properties.setProperty(MAIL_SMTP_SOCKET_FACTORY_CLASS,
"javax.net.ssl.SSLSocketFactory");
-properties.setProperty(MAIL_SMTP_SOCKET_FACTORY_FALLBACK,
"false");
+properties.setProperty(EmailConstants.MAIL_PORT,
this.sslSmtpPort);
+
properties.setProperty(EmailConstants.MAIL_SMTP_SOCKET_FACTORY_PORT,
this.sslSmtpPort);
+
properties.setProperty(EmailConstants.MAIL_SMTP_SOCKET_FACTORY_CLASS,
"javax.net.ssl.SSLSocketFactory");
+
properties.setProperty(EmailConstants.MAIL_SMTP_SOCKET_FACTORY_FALLBACK,
"false");
}
if ((isSSLOnConnect() || isStartTLSEnabled()) &&
isSSLCheckServerIdentity())
@@ -675,17 +675,17 @@ public abstract class Email
if (this.bounceAddress != null)
{
-properties.setProperty(MAIL_SMTP_FROM, this.bounceAddress);
+properties.setProperty(EmailConstants.MAIL_SMTP_FROM,
this.bounceAddress);
}
if (this.socketTimeout > 0)
{
-properties.setProperty(MAIL_SMTP_TIMEOUT,
Integer.toString(this.socketTimeout));
+properties.setProperty(EmailConstants.MAIL_SMTP_TIMEOUT,
Integer.toString
svn commit: r1728013 - /commons/proper/email/trunk/src/changes/changes.xml
Author: sgoeschl Date: Mon Feb 1 21:40:50 2016 New Revision: 1728013 URL: http://svn.apache.org/viewvc?rev=1728013&view=rev Log: [EMAIL-160] Add Support for International Domain Names - highlight that JDK 1.6+ is required now Modified: commons/proper/email/trunk/src/changes/changes.xml Modified: commons/proper/email/trunk/src/changes/changes.xml URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/src/changes/changes.xml?rev=1728013&r1=1728012&r2=1728013&view=diff == --- commons/proper/email/trunk/src/changes/changes.xml (original) +++ commons/proper/email/trunk/src/changes/changes.xml Mon Feb 1 21:40:50 2016 @@ -27,7 +27,7 @@ Remove "javax.activation" dependency since it is included in JDK 1.6 and update to javax.mail-1.5.5 -Add Support for International Domain Names. +Add Support for International Domain Names. This change requires JDK 1.6+. Add Email#getHeader(String) and Email#getHeaders() methods.
svn propchange: r1728011 - svn:log
Author: sgoeschl Revision: 1728011 Modified property: svn:log Modified: svn:log at Mon Feb 1 21:40:11 2016 -- --- svn:log (original) +++ svn:log Mon Feb 1 21:40:11 2016 @@ -1 +1 @@ -[EMAIL-160] Add Support for International Domain Names +[EMAIL-160] Add Support for International Domain Names - this change requires JDK 1.6+
svn commit: r1728012 - in /commons/proper/email/trunk: pom.xml src/changes/changes.xml src/test/java/org/apache/commons/mail/InvalidInternetAddressTest.java
Author: sgoeschl
Date: Mon Feb 1 21:35:08 2016
New Revision: 1728012
URL: http://svn.apache.org/viewvc?rev=1728012&view=rev
Log:
[EMAIL-161] Remove "javax.activation" dependency
Modified:
commons/proper/email/trunk/pom.xml
commons/proper/email/trunk/src/changes/changes.xml
commons/proper/email/trunk/src/test/java/org/apache/commons/mail/InvalidInternetAddressTest.java
Modified: commons/proper/email/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/email/trunk/pom.xml?rev=1728012&r1=1728011&r2=1728012&view=diff
==
--- commons/proper/email/trunk/pom.xml (original)
+++ commons/proper/email/trunk/pom.xml Mon Feb 1 21:35:08 2016
@@ -230,13 +230,7 @@
com.sun.mail
javax.mail
-1.5.2
-
-
-
-javax.activation
-activation
-1.1.1
+1.5.5
junit
Modified: commons/proper/email/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/commons/proper/email/trunk/src/changes/changes.xml?rev=1728012&r1=1728011&r2=1728012&view=diff
==
--- commons/proper/email/trunk/src/changes/changes.xml (original)
+++ commons/proper/email/trunk/src/changes/changes.xml Mon Feb 1 21:35:08 2016
@@ -23,6 +23,9 @@
+
+Remove "javax.activation" dependency since it is included in JDK 1.6
and update to javax.mail-1.5.5
+
Add Support for International Domain Names.
Modified:
commons/proper/email/trunk/src/test/java/org/apache/commons/mail/InvalidInternetAddressTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/email/trunk/src/test/java/org/apache/commons/mail/InvalidInternetAddressTest.java?rev=1728012&r1=1728011&r2=1728012&view=diff
==
---
commons/proper/email/trunk/src/test/java/org/apache/commons/mail/InvalidInternetAddressTest.java
(original)
+++
commons/proper/email/trunk/src/test/java/org/apache/commons/mail/InvalidInternetAddressTest.java
Mon Feb 1 21:35:08 2016
@@ -66,7 +66,7 @@ public class InvalidInternetAddressTest
"local.name@domain,com",
"local.name@domain;com",
"local.name@domain:com",
-"local.name@domain[com",
+// "local.name@domain[com", -- works for javamail-1.5.5
"local.name@domain]com",
"local.name@domain\\com",
"local.name@domain\tcom",
@@ -222,13 +222,11 @@ public class InvalidInternetAddressTest
}
catch (final Exception ex)
{
-
if (quoted || domainBracket)
{
fail("Validate " + i + " failed: " + ARR_INVALID_EMAILS[i]
+ " - " + ex.getMessage());
}
-
}
}
svn commit: r1728011 - in /commons/proper/email/trunk: ./ src/changes/ src/main/java/org/apache/commons/mail/ src/main/java/org/apache/commons/mail/util/ src/test/java/org/apache/commons/mail/ src/tes
Author: sgoeschl
Date: Mon Feb 1 21:25:23 2016
New Revision: 1728011
URL: http://svn.apache.org/viewvc?rev=1728011&view=rev
Log:
[EMAIL-160] Add Support for International Domain Names
Added:
commons/proper/email/trunk/.gitignore
commons/proper/email/trunk/src/main/java/org/apache/commons/mail/util/IDNEmailAddressConverter.java
commons/proper/email/trunk/src/test/java/org/apache/commons/mail/util/IDNEmailAddressConverterTest.java
Modified:
commons/proper/email/trunk/pom.xml
commons/proper/email/trunk/src/changes/changes.xml
commons/proper/email/trunk/src/main/java/org/apache/commons/mail/Email.java
commons/proper/email/trunk/src/test/java/org/apache/commons/mail/EmailTest.java
Added: commons/proper/email/trunk/.gitignore
URL:
http://svn.apache.org/viewvc/commons/proper/email/trunk/.gitignore?rev=1728011&view=auto
==
--- commons/proper/email/trunk/.gitignore (added)
+++ commons/proper/email/trunk/.gitignore Mon Feb 1 21:25:23 2016
@@ -0,0 +1,10 @@
+.DS_Store
+*.iml
+*.iws
+*.ipr
+target
+.swp
+.idea
+.classpath
+.project
+.settings
Modified: commons/proper/email/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/email/trunk/pom.xml?rev=1728011&r1=1728010&r2=1728011&view=diff
==
--- commons/proper/email/trunk/pom.xml (original)
+++ commons/proper/email/trunk/pom.xml Mon Feb 1 21:25:23 2016
@@ -292,8 +292,8 @@
UTF-8
UTF-8
-1.5
-1.5
+1.6
+1.6
email
EMAIL
12310474
Modified: commons/proper/email/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/commons/proper/email/trunk/src/changes/changes.xml?rev=1728011&r1=1728010&r2=1728011&view=diff
==
--- commons/proper/email/trunk/src/changes/changes.xml (original)
+++ commons/proper/email/trunk/src/changes/changes.xml Mon Feb 1 21:25:23 2016
@@ -22,7 +22,10 @@
-
+
+
+Add Support for International Domain Names.
+
Add Email#getHeader(String) and Email#getHeaders() methods.
Modified:
commons/proper/email/trunk/src/main/java/org/apache/commons/mail/Email.java
URL:
http://svn.apache.org/viewvc/commons/proper/email/trunk/src/main/java/org/apache/commons/mail/Email.java?rev=1728011&r1=1728010&r2=1728011&view=diff
==
--- commons/proper/email/trunk/src/main/java/org/apache/commons/mail/Email.java
(original)
+++ commons/proper/email/trunk/src/main/java/org/apache/commons/mail/Email.java
Mon Feb 1 21:25:23 2016
@@ -41,6 +41,8 @@ import javax.naming.Context;
import javax.naming.InitialContext;
import javax.naming.NamingException;
+import org.apache.commons.mail.util.IDNEmailAddressConverter;
+
/**
* The base class for all email messages. This class sets the
* sender's email & name, receiver's email & name, subject, and the
@@ -1913,7 +1915,7 @@ public abstract class Email
try
{
-address = new InternetAddress(email);
+address = new InternetAddress(new
IDNEmailAddressConverter().toASCII(email));
// check name input
if (EmailUtils.isNotEmpty(name))
Added:
commons/proper/email/trunk/src/main/java/org/apache/commons/mail/util/IDNEmailAddressConverter.java
URL:
http://svn.apache.org/viewvc/commons/proper/email/trunk/src/main/java/org/apache/commons/mail/util/IDNEmailAddressConverter.java?rev=1728011&view=auto
==
---
commons/proper/email/trunk/src/main/java/org/apache/commons/mail/util/IDNEmailAddressConverter.java
(added)
+++
commons/proper/email/trunk/src/main/java/org/apache/commons/mail/util/IDNEmailAddressConverter.java
Mon Feb 1 21:25:23 2016
@@ -0,0 +1,117 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.commons.mail.util;
+
+import javax.mai
svn commit: r1724101 - in /commons/proper/exec/trunk/src: changes/changes.xml main/java/org/apache/commons/exec/OS.java
Author: sgoeschl
Date: Mon Jan 11 17:59:34 2016
New Revision: 1724101
URL: http://svn.apache.org/viewvc?rev=1724101&view=rev
Log:
[EXEC-100] Sync org.apache.commons.exec.OS with the newest Ant source file
Modified:
commons/proper/exec/trunk/src/changes/changes.xml
commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/OS.java
Modified: commons/proper/exec/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/commons/proper/exec/trunk/src/changes/changes.xml?rev=1724101&r1=1724100&r2=1724101&view=diff
==
--- commons/proper/exec/trunk/src/changes/changes.xml (original)
+++ commons/proper/exec/trunk/src/changes/changes.xml Mon Jan 11 17:59:34 2016
@@ -24,6 +24,9 @@
+
+Sync org.apache.commons.exec.OS with the newest Ant source file
+
DefaultExecutor swallows IOException cause instead of
propagating it
(work-round for Java 1.5)
Modified:
commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/OS.java
URL:
http://svn.apache.org/viewvc/commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/OS.java?rev=1724101&r1=1724100&r2=1724101&view=diff
==
--- commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/OS.java
(original)
+++ commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/OS.java Mon
Jan 11 17:59:34 2016
@@ -1,21 +1,19 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * http://www.apache.org/licenses/LICENSE-2.0
*
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
-
package org.apache.commons.exec;
import java.util.Locale;
@@ -23,40 +21,65 @@ import java.util.Locale;
/**
* Condition that tests the OS type.
*
+ * Copied and adapted from Apache Ant 1.9.6 from
org.apache.tools.ant.taskdefs.condition.OS.
* @version $Id$
*/
public final class OS {
-private static final String FAMILY_OS_400 = "os/400";
-
-private static final String FAMILY_Z_OS = "z/os";
-
-private static final String FAMILY_WIN9X = "win9x";
-
-private static final String FAMILY_OPENVMS = "openvms";
-
-private static final String FAMILY_UNIX = "unix";
-
-private static final String FAMILY_TANDEM = "tandem";
-
-private static final String FAMILY_MAC = "mac";
-
-private static final String FAMILY_DOS = "dos";
-
-private static final String FAMILY_NETWARE = "netware";
-private static final String FAMILY_OS_2 = "os/2";
-
-private static final String FAMILY_WINDOWS = "windows";
-
-private static final String OS_NAME = System.getProperty("os.name")
-.toLowerCase(Locale.US);
-
-private static final String OS_ARCH = System.getProperty("os.arch")
-.toLowerCase(Locale.US);
+/**
+ * OS family that can be tested for. {@value}
+ */
+public static final String FAMILY_9X = "win9x";
+/**
+ * OS family that can be tested for. {@value}
+ */
+public static final String FAMILY_DOS = "dos";
+/**
+ * OS family that can be tested for. {@value}
+ */
+public static final String FAMILY_MAC = "mac";
+/**
+ * OS family that can be tested for. {@value}
+ */
+public
svn commit: r1724100 - /commons/proper/exec/trunk/conf/checkstyle.xml
Author: sgoeschl Date: Mon Jan 11 17:58:41 2016 New Revision: 1724100 URL: http://svn.apache.org/viewvc?rev=1724100&view=rev Log: [EXEC-98] Update checkstyle.xml to match codeing style used for commons-exec Modified: commons/proper/exec/trunk/conf/checkstyle.xml Modified: commons/proper/exec/trunk/conf/checkstyle.xml URL: http://svn.apache.org/viewvc/commons/proper/exec/trunk/conf/checkstyle.xml?rev=1724100&r1=1724099&r2=1724100&view=diff == --- commons/proper/exec/trunk/conf/checkstyle.xml (original) +++ commons/proper/exec/trunk/conf/checkstyle.xml Mon Jan 11 17:58:41 2016 @@ -126,11 +126,11 @@ - + - +
svn commit: r1724088 - /commons/proper/exec/trunk/.gitignore
Author: sgoeschl Date: Mon Jan 11 17:15:02 2016 New Revision: 1724088 URL: http://svn.apache.org/viewvc?rev=1724088&view=rev Log: Adding '.gitignore' file Added: commons/proper/exec/trunk/.gitignore Added: commons/proper/exec/trunk/.gitignore URL: http://svn.apache.org/viewvc/commons/proper/exec/trunk/.gitignore?rev=1724088&view=auto == --- commons/proper/exec/trunk/.gitignore (added) +++ commons/proper/exec/trunk/.gitignore Mon Jan 11 17:15:02 2016 @@ -0,0 +1,10 @@ +.DS_Store +*.iml +*.iws +*.ipr +target +.swp +.idea +.classpath +.project +.settings \ No newline at end of file
svn commit: r1723817 - /commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/issues/Exec57Test.java
Author: sgoeschl
Date: Fri Jan 8 23:40:25 2016
New Revision: 1723817
URL: http://svn.apache.org/viewvc?rev=1723817&view=rev
Log:
[EXEC-86] Disable "testExecutionOfBackgroundProcess" for Unix as well
Modified:
commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/issues/Exec57Test.java
Modified:
commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/issues/Exec57Test.java
URL:
http://svn.apache.org/viewvc/commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/issues/Exec57Test.java?rev=1723817&r1=1723816&r2=1723817&view=diff
==
---
commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/issues/Exec57Test.java
(original)
+++
commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/issues/Exec57Test.java
Fri Jan 8 23:40:25 2016
@@ -23,6 +23,7 @@ import org.apache.commons.exec.CommandLi
import org.apache.commons.exec.DefaultExecutor;
import org.apache.commons.exec.OS;
import org.apache.commons.exec.PumpStreamHandler;
+import org.junit.Ignore;
import org.junit.Test;
import java.io.IOException;
@@ -42,21 +43,12 @@ public class Exec57Test extends Abstract
* an ExecuteException is thrown to notify the caller. But this case the
threads are still
* around causing a resource leak.
*
- * @TODO [EXEC-57] Broken for Mac OS X
+ * @TODO [EXEC-57] Broken for Mac OS X & Linux
*/
+@Ignore("Broken for Unix-based systems")
@Test(timeout = TEST_TIMEOUT)
public void testExecutionOfBackgroundProcess() throws IOException {
-if (OS.isFamilyMac()) {
-testIsBrokenForCurrentOperatingSystem();
-return;
-}
-
-if (!OS.isFamilyUnix()) {
-testNotSupportedForCurrentOperatingSystem();
-return;
-}
-
final CommandLine cmdLine = new
CommandLine("sh").addArgument("-c").addArgument("./src/test/scripts/issues/exec-57-nohup.sh",
false);
final DefaultExecutor executor = new DefaultExecutor();
final PumpStreamHandler pumpStreamHandler = new
PumpStreamHandler(System.out, System.err);
svn commit: r1723816 - /commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/issues/Exec65Test.java
Author: sgoeschl
Date: Fri Jan 8 23:36:41 2016
New Revision: 1723816
URL: http://svn.apache.org/viewvc?rev=1723816&view=rev
Log:
[EXEC-65] Fix faulty OS check which skips the test on Linux
Modified:
commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/issues/Exec65Test.java
Modified:
commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/issues/Exec65Test.java
URL:
http://svn.apache.org/viewvc/commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/issues/Exec65Test.java?rev=1723816&r1=1723815&r2=1723816&view=diff
==
---
commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/issues/Exec65Test.java
(original)
+++
commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/issues/Exec65Test.java
Fri Jan 8 23:36:41 2016
@@ -38,7 +38,7 @@ public class Exec65Test extends Abstract
@Test(expected = ExecuteException.class, timeout = TEST_TIMEOUT)
public void testExec65WitSleepUsingSleepCommandDirectly() throws Exception
{
-if (OS.isFamilyUnix() && OS.isFamilyMac()) {
+if (OS.isFamilyUnix()) {
final ExecuteWatchdog watchdog = new
ExecuteWatchdog(WATCHDOG_TIMEOUT);
final DefaultExecutor executor = new DefaultExecutor();
final CommandLine command = new CommandLine("sleep");
@@ -103,7 +103,7 @@ public class Exec65Test extends Abstract
@Test(expected = ExecuteException.class, timeout = TEST_TIMEOUT)
public void testExec65WithSudoUsingShellScript() throws Exception {
-if (OS.isFamilyUnix() && OS.isFamilyMac()) {
+if (OS.isFamilyUnix()) {
final DefaultExecutor executor = new DefaultExecutor();
executor.setStreamHandler(new PumpStreamHandler(System.out,
System.err, System.in));
executor.setWatchdog(new ExecuteWatchdog(WATCHDOG_TIMEOUT));
svn commit: r1723815 - in /commons/proper/exec/trunk/src: main/java/org/apache/commons/exec/ test/java/org/apache/commons/exec/ test/java/org/apache/commons/exec/issues/ test/scripts/ test/scripts/iss
Author: sgoeschl
Date: Fri Jan 8 23:29:56 2016
New Revision: 1723815
URL: http://svn.apache.org/viewvc?rev=1723815&view=rev
Log:
[EXEC-86] Clean up the tests and disable execution of broken tests on Mac OS X
Added:
commons/proper/exec/trunk/src/test/scripts/issues/exec-57-detached.sh
(with props)
commons/proper/exec/trunk/src/test/scripts/issues/exec-57-nohup.sh
- copied, changed from r1723805,
commons/proper/exec/trunk/src/test/scripts/invoker.sh
Removed:
commons/proper/exec/trunk/src/test/scripts/invoker.sh
Modified:
commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/PumpStreamHandler.java
commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/AbstractExecTest.java
commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/issues/Exec57Test.java
Modified:
commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/PumpStreamHandler.java
URL:
http://svn.apache.org/viewvc/commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/PumpStreamHandler.java?rev=1723815&r1=1723814&r2=1723815&view=diff
==
---
commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/PumpStreamHandler.java
(original)
+++
commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/PumpStreamHandler.java
Fri Jan 8 23:29:56 2016
@@ -18,13 +18,13 @@
package org.apache.commons.exec;
+import org.apache.commons.exec.util.DebugUtils;
+
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.PipedOutputStream;
-import org.apache.commons.exec.util.DebugUtils;
-
/**
* Copies standard output and error of sub-processes to standard output and
error
* of the parent process. If output or error stream are set to null, any
feedback
@@ -290,7 +290,7 @@ public class PumpStreamHandler implement
final long timeToWait = timeout + STOP_TIMEOUT_ADDITION;
final long startTime = System.currentTimeMillis();
thread.join(timeToWait);
-if (!(System.currentTimeMillis() < startTime +
timeToWait)) {
+if (System.currentTimeMillis() > startTime + timeToWait) {
final String msg = "The stop timeout of " + timeout +
" ms was exceeded";
caught = new ExecuteException(msg,
Executor.INVALID_EXITVALUE);
}
Modified:
commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/AbstractExecTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/AbstractExecTest.java?rev=1723815&r1=1723814&r2=1723815&view=diff
==
---
commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/AbstractExecTest.java
(original)
+++
commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/AbstractExecTest.java
Fri Jan 8 23:29:56 2016
@@ -38,13 +38,23 @@ public abstract class AbstractExecTest {
return result;
}
+/**
+ * Get the name of the currently executed test.
+ */
protected String getName() {
return name.getMethodName();
}
protected String testNotSupportedForCurrentOperatingSystem() {
-final String msg = String.format("The test '%s' does not support the
following OS : %s", name.getMethodName(), OS_NAME);
+final String msg = String.format("The test '%s' is not possible for OS
: %s", name.getMethodName(), OS_NAME);
System.out.println(msg);
return msg;
}
+
+protected String testIsBrokenForCurrentOperatingSystem() {
+final String msg = String.format("The test '%s' is broken for OS :
%s", name.getMethodName(), OS_NAME);
+System.err.println(msg);
+return msg;
+}
+
}
Modified:
commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/issues/Exec57Test.java
URL:
http://svn.apache.org/viewvc/commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/issues/Exec57Test.java?rev=1723815&r1=1723814&r2=1723815&view=diff
==
---
commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/issues/Exec57Test.java
(original)
+++
commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/issues/Exec57Test.java
Fri Jan 8 23:29:56 2016
@@ -17,68 +17,74 @@
package org.apache.commons.exec.issues;
-import static org.junit.Assert.fail;
-
-import java.io.File;
-import java.io.IOException;
+import org.apache.commons.exec.AbstractExecTest;
import org.apache.commons.exec.CommandLine;
import org.apache.commons.exec.DefaultExecutor;
-import org.apache.commons.exec.ExecuteException;
import org.apache.commons.exec
svn commit: r1723808 - /commons/proper/exec/trunk/pom.xml
Author: sgoeschl
Date: Fri Jan 8 22:12:12 2016
New Revision: 1723808
URL: http://svn.apache.org/viewvc?rev=1723808&view=rev
Log:
[EXEC-98] Fix formatting issues in pom.xml
Modified:
commons/proper/exec/trunk/pom.xml
Modified: commons/proper/exec/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/exec/trunk/pom.xml?rev=1723808&r1=1723807&r2=1723808&view=diff
==
--- commons/proper/exec/trunk/pom.xml (original)
+++ commons/proper/exec/trunk/pom.xml Fri Jan 8 22:12:12 2016
@@ -26,25 +26,25 @@
org.apache.commons
commons-exec
1.4.0-SNAPSHOT
-
+
2005
Apache Commons Exec is a library to reliably execute external
processes from within the JVM.
http://commons.apache.org/proper/commons-exec/
-
+
jira
http://issues.apache.org/jira/browse/EXEC
-
+
scm:svn:http://svn.apache.org/repos/asf/commons/proper/exec/trunk
scm:svn:https://svn.apache.org/repos/asf/commons/proper/exec/trunk
http://svn.apache.org/viewvc/commons/proper/exec/trunk
-
+
brett
@@ -77,7 +77,7 @@
ggreg...@apache.org
http://www.garygregory.com
-5
-
+
@@ -102,7 +102,7 @@
Niall Pemberton
-
+
junit
@@ -111,7 +111,7 @@
test
-
+
@@ -152,26 +152,26 @@
forked-path
-
-org.apache.maven.plugins
-maven-scm-publish-plugin
-
-
-javadocs
-
-
-
+
+org.apache.maven.plugins
+maven-scm-publish-plugin
+
+
+javadocs
+
+
+
-
-apache.website
-Apache Website
-
${commons.deployment.protocol}://people.apache.org/www/commons.apache.org/exec/
-
+
+apache.website
+Apache Website
+
${commons.deployment.protocol}://people.apache.org/www/commons.apache.org/exec/
+
-
+
@@ -188,7 +188,7 @@
-
+
org.apache.maven.plugins
maven-checkstyle-plugin
@@ -199,13 +199,13 @@
${basedir}/conf/HEADER.txt
-
- org.apache.maven.plugins
- maven-pmd-plugin
+
+org.apache.maven.plugins
+maven-pmd-plugin
2.7.1
-
-${maven.compiler.target}
-
+
+${maven.compiler.target}
+
org.codehaus.mojo
@@ -229,35 +229,37 @@
src/test/resources/eml/*.eml
-
+
-
+
rc
apache.website
Apache Commons Release Candidate Staging Site
-
${commons.deployment.protocol}://people.apache.org/www/people.apache.org/builds/commons/${commons.componentid}/${commons.release.version}/${commons.rc.version}/site
+
+
${commons.deployment.protocol}://people.apache.org/www/people.apache.org/builds/commons/${commons.componentid}/${commons.release.version}/${commons.rc.version}/site
+
-
-
-
- test_java_8
+
+
+test_java_8
- 1.8
+1.8
3.0.0
-
+
+
1.5
svn commit: r1723807 - in /commons/proper/exec/trunk: ./ conf/ src/assembly/ src/main/assembly/ src/test/bin/
Author: sgoeschl Date: Fri Jan 8 22:10:09 2016 New Revision: 1723807 URL: http://svn.apache.org/viewvc?rev=1723807&view=rev Log: [EXEC-98] Fix broken site build and sync the pom and directory layout with commons-email Added: commons/proper/exec/trunk/conf/ commons/proper/exec/trunk/conf/HEADER.txt commons/proper/exec/trunk/conf/checkstyle.xml commons/proper/exec/trunk/conf/findbugs-exclude-filter.xml commons/proper/exec/trunk/src/assembly/ commons/proper/exec/trunk/src/assembly/bin.xml commons/proper/exec/trunk/src/assembly/src.xml Removed: commons/proper/exec/trunk/STATUS commons/proper/exec/trunk/findbugs-exclude-filter.xml commons/proper/exec/trunk/src/main/assembly/ Modified: commons/proper/exec/trunk/build.xml commons/proper/exec/trunk/pom.xml commons/proper/exec/trunk/src/test/bin/testme.bat Modified: commons/proper/exec/trunk/build.xml URL: http://svn.apache.org/viewvc/commons/proper/exec/trunk/build.xml?rev=1723807&r1=1723806&r2=1723807&view=diff == --- commons/proper/exec/trunk/build.xml (original) +++ commons/proper/exec/trunk/build.xml Fri Jan 8 22:10:09 2016 @@ -23,7 +23,7 @@ - + @@ -33,8 +33,8 @@ - - + + Added: commons/proper/exec/trunk/conf/HEADER.txt URL: http://svn.apache.org/viewvc/commons/proper/exec/trunk/conf/HEADER.txt?rev=1723807&view=auto == --- commons/proper/exec/trunk/conf/HEADER.txt (added) +++ commons/proper/exec/trunk/conf/HEADER.txt Fri Jan 8 22:10:09 2016 @@ -0,0 +1,16 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ Added: commons/proper/exec/trunk/conf/checkstyle.xml URL: http://svn.apache.org/viewvc/commons/proper/exec/trunk/conf/checkstyle.xml?rev=1723807&view=auto == --- commons/proper/exec/trunk/conf/checkstyle.xml (added) +++ commons/proper/exec/trunk/conf/checkstyle.xml Fri Jan 8 22:10:09 2016 @@ -0,0 +1,179 @@ + + +http://www.puppycrawl.com/dtds/configuration_1_1.dtd";> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Added: commons/proper/exec/trunk/conf/findbugs-exclude-filter.xml URL: http://svn.apache.org/viewvc/commons/proper/exec/trunk/conf/findbugs-exclude-filter.xml?rev=1723807&view=auto == --- commons/proper/exec/trunk/conf/findbugs-exclude-filter.xml (added) +++ commons/proper/exec/trunk/conf/findbugs-exclude-filter.xml Fri Jan 8 22:10:09 2016 @@ -0,0 +1,26 @@ + + + + + + + Modified: commons/proper/exec/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/exec/trunk/pom.xml?rev=1723807&r1=1723806&r2=1723807&view=diff == --- commons/proper
svn commit: r1723799 - /commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/issues/Exec60Test.java
Author: sgoeschl
Date: Fri Jan 8 21:17:50 2016
New Revision: 1723799
URL: http://svn.apache.org/viewvc?rev=1723799&view=rev
Log:
[EXEC-61] Test failure of trunk on WinXP: DefaultExecutorTest - disabling the
fragile test
Modified:
commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/issues/Exec60Test.java
Modified:
commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/issues/Exec60Test.java
URL:
http://svn.apache.org/viewvc/commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/issues/Exec60Test.java?rev=1723799&r1=1723798&r2=1723799&view=diff
==
---
commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/issues/Exec60Test.java
(original)
+++
commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/issues/Exec60Test.java
Fri Jan 8 21:17:50 2016
@@ -17,33 +17,34 @@
package org.apache.commons.exec.issues;
-import static org.junit.Assert.assertTrue;
-
-import java.io.File;
-
+import org.apache.commons.exec.AbstractExecTest;
import org.apache.commons.exec.CommandLine;
import org.apache.commons.exec.DefaultExecutor;
import org.apache.commons.exec.ExecuteException;
import org.apache.commons.exec.ExecuteWatchdog;
import org.apache.commons.exec.Executor;
-import org.apache.commons.exec.TestUtil;
+import org.junit.Ignore;
import org.junit.Test;
+import java.io.File;
+
+import static org.junit.Assert.assertTrue;
+
/**
* Test EXEC-60 (https://issues.apache.org/jira/browse/EXEC-60).
*
* @version $Id$
*/
-public class Exec60Test {
+public class Exec60Test extends AbstractExecTest {
private final Executor exec = new DefaultExecutor();
-private final File testDir = new File("src/test/scripts");
-private final File pingScript = TestUtil.resolveScriptForOS(testDir +
"/ping");
+private final File pingScript = resolveTestScript("ping");
/**
* Possible deadlock when a process is terminating at the same time its
timing out. Please
* note that a successful test is no proof that the issues was indeed
fixed.
*/
+@Ignore("The test is fragile and might fail out of the blue")
@Test
public void testExec_60() throws Exception {
@@ -67,19 +68,19 @@ public class Exec60Test {
try {
exec.execute(cmdLine);
processTerminatedCounter++;
-//System.out.println(offset + ": process has terminated: " +
watchdog.killedProcess());
+//System.out.println(offset + ": process has
terminated: " + watchdog.killedProcess());
if (processTerminatedCounter > 5) {
break;
}
} catch (final ExecuteException ex) {
-//System.out.println(offset + ": process was killed: " +
watchdog.killedProcess());
+//System.out.println(offset + ": process was
killed: " + watchdog.killedProcess());
assertTrue("Watchdog killed the process",
watchdog.killedProcess());
watchdogKilledProcessCounter++;
}
}
final long avg = (System.currentTimeMillis() - startTime) /
-(watchdogKilledProcessCounter+processTerminatedCounter);
+(watchdogKilledProcessCounter + processTerminatedCounter);
System.out.println("Processes terminated: " + processTerminatedCounter
+ " killed: " + watchdogKilledProcessCounter
+ " Multiplier: " + offsetMultiplier + " MaxRetries: " +
maxRetries + " Elapsed (avg ms): " + avg);
assertTrue("Not a single process terminated on its own",
processTerminatedCounter > 0);
svn commit: r1723798 - /commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/AbstractExecTest.java
Author: sgoeschl
Date: Fri Jan 8 21:16:44 2016
New Revision: 1723798
URL: http://svn.apache.org/viewvc?rev=1723798&view=rev
Log:
[EXEC-65] Works now under Mac OS 10.11.2 and Windows 10
Added:
commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/AbstractExecTest.java
Added:
commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/AbstractExecTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/AbstractExecTest.java?rev=1723798&view=auto
==
---
commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/AbstractExecTest.java
(added)
+++
commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/AbstractExecTest.java
Fri Jan 8 21:16:44 2016
@@ -0,0 +1,50 @@
+package org.apache.commons.exec;
+
+import org.junit.Rule;
+import org.junit.rules.TestName;
+
+import java.io.File;
+
+public abstract class AbstractExecTest {
+
+public static final int TEST_TIMEOUT = 15000;
+public static final int WATCHDOG_TIMEOUT = 3000;
+
+private static final String OS_NAME = System.getProperty("os.name");
+
+private final File testDir = new File("src/test/scripts");
+
+@Rule public TestName name = new TestName();
+
+/**
+ * Resolve the OS-specific test file to execute.
+ */
+protected File resolveTestScript(String baseName) {
+final File result = TestUtil.resolveScriptForOS(testDir + "/" +
baseName);
+if (!result.exists()) {
+throw new IllegalArgumentException("Unable to find the following
file: " + result.getAbsolutePath());
+}
+return result;
+}
+
+/**
+ * Resolve the OS-specific test file to execute.
+ */
+protected File resolveTestScript(String directoryName, String baseName) {
+final File result = TestUtil.resolveScriptForOS(testDir + "/" +
directoryName + "/" + baseName);
+if (!result.exists()) {
+throw new IllegalArgumentException("Unable to find the following
file: " + result.getAbsolutePath());
+}
+return result;
+}
+
+protected String getName() {
+return name.getMethodName();
+}
+
+protected String testNotSupportedForCurrentOperatingSystem() {
+final String msg = String.format("The test '%s' does not support the
following OS : %s", name.getMethodName(), OS_NAME);
+System.out.println(msg);
+return msg;
+}
+}
svn commit: r1723796 - in /commons/proper/exec/trunk/src/test: java/org/apache/commons/exec/issues/Exec65Test.java scripts/sleep.bat
Author: sgoeschl
Date: Fri Jan 8 21:12:32 2016
New Revision: 1723796
URL: http://svn.apache.org/viewvc?rev=1723796&view=rev
Log:
[EXEC-65] Works now under Mac OS 10.11.2 and Windows 10
Modified:
commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/issues/Exec65Test.java
commons/proper/exec/trunk/src/test/scripts/sleep.bat
Modified:
commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/issues/Exec65Test.java
URL:
http://svn.apache.org/viewvc/commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/issues/Exec65Test.java?rev=1723796&r1=1723795&r2=1723796&view=diff
==
---
commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/issues/Exec65Test.java
(original)
+++
commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/issues/Exec65Test.java
Fri Jan 8 21:12:32 2016
@@ -17,18 +17,14 @@
package org.apache.commons.exec.issues;
+import org.apache.commons.exec.AbstractExecTest;
import org.apache.commons.exec.CommandLine;
import org.apache.commons.exec.DefaultExecutor;
import org.apache.commons.exec.ExecuteException;
import org.apache.commons.exec.ExecuteWatchdog;
import org.apache.commons.exec.OS;
import org.apache.commons.exec.PumpStreamHandler;
-import org.apache.commons.exec.TestUtil;
-import org.junit.Rule;
import org.junit.Test;
-import org.junit.rules.TestName;
-
-import java.io.File;
import static org.junit.Assert.assertTrue;
@@ -37,20 +33,12 @@ import static org.junit.Assert.assertTru
*
* @see https://issues.apache.org/jira/browse/EXEC-65";>EXEC-65
*/
-public class Exec65Test {
-
-private static final int TEST_TIMEOUT = 15000;
-private static final int WATCHDOG_TIMEOUT = 3000;
-private static final String OS_NAME = System.getProperty("os.name");
-
-private final File testDir = new File("src/test/scripts");
-
-@Rule public TestName name = new TestName();
+public class Exec65Test extends AbstractExecTest {
@Test(expected = ExecuteException.class, timeout = TEST_TIMEOUT)
public void testExec65WitSleepUsingSleepCommandDirectly() throws Exception
{
-if (OS.isFamilyUnix()) {
+if (OS.isFamilyUnix() && OS.isFamilyMac()) {
final ExecuteWatchdog watchdog = new
ExecuteWatchdog(WATCHDOG_TIMEOUT);
final DefaultExecutor executor = new DefaultExecutor();
final CommandLine command = new CommandLine("sleep");
@@ -60,21 +48,32 @@ public class Exec65Test {
executor.execute(command);
} else {
-String msg = String.format("The test '%s' does not support the
following OS : %s", name.getMethodName(), OS_NAME);
-System.out.println(msg);
-throw new ExecuteException(msg, 0);
+throw new
ExecuteException(testNotSupportedForCurrentOperatingSystem(), 0);
}
}
+/**
+ * This test currently only works for Mac OS X
+ *
+ * Linux hangs on the process stream while the process is finished
+ * Windows seems to have similar problems
+ *
+ *
+ * @TODO Fix tests for Windows & Linux
+ */
@Test(expected = ExecuteException.class, timeout = TEST_TIMEOUT)
public void testExec65WithSleepUsingShellScript() throws Exception {
-final DefaultExecutor executor = new DefaultExecutor();
-executor.setStreamHandler(new PumpStreamHandler(System.out,
System.err));
-executor.setWatchdog(new ExecuteWatchdog(WATCHDOG_TIMEOUT));
-final CommandLine command = new
CommandLine(TestUtil.resolveScriptForOS(testDir + "/sleep"));
+if (OS.isFamilyMac()) {
+final DefaultExecutor executor = new DefaultExecutor();
+executor.setStreamHandler(new PumpStreamHandler(System.out,
System.err));
+executor.setWatchdog(new ExecuteWatchdog(WATCHDOG_TIMEOUT));
+final CommandLine command = new
CommandLine(resolveTestScript("sleep"));
-executor.execute(command);
+executor.execute(command);
+} else {
+throw new
ExecuteException(testNotSupportedForCurrentOperatingSystem(), 0);
+}
}
/**
@@ -85,7 +84,7 @@ public class Exec65Test {
@Test(timeout = TEST_TIMEOUT)
public void testExec65WithSleepUsingShellScriptAndJDKOnly() throws
Exception {
-Process process =
Runtime.getRuntime().exec(TestUtil.resolveScriptForOS(testDir +
"/sleep").getAbsolutePath());
+Process process =
Runtime.getRuntime().exec(resolveTestScript("sleep").getAbsolutePath());
Thread.sleep(WATCHDOG_TIMEOUT);
process.destroy();
@@ -104,17 +103,15 @@ public class Exec65Test {
@Test(expected = ExecuteException.class, timeout = TEST_TIMEOUT)
public void testExec65WithSudoUsingShellScript() throws Exception {
-
svn commit: r1723790 - /commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/issues/Exec65Test.java
Author: sgoeschl
Date: Fri Jan 8 20:21:33 2016
New Revision: 1723790
URL: http://svn.apache.org/viewvc?rev=1723790&view=rev
Log:
[EXEC-65] Fixing test execution for Windows platform
Modified:
commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/issues/Exec65Test.java
Modified:
commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/issues/Exec65Test.java
URL:
http://svn.apache.org/viewvc/commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/issues/Exec65Test.java?rev=1723790&r1=1723789&r2=1723790&view=diff
==
---
commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/issues/Exec65Test.java
(original)
+++
commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/issues/Exec65Test.java
Fri Jan 8 20:21:33 2016
@@ -24,8 +24,9 @@ import org.apache.commons.exec.ExecuteWa
import org.apache.commons.exec.OS;
import org.apache.commons.exec.PumpStreamHandler;
import org.apache.commons.exec.TestUtil;
-import org.junit.Ignore;
+import org.junit.Rule;
import org.junit.Test;
+import org.junit.rules.TestName;
import java.io.File;
@@ -38,67 +39,82 @@ import static org.junit.Assert.assertTru
*/
public class Exec65Test {
-private static final int TIMEOUT = 3000;
+private static final int TEST_TIMEOUT = 15000;
+private static final int WATCHDOG_TIMEOUT = 3000;
+private static final String OS_NAME = System.getProperty("os.name");
+
private final File testDir = new File("src/test/scripts");
-@Test(expected = ExecuteException.class, timeout = 15000)
-public void testExec65WitSleepUsingCommandLine() throws Exception
-{
-if(OS.isFamilyUnix())
-{
+@Rule public TestName name = new TestName();
+
+@Test(expected = ExecuteException.class, timeout = TEST_TIMEOUT)
+public void testExec65WitSleepUsingSleepCommandDirectly() throws Exception
{
+
+if (OS.isFamilyUnix()) {
+final ExecuteWatchdog watchdog = new
ExecuteWatchdog(WATCHDOG_TIMEOUT);
final DefaultExecutor executor = new DefaultExecutor();
-executor.setStreamHandler(new PumpStreamHandler(System.out,
System.err));
-final ExecuteWatchdog watchdog = new ExecuteWatchdog(TIMEOUT);
-executor.setWatchdog(watchdog);
final CommandLine command = new CommandLine("sleep");
command.addArgument("60");
+executor.setStreamHandler(new PumpStreamHandler(System.out,
System.err));
+executor.setWatchdog(watchdog);
executor.execute(command);
+} else {
+String msg = String.format("The test '%s' does not support the
following OS : %s", name.getMethodName(), OS_NAME);
+System.out.println(msg);
+throw new ExecuteException(msg, 0);
}
}
-@Test(expected = ExecuteException.class, timeout = 15000)
-public void testExec65WithSleepUsingShellScript() throws Exception
-{
+@Test(expected = ExecuteException.class, timeout = TEST_TIMEOUT)
+public void testExec65WithSleepUsingShellScript() throws Exception {
+
final DefaultExecutor executor = new DefaultExecutor();
executor.setStreamHandler(new PumpStreamHandler(System.out,
System.err));
-final ExecuteWatchdog watchdog = new ExecuteWatchdog(TIMEOUT);
-executor.setWatchdog(watchdog);
+executor.setWatchdog(new ExecuteWatchdog(WATCHDOG_TIMEOUT));
final CommandLine command = new
CommandLine(TestUtil.resolveScriptForOS(testDir + "/sleep"));
executor.execute(command);
}
-@Ignore("This test does not work under Linux but nicely on Mac OS X")
-@Test(timeout = 15000)
-public void testExec65WithSleepUsingShellScriptAndRuntimeDirectly() throws
Exception
-{
+/**
+ * This is the original code snippet from the JIRA to show that
+ * killing the process actually works with JDK only but it does
+ * not re-direct any streams.
+ */
+@Test(timeout = TEST_TIMEOUT)
+public void testExec65WithSleepUsingShellScriptAndJDKOnly() throws
Exception {
+
Process process =
Runtime.getRuntime().exec(TestUtil.resolveScriptForOS(testDir +
"/sleep").getAbsolutePath());
-Thread.sleep(3000);
+Thread.sleep(WATCHDOG_TIMEOUT);
process.destroy();
-
-process.waitFor();
+while (process.isAlive()) {
+Thread.sleep(100);
+}
assertTrue(process.exitValue() != 0);
}
/**
* Please note that this tests make assumptions about the environment. It
assumes
- * that user "root" exists and that the current user is not a "sudoer"
already.
+ * that user "root" exists and that the current user is not a "sudoer"
already
+ * (thereby
svn commit: r1723348 - in /commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/issues: Exec62Test.java Exec65Test.java
Author: sgoeschl
Date: Wed Jan 6 15:23:28 2016
New Revision: 1723348
URL: http://svn.apache.org/viewvc?rev=1723348&view=rev
Log:
[EXEC-62] [EXEC-65] Disabling tests which are currently broken under Linux
(Ubuntu)
Modified:
commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/issues/Exec62Test.java
commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/issues/Exec65Test.java
Modified:
commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/issues/Exec62Test.java
URL:
http://svn.apache.org/viewvc/commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/issues/Exec62Test.java?rev=1723348&r1=1723347&r2=1723348&view=diff
==
---
commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/issues/Exec62Test.java
(original)
+++
commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/issues/Exec62Test.java
Wed Jan 6 15:23:28 2016
@@ -20,6 +20,7 @@ package org.apache.commons.exec.issues;
import org.apache.commons.exec.*;
import org.junit.After;
import org.junit.Before;
+import org.junit.Ignore;
import org.junit.Test;
import java.io.File;
@@ -43,6 +44,7 @@ public class Exec62Test
outputFile.delete();
}
+@Ignore("Test behaves differently between Mac OS X and Linux - don't know
why")
@Test (expected = TimeoutException.class, timeout = 1)
public void testMe() throws Exception {
if(OS.isFamilyUnix()) {
Modified:
commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/issues/Exec65Test.java
URL:
http://svn.apache.org/viewvc/commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/issues/Exec65Test.java?rev=1723348&r1=1723347&r2=1723348&view=diff
==
---
commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/issues/Exec65Test.java
(original)
+++
commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/issues/Exec65Test.java
Wed Jan 6 15:23:28 2016
@@ -18,6 +18,7 @@
package org.apache.commons.exec.issues;
import org.apache.commons.exec.*;
+import org.junit.Ignore;
import org.junit.Test;
import java.io.File;
@@ -62,6 +63,7 @@ public class Exec65Test {
executor.execute(command);
}
+@Ignore("This test does not work under Linux but nicely on Mac OS X")
@Test(timeout = 15000)
public void testExec65WithSleepUsingShellScriptAndRuntimeDirectly() throws
Exception
{
svn commit: r1723345 - in /commons/proper/exec/trunk/src/test: java/org/apache/commons/exec/issues/Exec62Test.java scripts/issues/exec-62.sh
Author: sgoeschl
Date: Wed Jan 6 15:12:26 2016
New Revision: 1723345
URL: http://svn.apache.org/viewvc?rev=1723345&view=rev
Log:
[EXEC-62] Add test case to ensure that we can indeed interrupt the process
Added:
commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/issues/Exec62Test.java
commons/proper/exec/trunk/src/test/scripts/issues/exec-62.sh
Added:
commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/issues/Exec62Test.java
URL:
http://svn.apache.org/viewvc/commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/issues/Exec62Test.java?rev=1723345&view=auto
==
---
commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/issues/Exec62Test.java
(added)
+++
commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/issues/Exec62Test.java
Wed Jan 6 15:12:26 2016
@@ -0,0 +1,75 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.commons.exec.issues;
+
+import org.apache.commons.exec.*;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.util.concurrent.TimeoutException;
+
+/**
+ * @see https://issues.apache.org/jira/browse/EXEC-62";>EXEC-62
+ */
+public class Exec62Test
+{
+private File outputFile;
+
+@Before
+public void setUp() throws Exception {
+outputFile = File.createTempFile("foo", ".log");
+}
+
+@After
+public void tearDown() throws Exception {
+outputFile.delete();
+}
+
+@Test (expected = TimeoutException.class, timeout = 1)
+public void testMe() throws Exception {
+if(OS.isFamilyUnix()) {
+execute ("exec-62");
+}
+}
+
+private void execute (String scriptName) throws Exception {
+ExecuteWatchdog watchdog = new ExecuteWatchdog(4000);
+CommandLine commandLine = new CommandLine("/bin/sh");
+File testScript =
TestUtil.resolveScriptForOS("./src/test/scripts/issues/" + scriptName);
+
+commandLine.addArgument(testScript.getAbsolutePath());
+
+DefaultExecutor executor = new DefaultExecutor();
+executor.setExitValues(null); // ignore exit values
+executor.setWatchdog(watchdog);
+
+FileOutputStream fos = new FileOutputStream(outputFile);
+PumpStreamHandler streamHandler = new PumpStreamHandler(fos);
+executor.setStreamHandler(streamHandler);
+executor.execute(commandLine);
+
+if (watchdog.killedProcess()) {
+throw new TimeoutException(String.format("Transcode process was
killed on timeout %1$s ms, command line %2$s", 4000, commandLine.toString()));
+}
+}
+}
+
+
Added: commons/proper/exec/trunk/src/test/scripts/issues/exec-62.sh
URL:
http://svn.apache.org/viewvc/commons/proper/exec/trunk/src/test/scripts/issues/exec-62.sh?rev=1723345&view=auto
==
--- commons/proper/exec/trunk/src/test/scripts/issues/exec-62.sh (added)
+++ commons/proper/exec/trunk/src/test/scripts/issues/exec-62.sh Wed Jan 6
15:12:26 2016
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+Echo simulate timeout
+cat /dev/urandom &
+cat /dev/urandom >&2 &
+sleep 15
\ No newline at end of file
svn commit: r1723311 - /commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/issues/Exec65Test.java
Author: sgoeschl
Date: Wed Jan 6 13:10:09 2016
New Revision: 1723311
URL: http://svn.apache.org/viewvc?rev=1723311&view=rev
Log:
[EXEC-65] Add test with plain vanilla "Runtime" usage to show that we can
indeed kill the sleeping process
Modified:
commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/issues/Exec65Test.java
Modified:
commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/issues/Exec65Test.java
URL:
http://svn.apache.org/viewvc/commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/issues/Exec65Test.java?rev=1723311&r1=1723310&r2=1723311&view=diff
==
---
commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/issues/Exec65Test.java
(original)
+++
commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/issues/Exec65Test.java
Wed Jan 6 13:10:09 2016
@@ -22,6 +22,8 @@ import org.junit.Test;
import java.io.File;
+import static org.junit.Assert.assertTrue;
+
/**
* Test to show that watchdog can destroy 'sudo' and 'sleep'.
*
@@ -60,6 +62,21 @@ public class Exec65Test {
executor.execute(command);
}
+@Test(timeout = 15000)
+public void testExec65WithSleepUsingShellScriptAndRuntimeDirectly() throws
Exception
+{
+Process process =
Runtime.getRuntime().exec(TestUtil.resolveScriptForOS(testDir +
"/sleep").getAbsolutePath());
+Thread.sleep(3000);
+
+process.destroy();
+
+while(process.isAlive()) {
+Thread.sleep(50);
+}
+
+assertTrue(process.exitValue() != 0);
+}
+
/**
* Please note that this tests make assumptions about the environment. It
assumes
* that user "root" exists and that the current user is not a "sudoer"
already.
svn commit: r1723271 - /commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/issues/Exec65Test.java
Author: sgoeschl
Date: Wed Jan 6 10:26:13 2016
New Revision: 1723271
URL: http://svn.apache.org/viewvc?rev=1723271&view=rev
Log:
[EXEC-65] Watchdog can't destroy 'sudo' and 'sleep' - increase timeouts for
regression tests.
Modified:
commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/issues/Exec65Test.java
Modified:
commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/issues/Exec65Test.java
URL:
http://svn.apache.org/viewvc/commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/issues/Exec65Test.java?rev=1723271&r1=1723270&r2=1723271&view=diff
==
---
commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/issues/Exec65Test.java
(original)
+++
commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/issues/Exec65Test.java
Wed Jan 6 10:26:13 2016
@@ -32,7 +32,7 @@ public class Exec65Test {
private static final int TIMEOUT = 3000;
private final File testDir = new File("src/test/scripts");
-@Test(expected = ExecuteException.class, timeout = 2*TIMEOUT)
+@Test(expected = ExecuteException.class, timeout = 15000)
public void testExec65WitSleepUsingCommandLine() throws Exception
{
if(OS.isFamilyUnix())
@@ -48,7 +48,7 @@ public class Exec65Test {
}
}
-@Test(expected = ExecuteException.class, timeout = 2*TIMEOUT)
+@Test(expected = ExecuteException.class, timeout = 15000)
public void testExec65WithSleepUsingShellScript() throws Exception
{
final DefaultExecutor executor = new DefaultExecutor();
@@ -64,7 +64,7 @@ public class Exec65Test {
* Please note that this tests make assumptions about the environment. It
assumes
* that user "root" exists and that the current user is not a "sudoer"
already.
*/
-@Test(expected = ExecuteException.class, timeout = 2*TIMEOUT)
+@Test(expected = ExecuteException.class, timeout = 15000)
public void testExec65WithSudoUsingShellScript() throws Exception
{
if(OS.isFamilyUnix())
svn commit: r1723261 - /commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/issues/Exec65Test.java
Author: sgoeschl
Date: Wed Jan 6 10:15:49 2016
New Revision: 1723261
URL: http://svn.apache.org/viewvc?rev=1723261&view=rev
Log:
[EXEC-65] Watchdog can't destroy 'sudo' and 'sleep' - add unit test to ensure
that the functionality works
Modified:
commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/issues/Exec65Test.java
Modified:
commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/issues/Exec65Test.java
URL:
http://svn.apache.org/viewvc/commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/issues/Exec65Test.java?rev=1723261&r1=1723260&r2=1723261&view=diff
==
---
commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/issues/Exec65Test.java
(original)
+++
commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/issues/Exec65Test.java
Wed Jan 6 10:15:49 2016
@@ -42,7 +42,7 @@ public class Exec65Test {
final ExecuteWatchdog watchdog = new ExecuteWatchdog(TIMEOUT);
executor.setWatchdog(watchdog);
final CommandLine command = new CommandLine("sleep");
-command.addArgument("900");
+command.addArgument("60");
executor.execute(command);
}
svn commit: r1723260 - in /commons/proper/exec/trunk/src/test: java/org/apache/commons/exec/issues/Exec65Test.java scripts/issues/ scripts/issues/exec-65.sh scripts/sleep.bat scripts/sleep.sh
Author: sgoeschl
Date: Wed Jan 6 10:07:02 2016
New Revision: 1723260
URL: http://svn.apache.org/viewvc?rev=1723260&view=rev
Log:
[EXEC-65] Watchdog can't destroy 'sudo' and 'sleep' - add unit test to ensure
that the functionality works
Added:
commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/issues/Exec65Test.java
commons/proper/exec/trunk/src/test/scripts/issues/
commons/proper/exec/trunk/src/test/scripts/issues/exec-65.sh (with props)
commons/proper/exec/trunk/src/test/scripts/sleep.bat (with props)
commons/proper/exec/trunk/src/test/scripts/sleep.sh (with props)
Added:
commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/issues/Exec65Test.java
URL:
http://svn.apache.org/viewvc/commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/issues/Exec65Test.java?rev=1723260&view=auto
==
---
commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/issues/Exec65Test.java
(added)
+++
commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/issues/Exec65Test.java
Wed Jan 6 10:07:02 2016
@@ -0,0 +1,81 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.commons.exec.issues;
+
+import org.apache.commons.exec.*;
+import org.junit.Test;
+
+import java.io.File;
+
+/**
+ * Test to show that watchdog can destroy 'sudo' and 'sleep'.
+ *
+ * @see https://issues.apache.org/jira/browse/EXEC-65";>EXEC-65
+ */
+public class Exec65Test {
+
+private static final int TIMEOUT = 3000;
+private final File testDir = new File("src/test/scripts");
+
+@Test(expected = ExecuteException.class, timeout = 2*TIMEOUT)
+public void testExec65WitSleepUsingCommandLine() throws Exception
+{
+if(OS.isFamilyUnix())
+{
+final DefaultExecutor executor = new DefaultExecutor();
+executor.setStreamHandler(new PumpStreamHandler(System.out,
System.err));
+final ExecuteWatchdog watchdog = new ExecuteWatchdog(TIMEOUT);
+executor.setWatchdog(watchdog);
+final CommandLine command = new CommandLine("sleep");
+command.addArgument("900");
+
+executor.execute(command);
+}
+}
+
+@Test(expected = ExecuteException.class, timeout = 2*TIMEOUT)
+public void testExec65WithSleepUsingShellScript() throws Exception
+{
+final DefaultExecutor executor = new DefaultExecutor();
+executor.setStreamHandler(new PumpStreamHandler(System.out,
System.err));
+final ExecuteWatchdog watchdog = new ExecuteWatchdog(TIMEOUT);
+executor.setWatchdog(watchdog);
+final CommandLine command = new
CommandLine(TestUtil.resolveScriptForOS(testDir + "/sleep"));
+
+executor.execute(command);
+}
+
+/**
+ * Please note that this tests make assumptions about the environment. It
assumes
+ * that user "root" exists and that the current user is not a "sudoer"
already.
+ */
+@Test(expected = ExecuteException.class, timeout = 2*TIMEOUT)
+public void testExec65WithSudoUsingShellScript() throws Exception
+{
+if(OS.isFamilyUnix())
+{
+final DefaultExecutor executor = new DefaultExecutor();
+executor.setStreamHandler(new PumpStreamHandler(System.out,
System.err, System.in));
+final ExecuteWatchdog watchdog = new ExecuteWatchdog(TIMEOUT);
+executor.setWatchdog(watchdog);
+final CommandLine command = new
CommandLine(TestUtil.resolveScriptForOS(testDir + "/issues/exec-65"));
+
+executor.execute(command);
+}
+}
+}
Added: commons/proper/exec/trunk/src/test/scripts/issues/exec-65.sh
URL:
http://svn.apache.org/viewvc/commons/proper/exec/trunk/src/test/scripts/issues/exec-65.sh?rev=1723260&view=auto
==
--- commons/proper/exec/trunk/src/test/scripts/issues/exec-65.sh (added)
+++ commons/proper/exec/trunk/src/test/scripts/issues
svn commit: r1723258 - in /commons/proper/exec/trunk/src: main/java/org/apache/commons/exec/DefaultExecutor.java main/java/org/apache/commons/exec/ExecuteWatchdog.java test/java/org/apache/commons/exe
Author: sgoeschl
Date: Wed Jan 6 09:37:15 2016
New Revision: 1723258
URL: http://svn.apache.org/viewvc?rev=1723258&view=rev
Log:
[EXEC-71] ExecuteWatchdog hangs when process was not started
Modified:
commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/DefaultExecutor.java
commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/ExecuteWatchdog.java
commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/DefaultExecutorTest.java
Modified:
commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/DefaultExecutor.java
URL:
http://svn.apache.org/viewvc/commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/DefaultExecutor.java?rev=1723258&r1=1723257&r2=1723258&view=diff
==
---
commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/DefaultExecutor.java
(original)
+++
commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/DefaultExecutor.java
Wed Jan 6 09:37:15 2016
@@ -16,13 +16,13 @@
*/
package org.apache.commons.exec;
+import org.apache.commons.exec.launcher.CommandLauncher;
+import org.apache.commons.exec.launcher.CommandLauncherFactory;
+
import java.io.File;
import java.io.IOException;
import java.util.Map;
-import org.apache.commons.exec.launcher.CommandLauncher;
-import org.apache.commons.exec.launcher.CommandLauncherFactory;
-
/**
* The default class to start a subprocess. The implementation
* allows to
@@ -331,9 +331,18 @@ public class DefaultExecutor implements
private int executeInternal(final CommandLine command, final Map environment,
final File dir, final ExecuteStreamHandler streams) throws
IOException {
-setExceptionCaught(null);
+final Process process;
+exceptionCaught = null;
-final Process process = this.launch(command, environment, dir);
+try {
+process = this.launch(command, environment, dir);
+}
+catch(final IOException e) {
+if(watchdog != null) {
+watchdog.failedToStart(e);
+}
+throw e;
+}
try {
streams.setProcessInputStream(process.getOutputStream());
@@ -341,6 +350,9 @@ public class DefaultExecutor implements
streams.setProcessErrorStream(process.getErrorStream());
} catch (final IOException e) {
process.destroy();
+if(watchdog != null) {
+watchdog.failedToStart(e);
+}
throw e;
}
Modified:
commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/ExecuteWatchdog.java
URL:
http://svn.apache.org/viewvc/commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/ExecuteWatchdog.java?rev=1723258&r1=1723257&r2=1723258&view=diff
==
---
commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/ExecuteWatchdog.java
(original)
+++
commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/ExecuteWatchdog.java
Wed Jan 6 09:37:15 2016
@@ -122,6 +122,18 @@ public class ExecuteWatchdog implements
}
/**
+ * Notification that starting the process failed.
+ *
+ * @param e the offending exception
+ *
+ */
+public synchronized void failedToStart(Exception e) {
+this.processStarted = true;
+this.caught = e;
+this.notifyAll();
+}
+
+/**
* Stops the watcher. It will notify all threads possibly waiting on this
* object.
*/
@@ -220,11 +232,12 @@ public class ExecuteWatchdog implements
}
/**
- * Ensures that the process is started, so we do not race with asynch
execution.
- * The caller of this method must be holding the lock on this
+ * Ensures that the process is started or not already terminated
+ * so we do not race with asynch executionor hang forever. The
+ * caller of this method must be holding the lock on this
*/
private void ensureStarted() {
-while (!processStarted) {
+while (!processStarted && caught == null) {
try {
this.wait();
} catch (final InterruptedException e) {
Modified:
commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/DefaultExecutorTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/DefaultExecutorTest.java?rev=1723258&r1=1723257&r2=1723258&view=diff
==
---
commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/DefaultExecutorTest.java
(original)
+++
commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/DefaultExecutorTest.java
Wed Jan 6 09:37:15 2016
@@ -18,30 +18,14 @@
package org.apache.commons.exec;
-import stat
svn commit: r1722910 - /commons/proper/exec/trunk/NOTICE.txt
Author: sgoeschl Date: Mon Jan 4 16:21:11 2016 New Revision: 1722910 URL: http://svn.apache.org/viewvc?rev=1722910&view=rev Log: Set current year for NOTICE.txt Modified: commons/proper/exec/trunk/NOTICE.txt Modified: commons/proper/exec/trunk/NOTICE.txt URL: http://svn.apache.org/viewvc/commons/proper/exec/trunk/NOTICE.txt?rev=1722910&r1=1722909&r2=1722910&view=diff == --- commons/proper/exec/trunk/NOTICE.txt (original) +++ commons/proper/exec/trunk/NOTICE.txt Mon Jan 4 16:21:11 2016 @@ -1,5 +1,5 @@ Apache Commons Exec -Copyright 2005-2014 The Apache Software Foundation +Copyright 2005-2016 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/).
svn commit: r1329993 - /commons/proper/email/trunk/pom.xml
Author: sgoeschl Date: Tue Apr 24 20:24:29 2012 New Revision: 1329993 URL: http://svn.apache.org/viewvc?rev=1329993&view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: commons/proper/email/trunk/pom.xml Modified: commons/proper/email/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/pom.xml?rev=1329993&r1=1329992&r2=1329993&view=diff == --- commons/proper/email/trunk/pom.xml (original) +++ commons/proper/email/trunk/pom.xml Tue Apr 24 20:24:29 2012 @@ -24,7 +24,7 @@ 4.0.0 org.apache.commons commons-email -1.3 +1.3.1-SNAPSHOT Commons Email 2001 @@ -41,9 +41,9 @@ - scm:svn:http://svn.apache.org/repos/asf/commons/proper/email/tags/EMAIL_1_3_RC3 - scm:svn:https://svn.apache.org/repos/asf/commons/proper/email/tags/EMAIL_1_3_RC3 - http://svn.apache.org/viewvc/commons/proper/email/tags/EMAIL_1_3_RC3 + scm:svn:http://svn.apache.org/repos/asf/commons/proper/email/trunk + scm:svn:https://svn.apache.org/repos/asf/commons/proper/email/trunk +http://svn.apache.org/viewvc/commons/proper/email/trunk
svn commit: r1329992 - /commons/proper/email/tags/EMAIL_1_3_RC3/
Author: sgoeschl Date: Tue Apr 24 20:24:24 2012 New Revision: 1329992 URL: http://svn.apache.org/viewvc?rev=1329992&view=rev Log: [maven-release-plugin] copy for tag EMAIL_1_3_RC3 Added: commons/proper/email/tags/EMAIL_1_3_RC3/ - copied from r1329991, commons/proper/email/trunk/
svn commit: r1329991 - /commons/proper/email/trunk/pom.xml
Author: sgoeschl Date: Tue Apr 24 20:24:12 2012 New Revision: 1329991 URL: http://svn.apache.org/viewvc?rev=1329991&view=rev Log: [maven-release-plugin] prepare release EMAIL_1_3_RC3 Modified: commons/proper/email/trunk/pom.xml Modified: commons/proper/email/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/pom.xml?rev=1329991&r1=1329990&r2=1329991&view=diff == --- commons/proper/email/trunk/pom.xml (original) +++ commons/proper/email/trunk/pom.xml Tue Apr 24 20:24:12 2012 @@ -24,7 +24,7 @@ 4.0.0 org.apache.commons commons-email -1.3-SNAPSHOT +1.3 Commons Email 2001 @@ -41,9 +41,9 @@ - scm:svn:http://svn.apache.org/repos/asf/commons/proper/email/trunk - scm:svn:https://svn.apache.org/repos/asf/commons/proper/email/trunk -http://svn.apache.org/viewvc/commons/proper/email/trunk + scm:svn:http://svn.apache.org/repos/asf/commons/proper/email/tags/EMAIL_1_3_RC3 + scm:svn:https://svn.apache.org/repos/asf/commons/proper/email/tags/EMAIL_1_3_RC3 + http://svn.apache.org/viewvc/commons/proper/email/tags/EMAIL_1_3_RC3
svn commit: r1329987 - /commons/proper/email/trunk/src/site/xdoc/download_email.xml
Author: sgoeschl Date: Tue Apr 24 20:12:57 2012 New Revision: 1329987 URL: http://svn.apache.org/viewvc?rev=1329987&view=rev Log: Updated download page Modified: commons/proper/email/trunk/src/site/xdoc/download_email.xml Modified: commons/proper/email/trunk/src/site/xdoc/download_email.xml URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/src/site/xdoc/download_email.xml?rev=1329987&r1=1329986&r2=1329987&view=diff == --- commons/proper/email/trunk/src/site/xdoc/download_email.xml (original) +++ commons/proper/email/trunk/src/site/xdoc/download_email.xml Tue Apr 24 20:12:57 2012 @@ -54,7 +54,7 @@ limitations under the License. We recommend you use a mirror to download our release builds, but you must verify the integrity of -the downloaded files using signatures downloaded from our main +the downloaded files using signatures downloaded from our main distribution directories. Recent releases (48 hours) may not yet be available from the mirrors. @@ -71,7 +71,7 @@ limitations under the License. - Other mirrors: + Other mirrors: [if-any http] [for http][http][end] @@ -90,7 +90,7 @@ limitations under the License. The http://www.apache.org/dist/commons/KEYS";>KEYS link links to the code signing keys used to sign the product. -The PGP link downloads the OpenPGP compatible signature from our main site. +The PGP link downloads the OpenPGP compatible signature from our main site. The MD5 link downloads the checksum from the main site.
svn commit: r1329952 - in /commons/proper/email/trunk: RELEASE-NOTES.txt doap_email.rdf pom.xml
Author: sgoeschl Date: Tue Apr 24 19:13:19 2012 New Revision: 1329952 URL: http://svn.apache.org/viewvc?rev=1329952&view=rev Log: Preparing for another release candidate ... :-) Modified: commons/proper/email/trunk/RELEASE-NOTES.txt commons/proper/email/trunk/doap_email.rdf commons/proper/email/trunk/pom.xml Modified: commons/proper/email/trunk/RELEASE-NOTES.txt URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/RELEASE-NOTES.txt?rev=1329952&r1=1329951&r2=1329952&view=diff == --- commons/proper/email/trunk/RELEASE-NOTES.txt (original) +++ commons/proper/email/trunk/RELEASE-NOTES.txt Tue Apr 24 19:13:19 2012 @@ -15,7 +15,7 @@ downloads, reports, and bug status: http://commons.apache.org/email/ -This is a maintenance release which fixes several bugs present in the 1.1 +This is a maintenance release which fixes several bugs present in the 1.2 release and adds a number of small enhancements requested by users. All current users are encouraged to upgrade. Modified: commons/proper/email/trunk/doap_email.rdf URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/doap_email.rdf?rev=1329952&r1=1329951&r2=1329952&view=diff == --- commons/proper/email/trunk/doap_email.rdf (original) +++ commons/proper/email/trunk/doap_email.rdf Tue Apr 24 19:13:19 2012 @@ -39,7 +39,7 @@ commons-email -2009-11-06 +2012-04-25 1.3 Modified: commons/proper/email/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/pom.xml?rev=1329952&r1=1329951&r2=1329952&view=diff == --- commons/proper/email/trunk/pom.xml (original) +++ commons/proper/email/trunk/pom.xml Tue Apr 24 19:13:19 2012 @@ -331,6 +331,7 @@ org.apache.maven.plugins maven-changes-plugin +2.6 %URL%/%ISSUE%
svn commit: r1329941 - /commons/proper/email/trunk/src/site/xdoc/userguide.xml
Author: sgoeschl Date: Tue Apr 24 18:53:22 2012 New Revision: 1329941 URL: http://svn.apache.org/viewvc?rev=1329941&view=rev Log: Fixed broken formatting in userguide.xml Modified: commons/proper/email/trunk/src/site/xdoc/userguide.xml Modified: commons/proper/email/trunk/src/site/xdoc/userguide.xml URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/src/site/xdoc/userguide.xml?rev=1329941&r1=1329940&r2=1329941&view=diff == --- commons/proper/email/trunk/src/site/xdoc/userguide.xml (original) +++ commons/proper/email/trunk/src/site/xdoc/userguide.xml Tue Apr 24 18:53:22 2012 @@ -279,9 +279,8 @@ import org.apache.commons.mail.HtmlEmail When using a secured transport (STARTTLS or SSL) you can force validating the server's -certificate by calling Email.setSSLCheckServerIdentity(true). Having said that -this does not seem to work on any of my test servers (GMAIL, GMX). - +certificate by calling Email.setSSLCheckServerIdentity(true). Having said that +this does not seem to work on any of my test servers (GMAIL, GMX). Enforce using STARTTLS by calling Email.setStartTLSRequired(true)
svn commit: r1329940 - /commons/proper/email/trunk/pom.xml
Author: sgoeschl
Date: Tue Apr 24 18:52:52 2012
New Revision: 1329940
URL: http://svn.apache.org/viewvc?rev=1329940&view=rev
Log:
Cleaning up the pom
+) removing reporting plugins (findbugs, cehckstyle)
+) Clirr compares current version with commons-email 1.2
Modified:
commons/proper/email/trunk/pom.xml
Modified: commons/proper/email/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/email/trunk/pom.xml?rev=1329940&r1=1329939&r2=1329940&view=diff
==
--- commons/proper/email/trunk/pom.xml (original)
+++ commons/proper/email/trunk/pom.xml Tue Apr 24 18:52:52 2012
@@ -331,7 +331,6 @@
org.apache.maven.plugins
maven-changes-plugin
-${commons.changes.version}
%URL%/%ISSUE%
@@ -342,39 +341,24 @@
-
-
-org.apache.maven.plugins
-maven-checkstyle-plugin
-2.8
-
-
${basedir}/conf/checkstyle.xml
-false
-${basedir}/conf/HEADER.txt
-
-
+
org.codehaus.mojo
clirr-maven-plugin
-${commons.clirr.version}
-
-
-org.codehaus.mojo
-findbugs-maven-plugin
-2.3.2
-Normal
-Default
-
+ 1.2
+
-
-
+org.apache.rat
+apache-rat-plugin
+
+
+src/test/eml/*.eml
+
+
+
+
svn commit: r1329910 - /commons/proper/email/trunk/pom.xml
Author: sgoeschl Date: Tue Apr 24 18:18:14 2012 New Revision: 1329910 URL: http://svn.apache.org/viewvc?rev=1329910&view=rev Log: Upgrading to newest commons-parent pom Modified: commons/proper/email/trunk/pom.xml Modified: commons/proper/email/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/pom.xml?rev=1329910&r1=1329909&r2=1329910&view=diff == --- commons/proper/email/trunk/pom.xml (original) +++ commons/proper/email/trunk/pom.xml Tue Apr 24 18:18:14 2012 @@ -19,7 +19,7 @@ org.apache.commons commons-parent - 22 + 24 4.0.0 org.apache.commons
svn commit: r1296891 - in /commons/proper/email/trunk/src/java/org/apache/commons/mail: Email.java resolver/DataSourceBaseResolver.java resolver/DataSourceClassPathResolver.java resolver/DataSourceCom
Author: sgoeschl
Date: Sun Mar 4 22:21:46 2012
New Revision: 1296891
URL: http://svn.apache.org/viewvc?rev=1296891&view=rev
Log:
Fixed a few CheckStyle and FindBugs warnings.
Modified:
commons/proper/email/trunk/src/java/org/apache/commons/mail/Email.java
commons/proper/email/trunk/src/java/org/apache/commons/mail/resolver/DataSourceBaseResolver.java
commons/proper/email/trunk/src/java/org/apache/commons/mail/resolver/DataSourceClassPathResolver.java
commons/proper/email/trunk/src/java/org/apache/commons/mail/resolver/DataSourceCompositeResolver.java
commons/proper/email/trunk/src/java/org/apache/commons/mail/util/MimeMessageUtils.java
Modified: commons/proper/email/trunk/src/java/org/apache/commons/mail/Email.java
URL:
http://svn.apache.org/viewvc/commons/proper/email/trunk/src/java/org/apache/commons/mail/Email.java?rev=1296891&r1=1296890&r2=1296891&view=diff
==
--- commons/proper/email/trunk/src/java/org/apache/commons/mail/Email.java
(original)
+++ commons/proper/email/trunk/src/java/org/apache/commons/mail/Email.java Sun
Mar 4 22:21:46 2012
@@ -540,7 +540,7 @@ public abstract class Email implements E
if (isSSLOnConnect() || isStartTLSEnabled())
{
-if(isSSLCheckServerIdentity())
+if (isSSLCheckServerIdentity())
{
properties.setProperty(MAIL_SMTP_SSL_CHECKSERVERIDENTITY,
"true");
}
@@ -1419,14 +1419,26 @@ public abstract class Email implements E
return this;
}
+/**
+* Is the server identity checked as specified by RFC 2595
+*
+* @return true if the server identity is checked
+*/
public boolean isSSLCheckServerIdentity()
{
return sslCheckServerIdentity;
}
-public void setSSLCheckServerIdentity(boolean sslCheckServerIdentity)
+/**
+ * Sets whether the server identity is checked as specified by RFC 2595
+ *
+ * @param sslCheckServerIdentity whether to enable server identity check
+ * @return An Email.
+ */
+public Email setSSLCheckServerIdentity(boolean sslCheckServerIdentity)
{
this.sslCheckServerIdentity = sslCheckServerIdentity;
+return this;
}
/**
Modified:
commons/proper/email/trunk/src/java/org/apache/commons/mail/resolver/DataSourceBaseResolver.java
URL:
http://svn.apache.org/viewvc/commons/proper/email/trunk/src/java/org/apache/commons/mail/resolver/DataSourceBaseResolver.java?rev=1296891&r1=1296890&r2=1296891&view=diff
==
---
commons/proper/email/trunk/src/java/org/apache/commons/mail/resolver/DataSourceBaseResolver.java
(original)
+++
commons/proper/email/trunk/src/java/org/apache/commons/mail/resolver/DataSourceBaseResolver.java
Sun Mar 4 22:21:46 2012
@@ -28,11 +28,19 @@ public abstract class DataSourceBaseReso
/** shall we ignore resources not found or complain with an exception */
private final boolean lenient;
+/**
+ * Constructor.
+ */
public DataSourceBaseResolver()
{
this.lenient = false;
}
+/**
+ * Constructor.
+ *
+ * @param lenient shall we ignore resources not found or throw an
exception?
+ */
public DataSourceBaseResolver(final boolean lenient)
{
this.lenient = lenient;
Modified:
commons/proper/email/trunk/src/java/org/apache/commons/mail/resolver/DataSourceClassPathResolver.java
URL:
http://svn.apache.org/viewvc/commons/proper/email/trunk/src/java/org/apache/commons/mail/resolver/DataSourceClassPathResolver.java?rev=1296891&r1=1296890&r2=1296891&view=diff
==
---
commons/proper/email/trunk/src/java/org/apache/commons/mail/resolver/DataSourceClassPathResolver.java
(original)
+++
commons/proper/email/trunk/src/java/org/apache/commons/mail/resolver/DataSourceClassPathResolver.java
Sun Mar 4 22:21:46 2012
@@ -33,16 +33,30 @@ public class DataSourceClassPathResolver
/** the base string of the resource relative to the classpath when
resolving relative paths */
private final String classPathBase;
+/**
+ * Constructor
+ */
public DataSourceClassPathResolver()
{
this.classPathBase = "/";
}
+/**
+ * Constructor.
+ *
+ * @param classPathBase a base class path
+ */
public DataSourceClassPathResolver(final String classPathBase)
{
this.classPathBase = classPathBase.endsWith("/") ? classPathBase :
classPathBase + "/";
}
+/**
+ * Constructor.
+ *
+ * @param classPathBase a base class path
+ * @param lenient shall we ignore resources not found or throw an
exception?
+ */
publi
svn commit: r1296887 - in /commons/proper/email/trunk/src: changes/changes.xml java/org/apache/commons/mail/Email.java site/xdoc/userguide.xml test/org/apache/commons/mail/EmailLiveTest.java test/org/
Author: sgoeschl
Date: Sun Mar 4 21:59:47 2012
New Revision: 1296887
URL: http://svn.apache.org/viewvc?rev=1296887&view=rev
Log:
[EMAIL-105] he patch actually broke sending emails over a secured connection -
disabled the "MAIL_SMTP_SSL_CHECKSERVERIDENTITY" and "MAIL_SMTP_SSL_ENABLE"
activation. Tested the functionality using GMail, GMX and Office365 so the code
is at least working for a couple of existing SMTP servers. Also added
'sslCheckServerIdentity' including setter and getter. Also added a chapter
regarding "Security" to the user manua
Modified:
commons/proper/email/trunk/src/changes/changes.xml
commons/proper/email/trunk/src/java/org/apache/commons/mail/Email.java
commons/proper/email/trunk/src/site/xdoc/userguide.xml
commons/proper/email/trunk/src/test/org/apache/commons/mail/EmailLiveTest.java
commons/proper/email/trunk/src/test/org/apache/commons/mail/settings/EmailConfiguration.java
Modified: commons/proper/email/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/commons/proper/email/trunk/src/changes/changes.xml?rev=1296887&r1=1296886&r2=1296887&view=diff
==
--- commons/proper/email/trunk/src/changes/changes.xml (original)
+++ commons/proper/email/trunk/src/changes/changes.xml Sun Mar 4 21:59:47 2012
@@ -23,6 +23,16 @@
+
+The patch actually broke sending emails over a secured connection
- disabled the
+"MAIL_SMTP_SSL_CHECKSERVERIDENTITY" and "MAIL_SMTP_SSL_ENABLE"
activation. Tested
+the functionality using GMail, GMX and Office365 so the code is at
least working for
+a couple of existing SMTP servers. Also added
'sslCheckServerIdentity' including
+setter and getter. Also added a chapter regarding "Security" to
the user manual.
+
+
+ Maven Site fails with error in Checkstyle configuration.
+
DataSourceFileResolverTest fails under IBM JDK 1.4 and 1.6 running
on Windows.
Modified: commons/proper/email/trunk/src/java/org/apache/commons/mail/Email.java
URL:
http://svn.apache.org/viewvc/commons/proper/email/trunk/src/java/org/apache/commons/mail/Email.java?rev=1296887&r1=1296886&r2=1296887&view=diff
==
--- commons/proper/email/trunk/src/java/org/apache/commons/mail/Email.java
(original)
+++ commons/proper/email/trunk/src/java/org/apache/commons/mail/Email.java Sun
Mar 4 21:59:47 2012
@@ -159,25 +159,45 @@ public abstract class Email implements E
/**
* Does server require TLS encryption for authentication?
- * @deprecated since 1.3, use setStartTLSRequired() instead
+ * @deprecated since 1.3, use setStartTLSEnabled() instead
*/
protected boolean tls;
/**
- * Does the current transport use SSL/TLS encryption upon connection?
- * @deprecated since 1.3, use setSSLOnConnect() instead
+ * If true, enables the use of the STARTTLS command (if supported by
+ * the server) to switch the connection to a TLS-protected connection
+ * before issuing any login commands. Note that an appropriate trust
+ * store must configured so that the client will trust the server's
+ * certificate.
+ * Defaults to false.
*/
-protected boolean ssl;
-
-/** does client want STARTTLS encryption */
private boolean startTlsEnabled;
-/** does client require STARTTLS encryption */
+/**
+ * If true, requires the use of the STARTTLS command. If the server doesn't
+ * support the STARTTLS command, or the command fails, the connect method
+ * will fail.
+ * Defaults to false.
+ */
private boolean startTlsRequired;
+/**
+ * Does the current transport use SSL/TLS encryption upon connection?
+ * @deprecated since 1.3, use setSSLOnConnect() instead
+ */
+protected boolean ssl;
+
/** does the current transport use SSL/TLS encryption upon connection? */
private boolean sslOnConnect;
+/**
+ * If set to true, check the server identity as specified by RFC 2595.
These
+ * additional checks based on the content of the server's certificate are
+ * intended to prevent man-in-the-middle attacks.
+ * Defaults to false.
+ */
+private boolean sslCheckServerIdentity;
+
/** socket I/O timeout value in milliseconds */
protected int socketTimeout = SOCKET_TIMEOUT_MS;
@@ -510,23 +530,22 @@ public abstract class Email implements E
properties.setProperty(MAIL_SMTP_AUTH, "true");
}
-if (isSSLOnConnect() || isStartTLSEnabled() ||
isStartTLSRequired())
-{
-properties.setProperty(MAIL_SMTP_SSL_SOCKET_FACTORY_P
svn commit: r1296886 - in /commons/proper/email/trunk: conf/checkstyle.xml pom.xml
Author: sgoeschl
Date: Sun Mar 4 21:58:36 2012
New Revision: 1296886
URL: http://svn.apache.org/viewvc?rev=1296886&view=rev
Log:
[EMAIL-113] Fixing broken Checkstyle report
Modified:
commons/proper/email/trunk/conf/checkstyle.xml
commons/proper/email/trunk/pom.xml
Modified: commons/proper/email/trunk/conf/checkstyle.xml
URL:
http://svn.apache.org/viewvc/commons/proper/email/trunk/conf/checkstyle.xml?rev=1296886&r1=1296885&r2=1296886&view=diff
==
--- commons/proper/email/trunk/conf/checkstyle.xml (original)
+++ commons/proper/email/trunk/conf/checkstyle.xml Sun Mar 4 21:58:36 2012
@@ -25,8 +25,10 @@
-
-
+
+
+
+
@@ -36,6 +38,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -64,12 +78,6 @@
-
-
-
-
-
-
@@ -84,7 +92,6 @@
-
@@ -99,7 +106,6 @@
-
@@ -164,10 +170,6 @@
-
-
-
-
Modified: commons/proper/email/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/email/trunk/pom.xml?rev=1296886&r1=1296885&r2=1296886&view=diff
==
--- commons/proper/email/trunk/pom.xml (original)
+++ commons/proper/email/trunk/pom.xml Sun Mar 4 21:58:36 2012
@@ -346,7 +346,7 @@
org.apache.maven.plugins
maven-checkstyle-plugin
-2.7
+2.8
${basedir}/conf/checkstyle.xml
false
svn commit: r1291060 - in /commons/proper/email/trunk/src: changes/changes.xml test/org/apache/commons/mail/resolver/DataSourceFileResolverTest.java
Author: sgoeschl
Date: Sun Feb 19 21:06:17 2012
New Revision: 1291060
URL: http://svn.apache.org/viewvc?rev=1291060&view=rev
Log:
[EMAIL-112] DataSourceFileResolverTest fails under IBM JDK 1.4 and 1.6 running
on Windows
Modified:
commons/proper/email/trunk/src/changes/changes.xml
commons/proper/email/trunk/src/test/org/apache/commons/mail/resolver/DataSourceFileResolverTest.java
Modified: commons/proper/email/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/commons/proper/email/trunk/src/changes/changes.xml?rev=1291060&r1=1291059&r2=1291060&view=diff
==
--- commons/proper/email/trunk/src/changes/changes.xml (original)
+++ commons/proper/email/trunk/src/changes/changes.xml Sun Feb 19 21:06:17 2012
@@ -22,7 +22,16 @@
-
+
+
+ DataSourceFileResolverTest fails under IBM JDK 1.4 and 1.6 running
on Windows.
+
+
+ Update the current trunk to be binary compatible with the
commons-email-1.2 release.
+
+
+ Added unit test to ensure that parsing the broken mime message does
not cause an OutOfMemoryException.
+
HtmlmageEmail should support class path resources
Modified:
commons/proper/email/trunk/src/test/org/apache/commons/mail/resolver/DataSourceFileResolverTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/email/trunk/src/test/org/apache/commons/mail/resolver/DataSourceFileResolverTest.java?rev=1291060&r1=1291059&r2=1291060&view=diff
==
---
commons/proper/email/trunk/src/test/org/apache/commons/mail/resolver/DataSourceFileResolverTest.java
(original)
+++
commons/proper/email/trunk/src/test/org/apache/commons/mail/resolver/DataSourceFileResolverTest.java
Sun Feb 19 21:06:17 2012
@@ -16,15 +16,16 @@
*/
package org.apache.commons.mail.resolver;
-import junit.framework.TestCase;
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.mail.DataSourceResolver;
-
-import javax.activation.DataSource;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
-import java.net.URL;
+
+import javax.activation.DataSource;
+
+import junit.framework.TestCase;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.mail.DataSourceResolver;
/**
* JUnit test case for DateSourceResolver.
@@ -47,7 +48,7 @@ public class DataSourceFileResolverTest
assertTrue(toByteArray(dataSourceResolver.resolve("images/asf_logo_wide.gif")).length
== IMG_SIZE);
assertTrue(toByteArray(dataSourceResolver.resolve("./images/asf_logo_wide.gif")).length
== IMG_SIZE);
assertTrue(toByteArray(dataSourceResolver.resolve("../test/images/asf_logo_wide.gif")).length
== IMG_SIZE);
-
assertNull(toByteArray(dataSourceResolver.resolve("/images/asf_logo_wide.gif")));
+
assertNull(toByteArray(dataSourceResolver.resolve("/images/does-not-exist.gif")));
assertNull(dataSourceResolver.resolve("./images/does-not-exist.gif"));
}
svn commit: r1290883 - in /commons/proper/email/trunk/src/test: eml/outofmemory-no-header-seperation.eml org/apache/commons/mail/util/MimeMessageParserTest.java
Author: sgoeschl Date: Sat Feb 18 21:33:05 2012 New Revision: 1290883 URL: http://svn.apache.org/viewvc?rev=1290883&view=rev Log: [EMAIL-110] Added unit test to ensure that parsing the broken mime message does not cause an OutOfMemoryException Added: commons/proper/email/trunk/src/test/eml/outofmemory-no-header-seperation.eml Modified: commons/proper/email/trunk/src/test/org/apache/commons/mail/util/MimeMessageParserTest.java Added: commons/proper/email/trunk/src/test/eml/outofmemory-no-header-seperation.eml URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/src/test/eml/outofmemory-no-header-seperation.eml?rev=1290883&view=auto == --- commons/proper/email/trunk/src/test/eml/outofmemory-no-header-seperation.eml (added) +++ commons/proper/email/trunk/src/test/eml/outofmemory-no-header-seperation.eml Sat Feb 18 21:33:05 2012 @@ -0,0 +1,148 @@ +Received: by 10.220.154.73 with HTTP; Fri, 13 Jan 2012 00:43:02 -0800 (PST) +To: j...@example.org +From: j...@example.org +Reply-To: j...@example.org +Subject: A corrupt Attachment +MIME-Version: 1.0 +Content-Type: multipart/mixed; boundary=f46d043d64394dd4e404b664da85 +Doesnt matter + +--f46d043d64394dd4e404b664da85 +Content-Type: multipart/alternative; boundary=alt-f46d043d64394dd4e404b664da85 +--f46d043d64394dd4e404b664da85 +Content-Type: image/gif; name="feather-small.gif" +Content-Disposition: attachment; filename="feather-small.gif" +Content-Transfer-Encoding: base64 +R0lGODlhywA9APf/APRUVsPGx46PkW8nVt3d3q1TSuvr7J8bQJGpulUtbacrdf///7KQkK6RXDIi +Md7e38hwVLNqUbcnbMxTTrqqY9sdWK+be6C4ybKrj9bk5c+SZmo0l7IqdEwoVNfIb7m4uf7xgvzV +fniJlqzF1ZhVSXc0k/r6+qKkpvjmfYgxiegWTo51UMUZSPuYZ8OtZPQYUdcgXdcYSuDh4rUbRasw +g2Zvd2IiQKkaQvQVTuwZUpghTPuKY5ste8G5sMwjYrFrePhjWvfLesyFWdMiYoE1lufYdoYmVoeb +qsYhXOGGX5klV6woZuQaVGQyiiMeIeIdWX0xjKQlWpEeQfX19ZMxhvd0Xca0Z+jIdXF9huTl5ltN +OfHx8RgUGERAP5YoZLBTaYcqZ/uma/c2UrYjW+Tq6ogtdOLm6La0q8R6buYnSaIrQYp0bNLT1MEm +aZWKfnspXtQ5iKc6Q7OmpbImRFlmctG4bMkdUYsiStXa3eLj5nktc66ztmMpXeJnVcMkZOHi5Jgv +ge9ciZ+bm7WeXvQqUH9pTMfT2vKSiuoNSb0UQ14zj9DMyu3w8GItb8K3e+8WUI1UYMolaNGraN54 +Wf3cf7I2RvIhTmtZQB8dHL8qStYPRvl/YbwfVN+YYbyvtOujZdApTv29c+S2bayAfz0nQaOCVsAo +bugbV87EwOa/crg+W/2zbuQyTsOah2swfKasscujZezt7pk1kt8fXc/Y3+6NYHYvfdrZ2du/b4Q3 +ntIeV5Uudo0wgPH29cCjk/cOSqFDRLYwYqgfZeAVTqItfcrRz9E/S70+R9ra2/RDUsrMzlRUWIMv +ftje4d/e3sdcbt7c2+Hj45ZAW3Ayice8vOTi4e/v7/f394FDQZUzQnEsae8xT7wrc9zc3fLy8tjV +1W41nMcna2Yuksg2XPb29t7n59/f4MgPQ/z8/Pj4+PP09L/AwF0vfP+zgikiKPv7+/T49/z7++FF +TmNgZZErbebn6Ojp6XkhRODg4OPj48GdZdvb3c/Y2N/b16ogTyH5BAEAAP8ALADLAD0A +AAj/AP8JHEiwoMGDAj8EQMiwocOHECNKnEixokWG19BdJPhuwb8pWKZsHEmypMmTKAeeOGFP48V4 +J9QtCCDIJTqXKXPq3MlTYqxlXQTl80hxpgB4Jva8InDt3ytrPaNKnaozGikuXQQ4wwmR0R4EWXq9 +GiFI0CsBXAe+w7eI0T90C0RSnUuXbrQuXLiQcsMmXcR6CC4EiPXqwhksR74NRMeGwSg5DMaB+uKJ +wZcf1FyaqMu5c8lrHb3VyKu3hrKmDmMdGXGkWWEBCF4Z8IhOjr8KTO4lyoEj0Q0ViBDZkXMLspx6 +npMrhzilnjW4PdxxwYTJ3bwAUBmaOIEgdmEsI7CY//O4b4muITp0PJk148apJ0xOsZDCIoelbaoE +sXHucoH/5QB2FpcMf3izQDWjceEEF+4s80oWCC2wzhEXHFHDERRisc4C74zCSTh+3OPDEJzoAMOJ +T7SnwiMssnDADKBMxsAtbKBCDSrdvBPgjlTFZQ4B0UxhwhlXYbKgE12wtBlBBmBBR3dY1ADlht5I +I4EpStwRSSR3IOGDDzD4cwN8TORwwwxMsIiDJjcAM8EEAPQBgS/lxOKNjjzmmdMC6URDQDdZoFMN +FkcuiBVfqP0jYQ1PIvDkESJ8sMAf9HDAwQBLYKkEiD5EocMsMFSQoj9PlPrEAQcMYwkhyQAAwATZ +SP/zzDOjfIOnnriWZII9D3TTjT3kUNMFdU4Y6kANi2zxVjq3YCECAoiJIMIe6FBDDzH0DCABB0ZI +4K0Ed3w5BAx2mHiiLvfc8EgOLL4AyhwzqIADDpakkY0b1BQTS1q59hsROlv88aczseAjgHTFFsvg +MnLYY4819kiLGBZYUCsHL4C88YYCYIDBgQLcRsGpDzqM8SUS98xwChMsv+BbDDnkIG8MB9wQAyus +fMFAPvz663OEu5rjqwwGBLBMXgk7QV1WgxkgQA1O0jHCAnJAkQIfZQAyACA8KEDPG9+2scQdpoB4 +D6kViHrKDKQ+gZt8qb7A4iMvDIPNCaigAo03P/f/jRA6U2TRazf1OCNAkUnnZd0ezYhAR5TKoCPI +NCXwwQwz2lBBhdb0KLAEB6YYsYS3RtwxBJgwsGcuinYcwDLLObzAQhwT9NHHJEmMEsAW5PTsd78c +xiLDn+bYw4YAeCmYMCZ5LSPAMo8HsMAJ4oiTABGN2GI1M3zwQAwxCigwQPhe3NOGH5H4QaKWX46o +ixSpp83yDXO0CgQQfRQQhxqXMfCNCe+Ay+9+xqd6DA4f9The8oxULOYpqAumQYcnxMEOdoAjARso +ARQakTmMEeMNevDeALxgCgm04Xx3MOH5IkGyMYzrRDCgzwtWJYZjqOEc8sLBL1iADTe0whfUsMcA +/38GsGj4igBEI8AJlmGopCkNE11QCgWb0AR2bOCKHdBeCnjBC8tRoQwD+NjoJKAEL3AgbGPzQ/uG +IMOYPQJVZTrFI2IwhwJMYhM7EEIBIMEAakTjVkPME5/sITQCEAAfBsjCB2rgAKQlrjod6MAGqnjF +DUhyA1CAgh4SYDU+XAt8HPDCxsIHMgkYIQonbAOX3AO7G6CtVCxQgzzuB4QCzCEGlqjXBAQRi3Qs +KZA8WgA5eJWFfGQhC9ZQBzIEwUTlLc9IpCCFBcHBDgxe8YLsKMEGGqE5Huzig1njgfcU4IUwnlEC +UbhHqCqwttXNQkw0lEccWICDR+BABbHExih84f+LHpCBHB0BJoAWIDkRnOAVSjmBIE4gAlJooZHT +SRp13NGBJiRgmpOsKDUbkQJmpOCL2tgixgChNTCQUgH34MQQxoUEHbBwRGJ6wYpUcAA7rCwHM6iE +HfGYBCFEABs/YIAvPHELdQhUOVNYR9ToQAdGdWEZWFjGMubhDuowsIHVIcVFqYnBCzahBBpMQSNc +EVYo8IIZHRCn996gJTWiZwknDEcUDnCKmx6AE6XSxQEqAQBaTiAOidDEI3KZBmOoYg1n6Icz7NGL +XqSDHEeVygKsoQwBiOAICBABo2rAqGWs4xoCaAQpqkosrEKTFE0Ah1crOQ1rZnAaROADH0TKC23/ +mdAPUTCCpSSwBB2Iip03iMJKkSAFXFqihtlIxIpYhAgWVCICuGtAKUgACTRYdxQMQIUyrGGCdKAj +HiYgB0AjuxHGYDYwR2BqDSR2WXsUQxqAsEUKXNEBdzzxmZhwQAequQFw9LeC/q2kJaeRyRRoQ7ef +k8AbuhY+IyBhCLqYhR20FIkxFHddOLiBFHRxCnZWYA5xgAAe
svn commit: r1290877 - /commons/proper/email/trunk/src/java/org/apache/commons/mail/Email.java
Author: sgoeschl
Date: Sat Feb 18 21:22:19 2012
New Revision: 1290877
URL: http://svn.apache.org/viewvc?rev=1290877&view=rev
Log:
[EMAIL-111] Providing binary compatibility for setter (second part of patch)
Modified:
commons/proper/email/trunk/src/java/org/apache/commons/mail/Email.java
Modified: commons/proper/email/trunk/src/java/org/apache/commons/mail/Email.java
URL:
http://svn.apache.org/viewvc/commons/proper/email/trunk/src/java/org/apache/commons/mail/Email.java?rev=1290877&r1=1290876&r2=1290877&view=diff
==
--- commons/proper/email/trunk/src/java/org/apache/commons/mail/Email.java
(original)
+++ commons/proper/email/trunk/src/java/org/apache/commons/mail/Email.java Sat
Feb 18 21:22:19 2012
@@ -191,7 +191,6 @@ public abstract class Email implements E
* Setting to true will enable the display of debug information.
*
* @param d A boolean.
- * @return An Email.
* @since 1.0
*/
public void setDebug(boolean d)
@@ -208,7 +207,6 @@ public abstract class Email implements E
*
* @param userName User name for the SMTP server
* @param password password for the SMTP server
- * @return An Email.
* @see DefaultAuthenticator
* @see #setAuthenticator
* @since 1.0
@@ -226,7 +224,6 @@ public abstract class Email implements E
* authentication. Your mail server must also support RFC2554.
*
* @param newAuthenticator the Authenticator object.
- * @return Email.
* @see Authenticator
* @since 1.0
*/
@@ -345,12 +342,12 @@ public abstract class Email implements E
* for the reasons of deprecation.
*
* @deprecated since 1.3, use setStartTLSEnabled() instead
- * @param startTlsEnabled true if STARTTLS requested, false otherwise
+ * @param withTLS true if STARTTLS requested, false otherwise
* @since 1.1
*/
public void setTLS(boolean withTLS)
{
-setStartTLSEnabled(startTlsEnabled);
+setStartTLSEnabled(withTLS);
}
/**
svn commit: r1290873 - in /commons/proper/email/trunk/src/java/org/apache/commons/mail: Email.java MultiPartEmail.java
Author: sgoeschl
Date: Sat Feb 18 21:07:27 2012
New Revision: 1290873
URL: http://svn.apache.org/viewvc?rev=1290873&view=rev
Log:
[EMAIL-111] Providing binary compatibility for setter (second part of patch)
Modified:
commons/proper/email/trunk/src/java/org/apache/commons/mail/Email.java
commons/proper/email/trunk/src/java/org/apache/commons/mail/MultiPartEmail.java
Modified: commons/proper/email/trunk/src/java/org/apache/commons/mail/Email.java
URL:
http://svn.apache.org/viewvc/commons/proper/email/trunk/src/java/org/apache/commons/mail/Email.java?rev=1290873&r1=1290872&r2=1290873&view=diff
==
--- commons/proper/email/trunk/src/java/org/apache/commons/mail/Email.java
(original)
+++ commons/proper/email/trunk/src/java/org/apache/commons/mail/Email.java Sat
Feb 18 21:07:27 2012
@@ -194,10 +194,9 @@ public abstract class Email implements E
* @return An Email.
* @since 1.0
*/
-public Email setDebug(boolean d)
+public void setDebug(boolean d)
{
this.debug = d;
-return this;
}
/**
@@ -211,12 +210,12 @@ public abstract class Email implements E
* @param password password for the SMTP server
* @return An Email.
* @see DefaultAuthenticator
- * @see #setAuthenticator(Authenticator)
+ * @see #setAuthenticator
* @since 1.0
*/
-public Email setAuthentication(String userName, String password)
+public void setAuthentication(String userName, String password)
{
-return this.setAuthenticator(new DefaultAuthenticator(userName,
password));
+this.setAuthenticator(new DefaultAuthenticator(userName, password));
}
/**
@@ -231,10 +230,9 @@ public abstract class Email implements E
* @see Authenticator
* @since 1.0
*/
-public Email setAuthenticator(Authenticator newAuthenticator)
+public void setAuthenticator(Authenticator newAuthenticator)
{
this.authenticator = newAuthenticator;
-return this;
}
/**
@@ -245,42 +243,36 @@ public abstract class Email implements E
* @throws java.nio.charset.IllegalCharsetNameException if the charset
name is invalid
* @throws java.nio.charset.UnsupportedCharsetException if no support for
the named charset
* exists in the current JVM
- * @return An Email.
* @since 1.0
*/
-public Email setCharset(String newCharset)
+public void setCharset(String newCharset)
{
Charset set = Charset.forName(newCharset);
this.charset = set.name();
-return this;
}
/**
* Set the emailBody to a MimeMultiPart
*
* @param aMimeMultipart aMimeMultipart
- * @return An Email.
* @since 1.0
*/
-public Email setContent(MimeMultipart aMimeMultipart)
+public void setContent(MimeMultipart aMimeMultipart)
{
this.emailBody = aMimeMultipart;
-return this;
}
/**
* Set the content & contentType
*
- * @param aObject aObject
- * @param aContentType aContentType
- * @return An Email.
+ * @param aObject aObject
+ * @param aContentType aContentType
* @since 1.0
*/
-public Email setContent(Object aObject, String aContentType)
+public void setContent(Object aObject, String aContentType)
{
this.content = aObject;
this.updateContentType(aContentType);
-return this;
}
/**
@@ -340,28 +332,25 @@ public abstract class Email implements E
* Set the hostname of the outgoing mail server.
*
* @param aHostName aHostName
- * @return An Email.
* @since 1.0
*/
-public Email setHostName(String aHostName)
+public void setHostName(String aHostName)
{
checkSessionAlreadyInitialized();
this.hostName = aHostName;
-return this;
}
/**
* Set or disable the STARTTLS encryption. Please see EMAIL-105
- * for the reasons of deprecation
+ * for the reasons of deprecation.
*
* @deprecated since 1.3, use setStartTLSEnabled() instead
* @param startTlsEnabled true if STARTTLS requested, false otherwise
- * @return An Email.
* @since 1.1
*/
-public Email setTLS(boolean startTlsEnabled)
+public void setTLS(boolean withTLS)
{
-return setStartTLSEnabled(startTlsEnabled);
+setStartTLSEnabled(startTlsEnabled);
}
/**
@@ -395,10 +384,9 @@ public abstract class Email implements E
* Set the port number of the outgoing mail server.
*
* @param aPortNumber aPortNumber
- * @return An Email.
* @since 1.0
*/
-public Email setSmtpPort(int aPortNumber)
+public void setSmtpPort(int aPortNumber)
{
checkSessionAlreadyInitialized();
@@ -411,7 +399,6 @@ public abstract class Email implements E
}
svn commit: r1290865 - /commons/proper/email/trunk/pom.xml
Author: sgoeschl Date: Sat Feb 18 20:55:41 2012 New Revision: 1290865 URL: http://svn.apache.org/viewvc?rev=1290865&view=rev Log: Providing the next release candidate Modified: commons/proper/email/trunk/pom.xml Modified: commons/proper/email/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/pom.xml?rev=1290865&r1=1290864&r2=1290865&view=diff == --- commons/proper/email/trunk/pom.xml (original) +++ commons/proper/email/trunk/pom.xml Sat Feb 18 20:55:41 2012 @@ -252,7 +252,7 @@ EMAIL 12310474 1.3 -RC2 +RC3 -bin
svn commit: r1290863 - /commons/proper/email/trunk/src/resources/META-INF/mime.types
Author: sgoeschl Date: Sat Feb 18 20:55:02 2012 New Revision: 1290863 URL: http://svn.apache.org/viewvc?rev=1290863&view=rev Log: Adding ASF license header Modified: commons/proper/email/trunk/src/resources/META-INF/mime.types Modified: commons/proper/email/trunk/src/resources/META-INF/mime.types URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/src/resources/META-INF/mime.types?rev=1290863&r1=1290862&r2=1290863&view=diff == --- commons/proper/email/trunk/src/resources/META-INF/mime.types (original) +++ commons/proper/email/trunk/src/resources/META-INF/mime.types Sat Feb 18 20:55:02 2012 @@ -1 +1,16 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + image/png png PNG
svn commit: r1290861 - /commons/proper/email/trunk/src/java/org/apache/commons/mail/Email.java
Author: sgoeschl
Date: Sat Feb 18 20:46:19 2012
New Revision: 1290861
URL: http://svn.apache.org/viewvc?rev=1290861&view=rev
Log:
[EMAIL-111] Providing binary compatibility for SSL/TLS handling (first part of
patch)
Modified:
commons/proper/email/trunk/src/java/org/apache/commons/mail/Email.java
Modified: commons/proper/email/trunk/src/java/org/apache/commons/mail/Email.java
URL:
http://svn.apache.org/viewvc/commons/proper/email/trunk/src/java/org/apache/commons/mail/Email.java?rev=1290861&r1=1290860&r2=1290861&view=diff
==
--- commons/proper/email/trunk/src/java/org/apache/commons/mail/Email.java
(original)
+++ commons/proper/email/trunk/src/java/org/apache/commons/mail/Email.java Sat
Feb 18 20:46:19 2012
@@ -157,14 +157,26 @@ public abstract class Email implements E
/** the password to log into the pop3 server */
protected String popPassword;
+/**
+ * Does server require TLS encryption for authentication?
+ * @deprecated since 1.3, use setStartTLSRequired() instead
+ */
+protected boolean tls;
+
+/**
+ * Does the current transport use SSL/TLS encryption upon connection?
+ * @deprecated since 1.3, use setSSLOnConnect() instead
+ */
+protected boolean ssl;
+
/** does client want STARTTLS encryption */
-protected boolean startTlsEnabled;
+private boolean startTlsEnabled;
/** does client require STARTTLS encryption */
-protected boolean startTlsRequired;
+private boolean startTlsRequired;
/** does the current transport use SSL/TLS encryption upon connection? */
-protected boolean sslOnConnect;
+private boolean sslOnConnect;
/** socket I/O timeout value in milliseconds */
protected int socketTimeout = SOCKET_TIMEOUT_MS;
@@ -325,7 +337,7 @@ public abstract class Email implements E
}
/**
- * Set the hostname of the outgoing mail server
+ * Set the hostname of the outgoing mail server.
*
* @param aHostName aHostName
* @return An Email.
@@ -340,9 +352,9 @@ public abstract class Email implements E
/**
* Set or disable the STARTTLS encryption. Please see EMAIL-105
- * for the reasons of deprecation.
+ * for the reasons of deprecation
*
- * @deprecated since 1.3
+ * @deprecated since 1.3, use setStartTLSEnabled() instead
* @param startTlsEnabled true if STARTTLS requested, false otherwise
* @return An Email.
* @since 1.1
@@ -362,11 +374,12 @@ public abstract class Email implements E
{
checkSessionAlreadyInitialized();
this.startTlsEnabled = startTlsEnabled;
+this.tls = startTlsEnabled;
return this;
}
/**
- * Set or disable the STARTTLS encryption.
+ * Set or disable the required STARTTLS encryption.
*
* @param startTlsRequired true if STARTTLS requested, false otherwise
* @return An Email.
@@ -510,15 +523,15 @@ public abstract class Email implements E
properties.setProperty(MAIL_HOST, this.hostName);
properties.setProperty(MAIL_DEBUG, String.valueOf(this.debug));
-properties.setProperty(MAIL_TRANSPORT_STARTTLS_ENABLE,
startTlsEnabled ? "true" : "false");
-properties.setProperty(MAIL_TRANSPORT_STARTTLS_REQUIRED,
startTlsRequired ? "true" : "false");
+properties.setProperty(MAIL_TRANSPORT_STARTTLS_ENABLE,
isStartTLSEnabled() ? "true" : "false");
+properties.setProperty(MAIL_TRANSPORT_STARTTLS_REQUIRED,
isStartTLSRequired() ? "true" : "false");
if (this.authenticator != null)
{
properties.setProperty(MAIL_SMTP_AUTH, "true");
}
-if (this.sslOnConnect || this.startTlsEnabled ||
this.startTlsRequired)
+if (isSSLOnConnect() || isStartTLSEnabled() ||
isStartTLSRequired())
{
properties.setProperty(MAIL_SMTP_SSL_SOCKET_FACTORY_PORT,
this.sslSmtpPort);
properties.setProperty(MAIL_SMTP_SSL_SOCKET_FACTORY_CLASS,
"javax.net.ssl.SSLSocketFactory");
@@ -526,7 +539,7 @@ public abstract class Email implements E
properties.put(MAIL_SMTP_SSL_CHECKSERVERIDENTITY,
Boolean.TRUE);
}
-if (this.sslOnConnect)
+if (isSSLOnConnect())
{
properties.put(MAIL_SMTP_SSL_ENABLE, Boolean.TRUE);
properties.setProperty(MAIL_PORT, this.sslSmtpPort);
@@ -1311,7 +1324,7 @@ public abstract class Email implements E
*/
public boolean isStartTLSEnabled()
{
-return this.startTlsEnabled;
+return this.startTlsEnabled || tls;
}
/**
@@ -1370,7 +1383,7 @@ public abstract class Email implements E
* Returns whether SSL/
svn commit: r1210358 - /commons/proper/email/trunk/pom.xml
Author: sgoeschl Date: Mon Dec 5 08:02:46 2011 New Revision: 1210358 URL: http://svn.apache.org/viewvc?rev=1210358&view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: commons/proper/email/trunk/pom.xml Modified: commons/proper/email/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/pom.xml?rev=1210358&r1=1210357&r2=1210358&view=diff == --- commons/proper/email/trunk/pom.xml (original) +++ commons/proper/email/trunk/pom.xml Mon Dec 5 08:02:46 2011 @@ -24,7 +24,7 @@ 4.0.0 org.apache.commons commons-email -1.3 +1.4-SNAPSHOT Commons Email 2001 @@ -41,9 +41,9 @@ - scm:svn:http://svn.apache.org/repos/asf/commons/proper/email/tags/EMAIL_1_3_RC2 - scm:svn:https://svn.apache.org/repos/asf/commons/proper/email/tags/EMAIL_1_3_RC2 - http://svn.apache.org/viewvc/commons/proper/email/tags/EMAIL_1_3_RC2 + scm:svn:http://svn.apache.org/repos/asf/commons/proper/email/trunk + scm:svn:https://svn.apache.org/repos/asf/commons/proper/email/trunk +http://svn.apache.org/viewvc/commons/proper/email/trunk
svn commit: r1210357 - /commons/proper/email/tags/EMAIL_1_3_RC2/
Author: sgoeschl Date: Mon Dec 5 08:02:39 2011 New Revision: 1210357 URL: http://svn.apache.org/viewvc?rev=1210357&view=rev Log: [maven-release-plugin] copy for tag EMAIL_1_3_RC2 Added: commons/proper/email/tags/EMAIL_1_3_RC2/ - copied from r1210356, commons/proper/email/trunk/
svn commit: r1210356 - /commons/proper/email/trunk/pom.xml
Author: sgoeschl Date: Mon Dec 5 08:02:29 2011 New Revision: 1210356 URL: http://svn.apache.org/viewvc?rev=1210356&view=rev Log: [maven-release-plugin] prepare release EMAIL_1_3_RC2 Modified: commons/proper/email/trunk/pom.xml Modified: commons/proper/email/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/pom.xml?rev=1210356&r1=1210355&r2=1210356&view=diff == --- commons/proper/email/trunk/pom.xml (original) +++ commons/proper/email/trunk/pom.xml Mon Dec 5 08:02:29 2011 @@ -24,7 +24,7 @@ 4.0.0 org.apache.commons commons-email -1.3-SNAPSHOT +1.3 Commons Email 2001 @@ -41,9 +41,9 @@ - scm:svn:http://svn.apache.org/repos/asf/commons/proper/email/trunk - scm:svn:https://svn.apache.org/repos/asf/commons/proper/email/trunk -http://svn.apache.org/viewvc/commons/proper/email/trunk + scm:svn:http://svn.apache.org/repos/asf/commons/proper/email/tags/EMAIL_1_3_RC2 + scm:svn:https://svn.apache.org/repos/asf/commons/proper/email/tags/EMAIL_1_3_RC2 + http://svn.apache.org/viewvc/commons/proper/email/tags/EMAIL_1_3_RC2
svn commit: r1210355 - /commons/proper/email/trunk/pom.xml
Author: sgoeschl Date: Mon Dec 5 08:01:04 2011 New Revision: 1210355 URL: http://svn.apache.org/viewvc?rev=1210355&view=rev Log: Rolling back after SVN issues Modified: commons/proper/email/trunk/pom.xml Modified: commons/proper/email/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/pom.xml?rev=1210355&r1=1210354&r2=1210355&view=diff == --- commons/proper/email/trunk/pom.xml (original) +++ commons/proper/email/trunk/pom.xml Mon Dec 5 08:01:04 2011 @@ -41,9 +41,9 @@ - scm:svn:http://svn.apache.org/repos/asf/commons/proper/email/tags/EMAIL_1_3 - scm:svn:https://svn.apache.org/repos/asf/commons/proper/email/tags/EMAIL_1_3 - http://svn.apache.org/viewvc/commons/proper/email/tags/EMAIL_1_3 + scm:svn:http://svn.apache.org/repos/asf/commons/proper/email/trunk + scm:svn:https://svn.apache.org/repos/asf/commons/proper/email/trunk +http://svn.apache.org/viewvc/commons/proper/email/trunk
svn commit: r1210353 - /commons/proper/email/trunk/pom.xml
Author: sgoeschl Date: Mon Dec 5 07:58:30 2011 New Revision: 1210353 URL: http://svn.apache.org/viewvc?rev=1210353&view=rev Log: [maven-release-plugin] rollback the release of EMAIL_1_3_RC2 Modified: commons/proper/email/trunk/pom.xml Modified: commons/proper/email/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/pom.xml?rev=1210353&r1=1210352&r2=1210353&view=diff == --- commons/proper/email/trunk/pom.xml (original) +++ commons/proper/email/trunk/pom.xml Mon Dec 5 07:58:30 2011 @@ -24,7 +24,7 @@ 4.0.0 org.apache.commons commons-email -1.3 +1.3-SNAPSHOT Commons Email 2001 @@ -41,9 +41,9 @@ - scm:svn:http://svn.apache.org/repos/asf/commons/proper/email/tags/EMAIL_1_3_RC2 - scm:svn:https://svn.apache.org/repos/asf/commons/proper/email/tags/EMAIL_1_3_RC2 - http://svn.apache.org/viewvc/commons/proper/email/tags/EMAIL_1_3_RC2 + scm:svn:http://svn.apache.org/repos/asf/commons/proper/email/tags/EMAIL_1_3 + scm:svn:https://svn.apache.org/repos/asf/commons/proper/email/tags/EMAIL_1_3 + http://svn.apache.org/viewvc/commons/proper/email/tags/EMAIL_1_3
svn commit: r1210351 - /commons/proper/email/trunk/pom.xml
Author: sgoeschl Date: Mon Dec 5 07:53:55 2011 New Revision: 1210351 URL: http://svn.apache.org/viewvc?rev=1210351&view=rev Log: [maven-release-plugin] prepare release EMAIL_1_3_RC2 Modified: commons/proper/email/trunk/pom.xml Modified: commons/proper/email/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/pom.xml?rev=1210351&r1=1210350&r2=1210351&view=diff == --- commons/proper/email/trunk/pom.xml (original) +++ commons/proper/email/trunk/pom.xml Mon Dec 5 07:53:55 2011 @@ -24,7 +24,7 @@ 4.0.0 org.apache.commons commons-email -1.3-SNAPSHOT +1.3 Commons Email 2001 @@ -41,9 +41,9 @@ - scm:svn:http://svn.apache.org/repos/asf/commons/proper/email/tags/EMAIL_1_3 - scm:svn:https://svn.apache.org/repos/asf/commons/proper/email/tags/EMAIL_1_3 - http://svn.apache.org/viewvc/commons/proper/email/tags/EMAIL_1_3 + scm:svn:http://svn.apache.org/repos/asf/commons/proper/email/tags/EMAIL_1_3_RC2 + scm:svn:https://svn.apache.org/repos/asf/commons/proper/email/tags/EMAIL_1_3_RC2 + http://svn.apache.org/viewvc/commons/proper/email/tags/EMAIL_1_3_RC2
svn commit: r1210350 - /commons/proper/email/trunk/pom.xml
Author: sgoeschl Date: Mon Dec 5 07:52:36 2011 New Revision: 1210350 URL: http://svn.apache.org/viewvc?rev=1210350&view=rev Log: Updating to newest common-parent Modified: commons/proper/email/trunk/pom.xml Modified: commons/proper/email/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/pom.xml?rev=1210350&r1=1210349&r2=1210350&view=diff == --- commons/proper/email/trunk/pom.xml (original) +++ commons/proper/email/trunk/pom.xml Mon Dec 5 07:52:36 2011 @@ -19,7 +19,7 @@ org.apache.commons commons-parent - 17 + 22 4.0.0 org.apache.commons
svn commit: r1210349 - /commons/proper/email/tags/EMAIL_1_3_RC1/
Author: sgoeschl Date: Mon Dec 5 07:51:26 2011 New Revision: 1210349 URL: http://svn.apache.org/viewvc?rev=1210349&view=rev Log: Deleting old RC tag Removed: commons/proper/email/tags/EMAIL_1_3_RC1/
svn commit: r1210263 - /commons/proper/email/trunk/pom.xml
Author: sgoeschl Date: Sun Dec 4 22:35:46 2011 New Revision: 1210263 URL: http://svn.apache.org/viewvc?rev=1210263&view=rev Log: [maven-release-plugin] rollback the release of EMAIL_1_3_RC2 Modified: commons/proper/email/trunk/pom.xml Modified: commons/proper/email/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/pom.xml?rev=1210263&r1=1210262&r2=1210263&view=diff == --- commons/proper/email/trunk/pom.xml (original) +++ commons/proper/email/trunk/pom.xml Sun Dec 4 22:35:46 2011 @@ -24,7 +24,7 @@ 4.0.0 org.apache.commons commons-email -1.3 +1.3-SNAPSHOT Commons Email 2001 @@ -41,9 +41,9 @@ - scm:svn:http://svn.apache.org/repos/asf/commons/proper/email/tags/EMAIL_1_3_RC2 - scm:svn:https://svn.apache.org/repos/asf/commons/proper/email/tags/EMAIL_1_3_RC2 - http://svn.apache.org/viewvc/commons/proper/email/tags/EMAIL_1_3_RC2 + scm:svn:http://svn.apache.org/repos/asf/commons/proper/email/tags/EMAIL_1_3 + scm:svn:https://svn.apache.org/repos/asf/commons/proper/email/tags/EMAIL_1_3 + http://svn.apache.org/viewvc/commons/proper/email/tags/EMAIL_1_3
svn commit: r1210260 - /commons/proper/email/trunk/pom.xml
Author: sgoeschl Date: Sun Dec 4 22:28:21 2011 New Revision: 1210260 URL: http://svn.apache.org/viewvc?rev=1210260&view=rev Log: [maven-release-plugin] prepare release EMAIL_1_3_RC2 Modified: commons/proper/email/trunk/pom.xml Modified: commons/proper/email/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/pom.xml?rev=1210260&r1=1210259&r2=1210260&view=diff == --- commons/proper/email/trunk/pom.xml (original) +++ commons/proper/email/trunk/pom.xml Sun Dec 4 22:28:21 2011 @@ -24,7 +24,7 @@ 4.0.0 org.apache.commons commons-email -1.3-SNAPSHOT +1.3 Commons Email 2001 @@ -41,9 +41,9 @@ - scm:svn:http://svn.apache.org/repos/asf/commons/proper/email/tags/EMAIL_1_3 - scm:svn:https://svn.apache.org/repos/asf/commons/proper/email/tags/EMAIL_1_3 - http://svn.apache.org/viewvc/commons/proper/email/tags/EMAIL_1_3 + scm:svn:http://svn.apache.org/repos/asf/commons/proper/email/tags/EMAIL_1_3_RC2 + scm:svn:https://svn.apache.org/repos/asf/commons/proper/email/tags/EMAIL_1_3_RC2 + http://svn.apache.org/viewvc/commons/proper/email/tags/EMAIL_1_3_RC2
svn commit: r1210259 - /commons/proper/email/trunk/pom.xml
Author: sgoeschl Date: Sun Dec 4 22:26:55 2011 New Revision: 1210259 URL: http://svn.apache.org/viewvc?rev=1210259&view=rev Log: SVN says we already have an RC 1 so upgrading to RC 2 Modified: commons/proper/email/trunk/pom.xml Modified: commons/proper/email/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/pom.xml?rev=1210259&r1=1210258&r2=1210259&view=diff == --- commons/proper/email/trunk/pom.xml (original) +++ commons/proper/email/trunk/pom.xml Sun Dec 4 22:26:55 2011 @@ -24,7 +24,7 @@ 4.0.0 org.apache.commons commons-email -1.3 +1.3-SNAPSHOT Commons Email 2001
svn commit: r1210258 - /commons/proper/email/trunk/pom.xml
Author: sgoeschl Date: Sun Dec 4 22:25:54 2011 New Revision: 1210258 URL: http://svn.apache.org/viewvc?rev=1210258&view=rev Log: SVN says we already have an RC 1 so upgrading to RC 2 Modified: commons/proper/email/trunk/pom.xml Modified: commons/proper/email/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/pom.xml?rev=1210258&r1=1210257&r2=1210258&view=diff == --- commons/proper/email/trunk/pom.xml (original) +++ commons/proper/email/trunk/pom.xml Sun Dec 4 22:25:54 2011 @@ -24,7 +24,7 @@ 4.0.0 org.apache.commons commons-email -1.3-SNAPSHOT +1.3 Commons Email 2001 @@ -41,9 +41,9 @@ - scm:svn:http://svn.apache.org/repos/asf/commons/proper/email/tags/EMAIL_1_3_RC2 - scm:svn:https://svn.apache.org/repos/asf/commons/proper/email/tags/EMAIL_1_3_RC2 - http://svn.apache.org/viewvc/commons/proper/email/tags/EMAIL_1_3_RC2 + scm:svn:http://svn.apache.org/repos/asf/commons/proper/email/tags/EMAIL_1_3 + scm:svn:https://svn.apache.org/repos/asf/commons/proper/email/tags/EMAIL_1_3 + http://svn.apache.org/viewvc/commons/proper/email/tags/EMAIL_1_3 @@ -252,7 +252,7 @@ EMAIL 12310474 1.3 -RC1 +RC2 -bin
svn commit: r1210257 - /commons/proper/email/trunk/pom.xml
Author: sgoeschl Date: Sun Dec 4 22:24:53 2011 New Revision: 1210257 URL: http://svn.apache.org/viewvc?rev=1210257&view=rev Log: [maven-release-plugin] rollback the release of EMAIL_1_3 Modified: commons/proper/email/trunk/pom.xml Modified: commons/proper/email/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/pom.xml?rev=1210257&r1=1210256&r2=1210257&view=diff == --- commons/proper/email/trunk/pom.xml (original) +++ commons/proper/email/trunk/pom.xml Sun Dec 4 22:24:53 2011 @@ -24,7 +24,7 @@ 4.0.0 org.apache.commons commons-email -1.3 +1.3-SNAPSHOT Commons Email 2001 @@ -41,9 +41,9 @@ - scm:svn:http://svn.apache.org/repos/asf/commons/proper/email/tags/EMAIL_1_3 - scm:svn:https://svn.apache.org/repos/asf/commons/proper/email/tags/EMAIL_1_3 - http://svn.apache.org/viewvc/commons/proper/email/tags/EMAIL_1_3 + scm:svn:http://svn.apache.org/repos/asf/commons/proper/email/tags/EMAIL_1_3_RC2 + scm:svn:https://svn.apache.org/repos/asf/commons/proper/email/tags/EMAIL_1_3_RC2 + http://svn.apache.org/viewvc/commons/proper/email/tags/EMAIL_1_3_RC2
svn commit: r1210256 - /commons/proper/email/trunk/pom.xml
Author: sgoeschl Date: Sun Dec 4 22:22:32 2011 New Revision: 1210256 URL: http://svn.apache.org/viewvc?rev=1210256&view=rev Log: [maven-release-plugin] prepare release EMAIL_1_3 Modified: commons/proper/email/trunk/pom.xml Modified: commons/proper/email/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/pom.xml?rev=1210256&r1=1210255&r2=1210256&view=diff == --- commons/proper/email/trunk/pom.xml (original) +++ commons/proper/email/trunk/pom.xml Sun Dec 4 22:22:32 2011 @@ -24,7 +24,7 @@ 4.0.0 org.apache.commons commons-email -1.3-SNAPSHOT +1.3 Commons Email 2001 @@ -41,9 +41,9 @@ - scm:svn:http://svn.apache.org/repos/asf/commons/proper/email/tags/EMAIL_1_3_RC2 - scm:svn:https://svn.apache.org/repos/asf/commons/proper/email/tags/EMAIL_1_3_RC2 - http://svn.apache.org/viewvc/commons/proper/email/tags/EMAIL_1_3_RC2 + scm:svn:http://svn.apache.org/repos/asf/commons/proper/email/tags/EMAIL_1_3 + scm:svn:https://svn.apache.org/repos/asf/commons/proper/email/tags/EMAIL_1_3 + http://svn.apache.org/viewvc/commons/proper/email/tags/EMAIL_1_3
svn commit: r1210255 - in /commons/proper/email/trunk/src/test/org/apache/commons/mail: InvalidAddressTest.java InvalidInternetAddressTest.java
Author: sgoeschl Date: Sun Dec 4 22:21:09 2011 New Revision: 1210255 URL: http://svn.apache.org/viewvc?rev=1210255&view=rev Log: Upgrading to mail-1.4.1 broke some code testing for invalid arguments Modified: commons/proper/email/trunk/src/test/org/apache/commons/mail/InvalidAddressTest.java commons/proper/email/trunk/src/test/org/apache/commons/mail/InvalidInternetAddressTest.java Modified: commons/proper/email/trunk/src/test/org/apache/commons/mail/InvalidAddressTest.java URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/src/test/org/apache/commons/mail/InvalidAddressTest.java?rev=1210255&r1=1210254&r2=1210255&view=diff == --- commons/proper/email/trunk/src/test/org/apache/commons/mail/InvalidAddressTest.java (original) +++ commons/proper/email/trunk/src/test/org/apache/commons/mail/InvalidAddressTest.java Sun Dec 4 22:21:09 2011 @@ -38,9 +38,8 @@ public class InvalidAddressTest extends "local:n...@domain.com", "local[n...@domain.com", "local]n...@domain.com", -"local\\n...@domain.com", - -// "local\"n...@domain.com", +// "local\\n...@domain.com", is considered valid for mail-1.4.1 +"local\"n...@domain.com", "local\tn...@domain.com", "local\nn...@domain.com", "local\rn...@domain.com", Modified: commons/proper/email/trunk/src/test/org/apache/commons/mail/InvalidInternetAddressTest.java URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/src/test/org/apache/commons/mail/InvalidInternetAddressTest.java?rev=1210255&r1=1210254&r2=1210255&view=diff == --- commons/proper/email/trunk/src/test/org/apache/commons/mail/InvalidInternetAddressTest.java (original) +++ commons/proper/email/trunk/src/test/org/apache/commons/mail/InvalidInternetAddressTest.java Sun Dec 4 22:21:09 2011 @@ -49,8 +49,8 @@ public class InvalidInternetAddressTest "local:n...@domain.com", "local[n...@domain.com", "local]n...@domain.com", -"local\\n...@domain.com", -"local\"n...@domain.com", +// "local\\n...@domain.com", -- works for javamail-1.4.4 +// "local\"n...@domain.com", -- works for javamail-1.4.4 "local\tn...@domain.com", "local\nn...@domain.com", "local\rn...@domain.com",
svn commit: r1210254 - /commons/proper/email/trunk/RELEASE-NOTES.txt
Author: sgoeschl Date: Sun Dec 4 22:12:03 2011 New Revision: 1210254 URL: http://svn.apache.org/viewvc?rev=1210254&view=rev Log: Preparing release Modified: commons/proper/email/trunk/RELEASE-NOTES.txt Modified: commons/proper/email/trunk/RELEASE-NOTES.txt URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/RELEASE-NOTES.txt?rev=1210254&r1=1210253&r2=1210254&view=diff == --- commons/proper/email/trunk/RELEASE-NOTES.txt (original) +++ commons/proper/email/trunk/RELEASE-NOTES.txt Sun Dec 4 22:12:03 2011 @@ -1,5 +1,5 @@ Commons Email Package - Version 1.2 + Version 1.3 Release Notes INTRODUCTION: @@ -24,40 +24,53 @@ CHANGES FROM 1.2: == New Features == -o Adding ImageHtmlEmail to create HTML emails with embedded images either - downloaded from HTTP or from the local file system. - Issue: EMAIL-92. Thanks to Dominik Stadler. +* HtmlmageEmail should support class path resources + Issue: EMAIL-108. Thanks to Elisabeth Kasimir, Alexander Kasimir. -o Added MimeMessageParser and MimeMessageUtils. +* Added a MultiPartEmail.attach(File) method since attaching a file is a simple and common. -== Misc == - -o Moving the various constants from 'EMail' to 'EmailConstants' +* Added MimeMessageParser and MimeMessageUtils. == Fixed Bugs == -o Throwing an IllegalStateException when setting mail session properties - for an already created mail session because the settings would be - ignored. Please note that this change could potentially break existing - (but invalid) code. Issue: EMAIL-96. - -o Encoding and folding of headers is now done by commons-email. - Issue: EMAIL-98. Thanks to Mario Daepp. - -o The default connection timeout is set to a reasonable default value of - 60 seconds. Issue: EMAIL-100. Thanks to David Parks. - -o All setters are returning "this" to simplify building an email. - Issue: EMAIL-76. Thanks to Yu Kobayashi. - -o Calling buildMimeMessage() before invoking send() caused duplicated - mime parts for HtmlEmail. The implementation now enforces that an email - can be only used once and throw an exception when multiple invocations of - buildMimeMessage() are detected. Issue: EMAIL-95. - -o Incorrect SMTP Port number shown in error message when an email fails - to send due to a blocked port and SSL is used. - Issue: EMAIL-91. Thanks to Kevin Lester. +* Added mime.types to META-INF - the definition is actually found in activation.jar + but did not work. Issue: EMAIL-107. Thanks to Claus Polanka, Michael Jakl. + +* STARTTLS can be used even without authenticator. Issue: EMAIL-106. Thanks to Bruno Harbulot. + +* Clarified the meaning of setTLS() which actually sends a "STARTTLS" command from the + client to the SMTP server. Please note that some "protected" variables were renamed + which could break existing code. Issue: EMAIL-105. Thanks to Bruno Harbulot. + +* Fixed HtmlEmail embed toLowerCase bug with Turkish locale. Issue: EMAIL-102. Thanks to Okan Özeren. + +* Specified Content-ID is now used when embedding a File object in an HtmlEmail. + Issue: EMAIL-101. Thanks to Andrew Starodub. + +* Restore Java 1.4 compatibility. + +* Throwing an IllegalStateException when setting mail session properties for an already + created mail session because the settings would be ignored. Please note that this + change could potentially break existing (but invalid) code. Issue: EMAIL-96. + +* Encoding and folding of headers is now done by commons-email. Issue: EMAIL-98. Thanks to Mario Daepp. + +* The default connection timeout is set to a reasonable default value of 60 seconds. Issue: EMAIL-100. Thanks to David Parks. + +* Moving the various constants from 'EMail' to 'EmailConstants' + +* All setters are returning "this" to simplify building an email. Issue: EMAIL-76. Thanks to Yu Kobayashi. + +* Adding ImageHtmlEmail to create HTML emails with embedded images either + downloaded from HTTP or from the local file system. Issue: EMAIL-92. Thanks to Dominik Stadler. + +* Calling buildMimeMessage() before invoking send() caused + duplicated mime parts for HtmlEmail. The implementation now enforces + that an email can be only used once and throw an exception when + multiple invocations of buildMimeMessage() are detected. Issue: EMAIL-95. + +* Incorrect SMTP Port number shown in error message when an email fails + to send due to a blocked port and SSL is used. Issue: EMAIL-91. Thanks to Kevin Lester. CHANGES FROM 1.1: @@ -142,7 +155,4 @@ Java 2 Enterprise Edition 1.4 users must JavaMail and JAF indicated above are available to their applications; the J2EE 1.4 specification only requires earlier versions. -Ear
svn commit: r1210253 - /commons/proper/email/trunk/src/changes/changes.xml
Author: sgoeschl Date: Sun Dec 4 22:10:14 2011 New Revision: 1210253 URL: http://svn.apache.org/viewvc?rev=1210253&view=rev Log: Cleaning up the code Modified: commons/proper/email/trunk/src/changes/changes.xml Modified: commons/proper/email/trunk/src/changes/changes.xml URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/src/changes/changes.xml?rev=1210253&r1=1210252&r2=1210253&view=diff == --- commons/proper/email/trunk/src/changes/changes.xml (original) +++ commons/proper/email/trunk/src/changes/changes.xml Sun Dec 4 22:10:14 2011 @@ -22,7 +22,7 @@ - + HtmlmageEmail should support class path resources
svn commit: r1210251 - /commons/proper/email/trunk/pom.xml
Author: sgoeschl Date: Sun Dec 4 22:09:07 2011 New Revision: 1210251 URL: http://svn.apache.org/viewvc?rev=1210251&view=rev Log: Upgrading to mail-1.4.4 and activation-1.1.1 Modified: commons/proper/email/trunk/pom.xml Modified: commons/proper/email/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/pom.xml?rev=1210251&r1=1210250&r2=1210251&view=diff == --- commons/proper/email/trunk/pom.xml (original) +++ commons/proper/email/trunk/pom.xml Sun Dec 4 22:09:07 2011 @@ -194,12 +194,12 @@ javax.mail mail -1.4.1 +1.4.4 javax.activation activation -1.1 +1.1.1 junit
svn commit: r1210249 - in /commons/proper/email/trunk/src/java/org/apache/commons/mail: Email.java resolver/DataSourceFileResolver.java
Author: sgoeschl
Date: Sun Dec 4 22:08:29 2011
New Revision: 1210249
URL: http://svn.apache.org/viewvc?rev=1210249&view=rev
Log:
Cleaning up the code
Modified:
commons/proper/email/trunk/src/java/org/apache/commons/mail/Email.java
commons/proper/email/trunk/src/java/org/apache/commons/mail/resolver/DataSourceFileResolver.java
Modified: commons/proper/email/trunk/src/java/org/apache/commons/mail/Email.java
URL:
http://svn.apache.org/viewvc/commons/proper/email/trunk/src/java/org/apache/commons/mail/Email.java?rev=1210249&r1=1210248&r2=1210249&view=diff
==
--- commons/proper/email/trunk/src/java/org/apache/commons/mail/Email.java
(original)
+++ commons/proper/email/trunk/src/java/org/apache/commons/mail/Email.java Sun
Dec 4 22:08:29 2011
@@ -159,7 +159,7 @@ public abstract class Email implements E
/** does client want STARTTLS encryption */
protected boolean startTlsEnabled;
-
+
/** does client require STARTTLS encryption */
protected boolean startTlsRequired;
@@ -351,7 +351,7 @@ public abstract class Email implements E
{
return setStartTLSEnabled(startTlsEnabled);
}
-
+
/**
* Set or disable the STARTTLS encryption.
*
@@ -364,7 +364,7 @@ public abstract class Email implements E
this.startTlsEnabled = startTlsEnabled;
return this;
}
-
+
/**
* Set or disable the STARTTLS encryption.
*
@@ -512,23 +512,23 @@ public abstract class Email implements E
properties.setProperty(MAIL_TRANSPORT_STARTTLS_ENABLE,
startTlsEnabled ? "true" : "false");
properties.setProperty(MAIL_TRANSPORT_STARTTLS_REQUIRED,
startTlsRequired ? "true" : "false");
-
+
if (this.authenticator != null)
{
properties.setProperty(MAIL_SMTP_AUTH, "true");
}
-
+
if (this.sslOnConnect || this.startTlsEnabled ||
this.startTlsRequired)
{
properties.setProperty(MAIL_SMTP_SSL_SOCKET_FACTORY_PORT,
this.sslSmtpPort);
properties.setProperty(MAIL_SMTP_SSL_SOCKET_FACTORY_CLASS,
"javax.net.ssl.SSLSocketFactory");
properties.setProperty(MAIL_SMTP_SOCKET_FACTORY_FALLBACK,
"false");
- properties.put(MAIL_SMTP_SSL_CHECKSERVERIDENTITY,
Boolean.TRUE);
+properties.put(MAIL_SMTP_SSL_CHECKSERVERIDENTITY,
Boolean.TRUE);
}
if (this.sslOnConnect)
{
- properties.put(MAIL_SMTP_SSL_ENABLE, Boolean.TRUE);
+properties.put(MAIL_SMTP_SSL_ENABLE, Boolean.TRUE);
properties.setProperty(MAIL_PORT, this.sslSmtpPort);
properties.setProperty(MAIL_SMTP_SOCKET_FACTORY_PORT,
this.sslSmtpPort);
properties.setProperty(MAIL_SMTP_SOCKET_FACTORY_CLASS,
"javax.net.ssl.SSLSocketFactory");
@@ -1293,7 +1293,7 @@ public abstract class Email implements E
}
return null;
}
-
+
/**
* Gets whether the client is configured to require STARTTLS.
*
@@ -1303,7 +1303,7 @@ public abstract class Email implements E
{
return this.startTlsRequired;
}
-
+
/**
* Gets whether the client is configured to try to enable STARTTLS.
*
@@ -1369,7 +1369,7 @@ public abstract class Email implements E
/**
* Returns whether SSL/TLS encryption for the transport is currently
enabled (SMTPS/POPS).
* See EMAIL-105 for reason of deprecation.
- *
+ *
* @deprecated since 1.3
* @return true if SSL enabled for the transport
*/
@@ -1377,17 +1377,17 @@ public abstract class Email implements E
{
return isSSLOnConnect();
}
-
+
/**
* Returns whether SSL/TLS encryption for the transport is currently
enabled (SMTPS/POPS).
- *
+ *
* @return true if SSL enabled for the transport
*/
public boolean isSSLOnConnect()
{
return sslOnConnect;
}
-
+
/**
* Sets whether SSL/TLS encryption should be enabled for the SMTP
transport upon connection (SMTPS/POPS).
* See EMAIL-105 for reason of deprecation.
Modified:
commons/proper/email/trunk/src/java/org/apache/commons/mail/resolver/DataSourceFileResolver.java
URL:
http://svn.apache.org/viewvc/commons/proper/email/trunk/src/java/org/apache/commons/mail/resolver/DataSourceFileResolver.java?rev=1210249&r1=1210248&r2=1210249&view=diff
==
---
commons/proper/email/trunk/src/java/org/apache/commons/mail/resolver/DataSourceFileResolver.java
(original)
+++
commons/proper/email/trunk/src/java/org/apache/commons/mail/resolver/DataSourceFileResolver.java
Sun De
svn commit: r1210236 - in /commons/proper/email/trunk: ./ src/java/org/apache/commons/mail/ src/java/org/apache/commons/mail/resolver/ src/java/org/apache/commons/mail/util/
Author: sgoeschl
Date: Sun Dec 4 21:44:00 2011
New Revision: 1210236
URL: http://svn.apache.org/viewvc?rev=1210236&view=rev
Log:
Cleaning up the code
Modified:
commons/proper/email/trunk/NOTICE.txt
commons/proper/email/trunk/pom.xml
commons/proper/email/trunk/src/java/org/apache/commons/mail/ImageHtmlEmail.java
commons/proper/email/trunk/src/java/org/apache/commons/mail/resolver/DataSourceClassPathResolver.java
commons/proper/email/trunk/src/java/org/apache/commons/mail/resolver/DataSourceFileResolver.java
commons/proper/email/trunk/src/java/org/apache/commons/mail/util/MimeMessageParser.java
Modified: commons/proper/email/trunk/NOTICE.txt
URL:
http://svn.apache.org/viewvc/commons/proper/email/trunk/NOTICE.txt?rev=1210236&r1=1210235&r2=1210236&view=diff
==
--- commons/proper/email/trunk/NOTICE.txt (original)
+++ commons/proper/email/trunk/NOTICE.txt Sun Dec 4 21:44:00 2011
@@ -1,5 +1,5 @@
Apache Commons Email
-Copyright 2001-2010 The Apache Software Foundation
+Copyright 2001-2011 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
Modified: commons/proper/email/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/email/trunk/pom.xml?rev=1210236&r1=1210235&r2=1210236&view=diff
==
--- commons/proper/email/trunk/pom.xml (original)
+++ commons/proper/email/trunk/pom.xml Sun Dec 4 21:44:00 2011
@@ -252,7 +252,7 @@
EMAIL
12310474
1.3
-RC2
+RC1
-bin
Modified:
commons/proper/email/trunk/src/java/org/apache/commons/mail/ImageHtmlEmail.java
URL:
http://svn.apache.org/viewvc/commons/proper/email/trunk/src/java/org/apache/commons/mail/ImageHtmlEmail.java?rev=1210236&r1=1210235&r2=1210236&view=diff
==
---
commons/proper/email/trunk/src/java/org/apache/commons/mail/ImageHtmlEmail.java
(original)
+++
commons/proper/email/trunk/src/java/org/apache/commons/mail/ImageHtmlEmail.java
Sun Dec 4 21:44:00 2011
@@ -37,7 +37,7 @@ import java.util.regex.Pattern;
* The image loading is done by an instance of DataSourceResolver
* which has to be provided by the caller.
*
- *
+ *
* @since 1.3
*/
public class ImageHtmlEmail extends HtmlEmail
Modified:
commons/proper/email/trunk/src/java/org/apache/commons/mail/resolver/DataSourceClassPathResolver.java
URL:
http://svn.apache.org/viewvc/commons/proper/email/trunk/src/java/org/apache/commons/mail/resolver/DataSourceClassPathResolver.java?rev=1210236&r1=1210235&r2=1210236&view=diff
==
---
commons/proper/email/trunk/src/java/org/apache/commons/mail/resolver/DataSourceClassPathResolver.java
(original)
+++
commons/proper/email/trunk/src/java/org/apache/commons/mail/resolver/DataSourceClassPathResolver.java
Sun Dec 4 21:44:00 2011
@@ -74,7 +74,7 @@ public class DataSourceClassPathResolver
String resourceName = getResourceName(resourceLocation);
InputStream is =
DataSourceClassPathResolver.class.getResourceAsStream(resourceName);
-if(is != null)
+if (is != null)
{
result = new ByteArrayDataSource(is, mimeType);
}
Modified:
commons/proper/email/trunk/src/java/org/apache/commons/mail/resolver/DataSourceFileResolver.java
URL:
http://svn.apache.org/viewvc/commons/proper/email/trunk/src/java/org/apache/commons/mail/resolver/DataSourceFileResolver.java?rev=1210236&r1=1210235&r2=1210236&view=diff
==
---
commons/proper/email/trunk/src/java/org/apache/commons/mail/resolver/DataSourceFileResolver.java
(original)
+++
commons/proper/email/trunk/src/java/org/apache/commons/mail/resolver/DataSourceFileResolver.java
Sun Dec 4 21:44:00 2011
@@ -85,7 +85,7 @@ public class DataSourceFileResolver exte
if (!file.isAbsolute())
{
-file = (getBaseDir() != null ? new File(getBaseDir(),
resourceLocation) : new File(resourceLocation));
+file = getBaseDir() != null ? new File(getBaseDir(),
resourceLocation) : new File(resourceLocation);
}
if (file.exists())
Modified:
commons/proper/email/trunk/src/java/org/apache/commons/mail/util/MimeMessageParser.java
URL:
http://svn.apache.org/viewvc/commons/proper/email/trunk/src/java/org/apache/commons/mail/util/MimeMessageParser.java?rev=1210236&r1=1210235&r2=1210236&view=diff
==
---
commons/proper/email/t
svn commit: r1200561 - /commons/proper/email/trunk/src/test/org/apache/commons/mail/resolver/DataSourceUrlResolverTest.java
Author: sgoeschl
Date: Thu Nov 10 21:24:10 2011
New Revision: 1200561
URL: http://svn.apache.org/viewvc?rev=1200561&view=rev
Log:
[EMAIL-108] Cleaned up the test
Modified:
commons/proper/email/trunk/src/test/org/apache/commons/mail/resolver/DataSourceUrlResolverTest.java
Modified:
commons/proper/email/trunk/src/test/org/apache/commons/mail/resolver/DataSourceUrlResolverTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/email/trunk/src/test/org/apache/commons/mail/resolver/DataSourceUrlResolverTest.java?rev=1200561&r1=1200560&r2=1200561&view=diff
==
---
commons/proper/email/trunk/src/test/org/apache/commons/mail/resolver/DataSourceUrlResolverTest.java
(original)
+++
commons/proper/email/trunk/src/test/org/apache/commons/mail/resolver/DataSourceUrlResolverTest.java
Thu Nov 10 21:24:10 2011
@@ -27,7 +27,7 @@ import java.io.InputStream;
import java.net.URL;
/**
- * JUnit test case for DateSourceResolver.
+ * JUnit test case for DataSourceUrlResolver.
*
* @since 1.3
*/
@@ -41,15 +41,26 @@ public class DataSourceUrlResolverTest e
super(name);
}
+/**
+ * Shows how the DataSourceUrlResolver can resolve files as well but this
should
+ * be done using a DataSourceFileResolver.
+ *
+ * @throws Exception the test failed
+ */
public void testResolvingFilesLenient() throws Exception
{
DataSourceResolver dataSourceResolver = new DataSourceUrlResolver(new
File("./src/test").toURI().toURL(), true);
assertTrue(toByteArray(dataSourceResolver.resolve("images/asf_logo_wide.gif")).length
== IMG_SIZE);
-
assertTrue(toByteArray(dataSourceResolver.resolve("/images/asf_logo_wide.gif")).length
== IMG_SIZE);
assertTrue(toByteArray(dataSourceResolver.resolve("./images/asf_logo_wide.gif")).length
== IMG_SIZE);
assertNull(dataSourceResolver.resolve("./images/does-not-exist.gif"));
+assertNull(dataSourceResolver.resolve("/images/asf_logo_wide.gif"));
}
+/**
+ * Tests resolving resources over HTTP.
+ *
+ * @throws Exception the test failed
+ */
public void testResolvingHttpLenient() throws Exception
{
DataSourceResolver dataSourceResolver = new DataSourceUrlResolver(new
URL("http://www.apache.org";), true);
@@ -60,24 +71,11 @@ public class DataSourceUrlResolverTest e
assertNull(toByteArray(dataSourceResolver.resolve("/images/does-not-exist.gif")));
}
-
-public void testResolvingClassPathNonLenient() throws Exception
-{
-DataSourceResolver dataSourceResolver = new DataSourceUrlResolver(new
File("./src/test").toURI().toURL());
-assertNotNull(dataSourceResolver.resolve("images/asf_logo_wide.gif"));
-
-try
-{
-dataSourceResolver.resolve("asf_logo_wide.gif");
-fail("Expecting an IOException");
-}
-catch(IOException e)
-{
-// expected
-return;
-}
-}
-
+/**
+ * Tests resolving resources over HTTP.
+ *
+ * @throws Exception the test failed
+ */
public void testResolvingHttpNonLenient() throws Exception
{
DataSourceResolver dataSourceResolver = new DataSourceUrlResolver(new
URL("http://www.apache.org";), false);
svn commit: r1200554 - in /commons/proper/email/trunk/src: java/org/apache/commons/mail/util/URLFactory.java test/org/apache/commons/mail/util/URLFactoryTest.java
Author: sgoeschl Date: Thu Nov 10 21:16:29 2011 New Revision: 1200554 URL: http://svn.apache.org/viewvc?rev=1200554&view=rev Log: [EMAIL-108] URLFactory is no longer needed since the functionality is now implemented in two different resolvers Removed: commons/proper/email/trunk/src/java/org/apache/commons/mail/util/URLFactory.java commons/proper/email/trunk/src/test/org/apache/commons/mail/util/URLFactoryTest.java
svn commit: r1181256 - in /commons/proper/exec/trunk/src: main/java/org/apache/commons/exec/CommandLine.java test/java/org/apache/commons/exec/CommandLineTest.java
Author: sgoeschl
Date: Mon Oct 10 21:47:27 2011
New Revision: 1181256
URL: http://svn.apache.org/viewvc?rev=1181256&view=rev
Log:
[EXEC-56] - Applied the patch from Nickolay Martinov to improve CommandLine
toString() for troubleshooting purposes
Modified:
commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/CommandLine.java
commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/CommandLineTest.java
Modified:
commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/CommandLine.java
URL:
http://svn.apache.org/viewvc/commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/CommandLine.java?rev=1181256&r1=1181255&r2=1181256&view=diff
==
---
commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/CommandLine.java
(original)
+++
commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/CommandLine.java
Mon Oct 10 21:47:27 2011
@@ -305,7 +305,7 @@ public class CommandLine {
* @return the command line as single string
*/
public String toString() {
-return StringUtils.toString(toStrings(), " ");
+return "[" + StringUtils.toString(toStrings(), ", ") + "]";
}
// --- Implementation ---
Modified:
commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/CommandLineTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/CommandLineTest.java?rev=1181256&r1=1181255&r2=1181256&view=diff
==
---
commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/CommandLineTest.java
(original)
+++
commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/CommandLineTest.java
Mon Oct 10 21:47:27 2011
@@ -37,7 +37,7 @@ public class CommandLineTest extends Tes
public void testExecutable() {
CommandLine cmdl = new CommandLine("test");
-assertEquals("test", cmdl.toString());
+assertEquals("[test]", cmdl.toString());
assertEquals(new String[] {"test"}, cmdl.toStrings());
assertEquals("test", cmdl.getExecutable());
assertTrue(cmdl.getArguments().length == 0);
@@ -75,7 +75,7 @@ public class CommandLineTest extends Tes
cmdl.addArgument("foo");
cmdl.addArgument("bar");
-assertEquals("test foo bar", cmdl.toString());
+assertEquals("[test, foo, bar]", cmdl.toString());
assertEquals(new String[] {"test", "foo", "bar"}, cmdl.toStrings());
}
@@ -83,7 +83,7 @@ public class CommandLineTest extends Tes
CommandLine cmdl = new CommandLine("test");
cmdl.addArgument(null);
-assertEquals("test", cmdl.toString());
+assertEquals("[test]", cmdl.toString());
assertEquals(new String[] {"test"}, cmdl.toStrings());
}
@@ -91,7 +91,7 @@ public class CommandLineTest extends Tes
CommandLine cmdl = new CommandLine("test");
cmdl.addArgument("foo");
cmdl.addArgument("ba r");
-assertEquals("test foo \"ba r\"", cmdl.toString());
+assertEquals("[test, foo, \"ba r\"]", cmdl.toString());
assertEquals(new String[] {"test", "foo", "\"ba r\""},
cmdl.toStrings());
}
@@ -99,7 +99,7 @@ public class CommandLineTest extends Tes
CommandLine cmdl = new CommandLine("test");
cmdl.addArgument("foo");
cmdl.addArgument("ba\"r");
-assertEquals("test foo 'ba\"r'", cmdl.toString());
+assertEquals("[test, foo, 'ba\"r']", cmdl.toString());
assertEquals(new String[] {"test", "foo", "'ba\"r'"},
cmdl.toStrings());
}
@@ -108,7 +108,7 @@ public class CommandLineTest extends Tes
cmdl.addArgument("\'foo\'");
cmdl.addArgument("\"bar\"");
cmdl.addArgument("\"fe z\"");
-assertEquals("test foo bar \"fe z\"", cmdl.toString());
+assertEquals("[test, foo, bar, \"fe z\"]", cmdl.toString());
assertEquals(new String[] {"test", "foo", "bar", "\"fe z\""},
cmdl.toStrings());
}
@@ -117,7 +117,7 @@ public class CommandLineTest extends Tes
cmdl.addArgument("foo");
cmdl.addArgument("ba'r");
-assertEquals("test foo \"ba'r\&q
svn commit: r1181251 - /commons/proper/exec/trunk/src/changes/changes.xml
Author: sgoeschl Date: Mon Oct 10 21:35:12 2011 New Revision: 1181251 URL: http://svn.apache.org/viewvc?rev=1181251&view=rev Log: [EXEX-57] - Applied the patch from Nickolay Martinov but the timeout disguises the fact that the process might be still runnung - therefore added a sanity check in order to throw an exception if the the timeout for join() was exceeded. Modified: commons/proper/exec/trunk/src/changes/changes.xml Modified: commons/proper/exec/trunk/src/changes/changes.xml URL: http://svn.apache.org/viewvc/commons/proper/exec/trunk/src/changes/changes.xml?rev=1181251&r1=1181250&r2=1181251&view=diff == --- commons/proper/exec/trunk/src/changes/changes.xml (original) +++ commons/proper/exec/trunk/src/changes/changes.xml Mon Oct 10 21:35:12 2011 @@ -24,6 +24,11 @@ + +Applied the patch from Nickolay Martinov but the timeout disguises the fact +that the process might be still runnung - therefore added a sanity check in +order to throw an exception if the the timeout for join() was exceeded. + Fixed dead lock by calling the timeout observers outside of the synchronized block thereby removing on pre-requisite of a deadlock. Also added a test case to demonstrate that this
svn commit: r1181250 - in /commons/proper/exec/trunk/src: main/java/org/apache/commons/exec/ test/java/org/apache/commons/exec/ test/scripts/
Author: sgoeschl
Date: Mon Oct 10 21:33:07 2011
New Revision: 1181250
URL: http://svn.apache.org/viewvc?rev=1181250&view=rev
Log:
[EXEX-57] - Applied the patch from Nickolay Martinov but the timeout disguises
the fact that the process might be still runnung - therefore added a sanity
check in order to throw an exception if the the timeout for join() was exceeded.
Added:
commons/proper/exec/trunk/src/test/scripts/invoker.sh (with props)
Modified:
commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/DefaultExecutor.java
commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/ExecuteStreamHandler.java
commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/PumpStreamHandler.java
commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/DefaultExecutorTest.java
Modified:
commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/DefaultExecutor.java
URL:
http://svn.apache.org/viewvc/commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/DefaultExecutor.java?rev=1181250&r1=1181249&r2=1181250&view=diff
==
---
commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/DefaultExecutor.java
(original)
+++
commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/DefaultExecutor.java
Mon Oct 10 21:33:07 2011
@@ -66,6 +66,9 @@ public class DefaultExecutor implements
/** worker thread for asynchronous execution */
private Thread executorThread;
+/** the first exception being caught to be thrown to the caller */
+private IOException exceptionCaught;
+
/**
* Default constructor creating a default PumpStreamHandler
* and sets the working directory of the subprocess to the current
@@ -81,6 +84,7 @@ public class DefaultExecutor implements
this.launcher = CommandLauncherFactory.createVMLauncher();
this.exitValues = new int[0];
this.workingDirectory = new File(".");
+this.exceptionCaught = null;
}
/**
@@ -279,50 +283,40 @@ public class DefaultExecutor implements
}
/**
- * Close the streams belonging to the given Process. In the
- * original implementation all exceptions were dropped which
- * is probably not a good thing. On the other hand the signature
- * allows throwing an IOException so the current implementation
- * might be quite okay.
- *
+ * Close the streams belonging to the given Process.
+ *
* @param process the Process.
- * @throws IOException closing one of the three streams failed
*/
-private void closeStreams(final Process process) throws IOException {
-
-IOException caught = null;
+private void closeProcessStreams(final Process process) {
try {
process.getInputStream().close();
}
catch(IOException e) {
-caught = e;
+setExceptionCaught(e);
}
try {
process.getOutputStream().close();
}
catch(IOException e) {
-caught = e;
+setExceptionCaught(e);
}
try {
process.getErrorStream().close();
}
catch(IOException e) {
-caught = e;
-}
-
-if(caught != null) {
-throw caught;
+setExceptionCaught(e);
}
}
/**
- * Execute an internal process.
+ * Execute an internal process. If the executing thread is interrupted
while waiting for the
+ * child process to return the child process will be killed.
*
* @param command the command to execute
- * @param environment the execution enviroment
+ * @param environment the execution environment
* @param dir the working directory
* @param streams process the streams (in, out, err) of the process
* @return the exit code of the process
@@ -331,6 +325,8 @@ public class DefaultExecutor implements
private int executeInternal(final CommandLine command, final Map
environment,
final File dir, final ExecuteStreamHandler streams) throws
IOException {
+setExceptionCaught(null);
+
final Process process = this.launch(command, environment, dir);
try {
@@ -375,8 +371,18 @@ public class DefaultExecutor implements
watchdog.stop();
}
-streams.stop();
-closeStreams(process);
+try {
+streams.stop();
+}
+catch(IOException e) {
+setExceptionCaught(e);
+}
+
+closeProcessStreams(process);
+
+if(getExceptionCaught() != null) {
+throw getExceptionCaught();
+}
if (watchdog != null) {
try {
@@ -400,4 +406,25 @@ public class DefaultExecutor implements
}
}
svn commit: r1180579 - in /commons/proper/exec/trunk/src: changes/changes.xml main/java/org/apache/commons/exec/Watchdog.java test/java/org/apache/commons/exec/DefaultExecutorTest.java
Author: sgoeschl
Date: Sun Oct 9 10:40:55 2011
New Revision: 1180579
URL: http://svn.apache.org/viewvc?rev=1180579&view=rev
Log:
[EXEX-60] - Fixed dead lock by calling the timeout observers outside of the
synchronized block
Modified:
commons/proper/exec/trunk/src/changes/changes.xml
commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/Watchdog.java
commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/DefaultExecutorTest.java
Modified: commons/proper/exec/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/commons/proper/exec/trunk/src/changes/changes.xml?rev=1180579&r1=1180578&r2=1180579&view=diff
==
--- commons/proper/exec/trunk/src/changes/changes.xml (original)
+++ commons/proper/exec/trunk/src/changes/changes.xml Sun Oct 9 10:40:55 2011
@@ -24,6 +24,11 @@
+
+Fixed dead lock by calling the timeout observers outside of
the synchronized block thereby
+removing on pre-requisite of a deadlock. Also added a test
case to demonstrate that this
+problem is fixed (which of course can not guarantee the
absence of a dead lock).
+
Set names for started threads.
Modified:
commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/Watchdog.java
URL:
http://svn.apache.org/viewvc/commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/Watchdog.java?rev=1180579&r1=1180578&r2=1180579&view=diff
==
---
commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/Watchdog.java
(original)
+++
commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/Watchdog.java
Sun Oct 9 10:40:55 2011
@@ -68,17 +68,26 @@ public class Watchdog implements Runnabl
notifyAll();
}
-public synchronized void run() {
-final long until = System.currentTimeMillis() + timeout;
-long now;
-while (!stopped && until > (now = System.currentTimeMillis())) {
-try {
-wait(until - now);
-} catch (InterruptedException e) {
-}
-}
-if (!stopped) {
-fireTimeoutOccured();
-}
-}
+public void run() {
+ final long until = System.currentTimeMillis() + timeout;
+ boolean isWaiting;
+ synchronized (this) {
+ long now = System.currentTimeMillis();
+ isWaiting = until > now;
+ while (!stopped && isWaiting) {
+ try {
+ wait(until - now);
+ } catch (InterruptedException e) {
+ }
+ now = System.currentTimeMillis();
+ isWaiting = until > now;
+ }
+ }
+
+ // notify the listeners outside of the synchronized block (see EXEC-60)
+ if (!isWaiting) {
+ fireTimeoutOccured();
+ }
+ }
+
}
Modified:
commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/DefaultExecutorTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/DefaultExecutorTest.java?rev=1180579&r1=1180578&r2=1180579&view=diff
==
---
commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/DefaultExecutorTest.java
(original)
+++
commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/DefaultExecutorTest.java
Sun Oct 9 10:40:55 2011
@@ -956,10 +956,10 @@ public class DefaultExecutorTest extends
// start an asynchronous process to enable the main thread
System.out.println("Preparing to execute process - commandLine=" +
cl.toString());
-DefaultExecuteResultHandler handler = new
DefaultExecuteResultHandler();
+DefaultExecuteResultHandler handler = new
DefaultExecuteResultHandler();
exec.execute(cl, handler);
System.out.println("Process spun off successfully - process=" +
cl.getExecutable());
-
+
int x;
PipedInputStream pis = new PipedInputStream(pipedOutputStream);
while ((x = pis.read()) >= 0) {
@@ -1010,8 +1010,46 @@ public class DefaultExecutorTest extends
}
pis.close();
-handler.waitFor();
+handler.waitFor();
+}
+}
+
+/**
+ * Test EXEC-60 (https://issues.apache.org/jira/browse/EXEC-60).
+ *
+ * Possible deadlock when a process is terminating at the same time its
timing out. Please
+ * note that a successful test is no proof that the issues was indeed
fixed.
+ *
+ * @throws Exception the test failed
+ */
+public void testExec_60() thr
svn commit: r1180482 - /commons/proper/exec/trunk/src/changes/changes.xml
Author: sgoeschl Date: Sat Oct 8 20:25:29 2011 New Revision: 1180482 URL: http://svn.apache.org/viewvc?rev=1180482&view=rev Log: Fixed some copy & pasta errors causing misleading version numbers - the next release will be 1.1.1 Modified: commons/proper/exec/trunk/src/changes/changes.xml Modified: commons/proper/exec/trunk/src/changes/changes.xml URL: http://svn.apache.org/viewvc/commons/proper/exec/trunk/src/changes/changes.xml?rev=1180482&r1=1180481&r2=1180482&view=diff == --- commons/proper/exec/trunk/src/changes/changes.xml (original) +++ commons/proper/exec/trunk/src/changes/changes.xml Sat Oct 8 20:25:29 2011 @@ -23,13 +23,14 @@ Siegfried Goeschl - + + +Set names for started threads. + -Tests fail on HP-UX, because it uses a different syntax for the ping command +Tests fail on HP-UX, because it uses a different syntax for the ping command. - - - + "Write dead end" IOException when using Piped streams w/PumpStreamHandler. When encountering a PipedOutputStream we will automatically close it to avoid the exception.
svn commit: r1165862 - in /commons/proper/email/trunk/src/test/images: contentTypeTest.gif contentTypeTest.jpg contentTypeTest.png
Author: sgoeschl Date: Tue Sep 6 21:26:52 2011 New Revision: 1165862 URL: http://svn.apache.org/viewvc?rev=1165862&view=rev Log: [EMAIL-107] Added mime.types to META-INF - thanks to Claus Polanka, Michael Jakl and the first Austrian Hackergarden. Added: commons/proper/email/trunk/src/test/images/contentTypeTest.gif (with props) commons/proper/email/trunk/src/test/images/contentTypeTest.jpg (with props) commons/proper/email/trunk/src/test/images/contentTypeTest.png (with props) Added: commons/proper/email/trunk/src/test/images/contentTypeTest.gif URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/src/test/images/contentTypeTest.gif?rev=1165862&view=auto == Binary file - no diff available. Propchange: commons/proper/email/trunk/src/test/images/contentTypeTest.gif -- svn:mime-type = application/octet-stream Added: commons/proper/email/trunk/src/test/images/contentTypeTest.jpg URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/src/test/images/contentTypeTest.jpg?rev=1165862&view=auto == Binary file - no diff available. Propchange: commons/proper/email/trunk/src/test/images/contentTypeTest.jpg -- svn:mime-type = application/octet-stream Added: commons/proper/email/trunk/src/test/images/contentTypeTest.png URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/src/test/images/contentTypeTest.png?rev=1165862&view=auto == Binary file - no diff available. Propchange: commons/proper/email/trunk/src/test/images/contentTypeTest.png -- svn:mime-type = application/octet-stream
svn commit: r1165861 - in /commons/proper/email/trunk: ./ src/changes/ src/resources/ src/resources/META-INF/ src/test/org/apache/commons/mail/
Author: sgoeschl
Date: Tue Sep 6 21:26:21 2011
New Revision: 1165861
URL: http://svn.apache.org/viewvc?rev=1165861&view=rev
Log:
[EMAIL-107] Added mime.types to META-INF - thanks to Claus Polanka, Michael
Jakl and the first Austrian Hackergarden.
Added:
commons/proper/email/trunk/src/resources/
commons/proper/email/trunk/src/resources/META-INF/
commons/proper/email/trunk/src/resources/META-INF/mime.types
Modified:
commons/proper/email/trunk/pom.xml
commons/proper/email/trunk/src/changes/changes.xml
commons/proper/email/trunk/src/test/org/apache/commons/mail/EmailTest.java
commons/proper/email/trunk/src/test/org/apache/commons/mail/HtmlEmailTest.java
Modified: commons/proper/email/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/email/trunk/pom.xml?rev=1165861&r1=1165860&r2=1165861&view=diff
==
--- commons/proper/email/trunk/pom.xml (original)
+++ commons/proper/email/trunk/pom.xml Tue Sep 6 21:26:21 2011
@@ -258,6 +258,11 @@
src/java
+
+
+src/resources
+
+
src/test
Modified: commons/proper/email/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/commons/proper/email/trunk/src/changes/changes.xml?rev=1165861&r1=1165860&r2=1165861&view=diff
==
--- commons/proper/email/trunk/src/changes/changes.xml (original)
+++ commons/proper/email/trunk/src/changes/changes.xml Tue Sep 6 21:26:21 2011
@@ -23,6 +23,10 @@
+
+ Added mime.types to META-INF - the definition is actually found in
activation.jar
+ but did not work.
+
STARTTLS can be used even without authenticator.
Added: commons/proper/email/trunk/src/resources/META-INF/mime.types
URL:
http://svn.apache.org/viewvc/commons/proper/email/trunk/src/resources/META-INF/mime.types?rev=1165861&view=auto
==
--- commons/proper/email/trunk/src/resources/META-INF/mime.types (added)
+++ commons/proper/email/trunk/src/resources/META-INF/mime.types Tue Sep 6
21:26:21 2011
@@ -0,0 +1 @@
+image/png png PNG
Modified:
commons/proper/email/trunk/src/test/org/apache/commons/mail/EmailTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/email/trunk/src/test/org/apache/commons/mail/EmailTest.java?rev=1165861&r1=1165860&r2=1165861&view=diff
==
--- commons/proper/email/trunk/src/test/org/apache/commons/mail/EmailTest.java
(original)
+++ commons/proper/email/trunk/src/test/org/apache/commons/mail/EmailTest.java
Tue Sep 6 21:26:21 2011
@@ -16,6 +16,7 @@
*/
package org.apache.commons.mail;
+import java.io.File;
import java.io.UnsupportedEncodingException;
import java.nio.charset.Charset;
import java.nio.charset.IllegalCharsetNameException;
@@ -27,14 +28,12 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Properties;
-
import javax.mail.Authenticator;
import javax.mail.Session;
import javax.mail.internet.InternetAddress;
import javax.mail.internet.MimeMessage;
import javax.mail.internet.MimeMultipart;
import javax.mail.internet.ParseException;
-
import org.apache.commons.mail.mocks.MockEmailConcrete;
/**
@@ -355,9 +354,9 @@ public class EmailTest extends BaseEmail
"joe@apache.org",
"joe@apache.org"));
arrExpected.add(
-new InternetAddress(
-"someone_h...@work-address.com.au",
-"someone_h...@work-address.com.au"));
+new InternetAddress(
+"someone_h...@work-address.com.au",
+"someone_h...@work-address.com.au"));
for (int i = 0; i < testEmails.length; i++)
{
@@ -1320,18 +1319,18 @@ public class EmailTest extends BaseEmail
testInetEmailValid.add(new InternetAddress("m...@home.com", "Name1"));
testInetEmailValid.add(
-new InternetAddress(
-"joe@apache.org",
-"joe@apache.org"));
+new InternetAddress(
+"joe@apache.org",
+"joe@apache.org"));
testInetEmailValid.add(
-new InternetAddress(
-"someone_h...@work-address.com.au",
-"someone_h...@work-address.com.au"));
+new InternetAddress(
+"someone_h...@work-address.com.au",
+
svn commit: r1165830 - in /commons/proper/email/trunk/src: changes/ java/org/apache/commons/mail/ site/xdoc/ test/org/apache/commons/mail/ test/org/apache/commons/mail/settings/
Author: sgoeschl
Date: Tue Sep 6 20:34:43 2011
New Revision: 1165830
URL: http://svn.apache.org/viewvc?rev=1165830&view=rev
Log:
[EMAIL-105][EMAIL-106] Clarified the meaning of setTLS() which actually sends a
"STARTTLS" command from the client to the SMTP server. Please note that some
"protected" variables were renamed which could break existing code.
Modified:
commons/proper/email/trunk/src/changes/changes.xml
commons/proper/email/trunk/src/java/org/apache/commons/mail/Email.java
commons/proper/email/trunk/src/java/org/apache/commons/mail/EmailConstants.java
commons/proper/email/trunk/src/site/xdoc/userguide.xml
commons/proper/email/trunk/src/test/org/apache/commons/mail/EmailLiveTest.java
commons/proper/email/trunk/src/test/org/apache/commons/mail/settings/EmailConfiguration.java
Modified: commons/proper/email/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/commons/proper/email/trunk/src/changes/changes.xml?rev=1165830&r1=1165829&r2=1165830&view=diff
==
--- commons/proper/email/trunk/src/changes/changes.xml (original)
+++ commons/proper/email/trunk/src/changes/changes.xml Tue Sep 6 20:34:43 2011
@@ -23,6 +23,14 @@
+
+ STARTTLS can be used even without authenticator.
+
+
+Clarified the meaning of setTLS() which actually sends a "STARTTLS"
command from the
+client to the SMTP server. Please note that some "protected" variables
were renamed
+which could break existing code.
+
Fixed HtmlEmail embed toLowerCase bug with Turkish locale.
Modified: commons/proper/email/trunk/src/java/org/apache/commons/mail/Email.java
URL:
http://svn.apache.org/viewvc/commons/proper/email/trunk/src/java/org/apache/commons/mail/Email.java?rev=1165830&r1=1165829&r2=1165830&view=diff
==
--- commons/proper/email/trunk/src/java/org/apache/commons/mail/Email.java
(original)
+++ commons/proper/email/trunk/src/java/org/apache/commons/mail/Email.java Tue
Sep 6 20:34:43 2011
@@ -157,11 +157,14 @@ public abstract class Email implements E
/** the password to log into the pop3 server */
protected String popPassword;
-/** does server require TLS encryption for authentication */
-protected boolean tls;
+/** does client want STARTTLS encryption */
+protected boolean startTlsEnabled;
+
+/** does client require STARTTLS encryption */
+protected boolean startTlsRequired;
-/** does the current transport use SSL encryption? */
-protected boolean ssl;
+/** does the current transport use SSL/TLS encryption upon connection? */
+protected boolean sslOnConnect;
/** socket I/O timeout value in milliseconds */
protected int socketTimeout = SOCKET_TIMEOUT_MS;
@@ -196,7 +199,7 @@ public abstract class Email implements E
* @param password password for the SMTP server
* @return An Email.
* @see DefaultAuthenticator
- * @see #setAuthenticator
+ * @see #setAuthenticator(Authenticator)
* @since 1.0
*/
public Email setAuthentication(String userName, String password)
@@ -336,16 +339,42 @@ public abstract class Email implements E
}
/**
- * Set or disable the TLS encryption
+ * Set or disable the STARTTLS encryption. Please see EMAIL-105
+ * for the reasons of deprecation.
*
- * @param withTLS true if TLS needed, false otherwise
+ * @deprecated since 1.3
+ * @param startTlsEnabled true if STARTTLS requested, false otherwise
* @return An Email.
* @since 1.1
*/
-public Email setTLS(boolean withTLS)
+public Email setTLS(boolean startTlsEnabled)
+{
+return setStartTLSEnabled(startTlsEnabled);
+}
+
+/**
+ * Set or disable the STARTTLS encryption.
+ *
+ * @param startTlsEnabled true if STARTTLS requested, false otherwise
+ * @return An Email.
+ */
+public Email setStartTLSEnabled(boolean startTlsEnabled)
{
checkSessionAlreadyInitialized();
-this.tls = withTLS;
+this.startTlsEnabled = startTlsEnabled;
+return this;
+}
+
+/**
+ * Set or disable the STARTTLS encryption.
+ *
+ * @param startTlsRequired true if STARTTLS requested, false otherwise
+ * @return An Email.
+ */
+public Email setStartTLSRequired(boolean startTlsRequired)
+{
+checkSessionAlreadyInitialized();
+this.startTlsRequired = startTlsRequired;
return this;
}
@@ -481,14 +510,25 @@ public abstract class Email implements E
properties.setProperty(MAIL_HOST, this.hostName);
properties.setProperty(MAIL_DEBUG, String.valueOf(this.debug));
+properties.setPropert
svn commit: r1165410 - /commons/proper/email/trunk/
Author: sgoeschl Date: Mon Sep 5 20:25:09 2011 New Revision: 1165410 URL: http://svn.apache.org/viewvc?rev=1165410&view=rev Log: Ignoring IntelliJ project files Modified: commons/proper/email/trunk/ (props changed) Propchange: commons/proper/email/trunk/ -- --- svn:ignore (original) +++ svn:ignore Mon Sep 5 20:25:09 2011 @@ -16,3 +16,6 @@ junit*.properties dist cobertura.ser .settings +commons-email.iml +commons-email.ipr +commons-email.iws
svn commit: r1165409 - in /commons/proper/email/trunk/src: java/org/apache/commons/mail/util/ test/eml/ test/org/apache/commons/mail/util/
Author: sgoeschl
Date: Mon Sep 5 20:22:09 2011
New Revision: 1165409
URL: http://svn.apache.org/viewvc?rev=1165409&view=rev
Log:
Added more tests for MimeMessageParser since real-world usage was cruel to my
code
Added:
commons/proper/email/trunk/src/test/eml/attachment-only.eml
commons/proper/email/trunk/src/test/eml/multipart-report.eml
commons/proper/email/trunk/src/test/eml/simple-reply.eml
Modified:
commons/proper/email/trunk/src/java/org/apache/commons/mail/util/MimeMessageParser.java
commons/proper/email/trunk/src/test/org/apache/commons/mail/util/MimeMessageParserTest.java
Modified:
commons/proper/email/trunk/src/java/org/apache/commons/mail/util/MimeMessageParser.java
URL:
http://svn.apache.org/viewvc/commons/proper/email/trunk/src/java/org/apache/commons/mail/util/MimeMessageParser.java?rev=1165409&r1=1165408&r2=1165409&view=diff
==
---
commons/proper/email/trunk/src/java/org/apache/commons/mail/util/MimeMessageParser.java
(original)
+++
commons/proper/email/trunk/src/java/org/apache/commons/mail/util/MimeMessageParser.java
Mon Sep 5 20:22:09 2011
@@ -21,6 +21,7 @@ import javax.activation.DataSource;
import javax.mail.Message;
import javax.mail.MessagingException;
import javax.mail.Multipart;
+import javax.mail.Part;
import javax.mail.internet.InternetAddress;
import javax.mail.internet.MimeBodyPart;
import javax.mail.internet.MimeMessage;
@@ -32,9 +33,9 @@ import java.io.BufferedOutputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Collection;
import java.util.List;
/**
@@ -88,7 +89,7 @@ public class MimeMessageParser
* @return the 'to' recipents of the message
* @throws Exception determining the recipients failed
*/
-public Collection getTo() throws Exception
+public List getTo() throws Exception
{
javax.mail.Address[] recipients =
this.mimeMessage.getRecipients(Message.RecipientType.TO);
return recipients != null ? Arrays.asList(recipients) : new
ArrayList();
@@ -98,7 +99,7 @@ public class MimeMessageParser
* @return the 'cc' recipents of the message
* @throws Exception determining the recipients failed
*/
-public Collection getCc() throws Exception
+public List getCc() throws Exception
{
javax.mail.Address[] recipients =
this.mimeMessage.getRecipients(Message.RecipientType.CC);
return recipients != null ? Arrays.asList(recipients) : new
ArrayList();
@@ -108,7 +109,7 @@ public class MimeMessageParser
* @return the 'bcc' recipents of the message
* @throws Exception determining the recipients failed
*/
-public Collection getBcc() throws Exception
+public List getBcc() throws Exception
{
javax.mail.Address[] recipients =
this.mimeMessage.getRecipients(Message.RecipientType.BCC);
return recipients != null ? Arrays.asList(recipients) : new
ArrayList();
@@ -204,8 +205,8 @@ public class MimeMessageParser
/**
* Parses the MimePart to create a DataSource.
*
- * @param parent the parent MultiPart
- * @param part the part to be processed
+ * @param parent the parent multi-part
+ * @param part the current part to be processed
* @return the DataSource
* @throws MessagingException creating the DataSource failed
* @throws IOExceptioncreating the DataSource failed
@@ -218,7 +219,7 @@ public class MimeMessageParser
String contentType = getBaseMimeType(dataSource.getContentType());
byte[] content = this.getContent(dataSource.getInputStream());
ByteArrayDataSource result = new ByteArrayDataSource(content,
contentType);
-String dataSourceName = MimeUtility.decodeText(dataSource.getName());
+String dataSourceName = getDataSourceName(part, dataSource);
result.setName(dataSourceName);
return result;
@@ -295,6 +296,37 @@ public class MimeMessageParser
}
/**
+ * Determines the name of the data source if it is not already set.
+ *
+ * @param part the mail part
+ * @param dataSource the data source
+ * @return the name of the data source or null if no name can be
determined
+ * @throws MessagingException accessing the part failed
+ * @throws UnsupportedEncodingException decoding the text failed
+ */
+protected String getDataSourceName(Part part, DataSource dataSource)
+throws MessagingException, UnsupportedEncodingException
+{
+String result = dataSource.getName();
+
+if(result == null || result.length() == 0)
+{
+result = part.getFileName();
+}
+
+if(result != null && result.length() > 0
svn commit: r1165408 - /commons/proper/email/trunk/src/test/org/apache/commons/mail/MultiPartEmailTest.java
Author: sgoeschl
Date: Mon Sep 5 20:17:52 2011
New Revision: 1165408
URL: http://svn.apache.org/viewvc?rev=1165408&view=rev
Log:
Fixing typo in comment
Modified:
commons/proper/email/trunk/src/test/org/apache/commons/mail/MultiPartEmailTest.java
Modified:
commons/proper/email/trunk/src/test/org/apache/commons/mail/MultiPartEmailTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/email/trunk/src/test/org/apache/commons/mail/MultiPartEmailTest.java?rev=1165408&r1=1165407&r2=1165408&view=diff
==
---
commons/proper/email/trunk/src/test/org/apache/commons/mail/MultiPartEmailTest.java
(original)
+++
commons/proper/email/trunk/src/test/org/apache/commons/mail/MultiPartEmailTest.java
Mon Sep 5 20:17:52 2011
@@ -40,7 +40,7 @@ public class MultiPartEmailTest extends
{
/** */
private MockMultiPartEmailConcrete email;
-/** File to used to test file attachmetns (Must be valid) */
+/** File to used to test file attachments (Must be valid) */
private File testFile;
/**
svn commit: r1163984 - in /commons/proper/commons-site/trunk/src/site: site.xml xdoc/components.xml xdoc/index.xml
Author: sgoeschl Date: Thu Sep 1 10:24:49 2011 New Revision: 1163984 URL: http://svn.apache.org/viewvc?rev=1163984&view=rev Log: Adding OGNL as commons-proper component to site Modified: commons/proper/commons-site/trunk/src/site/site.xml commons/proper/commons-site/trunk/src/site/xdoc/components.xml commons/proper/commons-site/trunk/src/site/xdoc/index.xml Modified: commons/proper/commons-site/trunk/src/site/site.xml URL: http://svn.apache.org/viewvc/commons/proper/commons-site/trunk/src/site/site.xml?rev=1163984&r1=1163983&r2=1163984&view=diff == --- commons/proper/commons-site/trunk/src/site/site.xml (original) +++ commons/proper/commons-site/trunk/src/site/site.xml Thu Sep 1 10:24:49 2011 @@ -76,6 +76,7 @@ + Modified: commons/proper/commons-site/trunk/src/site/xdoc/components.xml URL: http://svn.apache.org/viewvc/commons/proper/commons-site/trunk/src/site/xdoc/components.xml?rev=1163984&r1=1163983&r2=1163984&view=diff == --- commons/proper/commons-site/trunk/src/site/xdoc/components.xml (original) +++ commons/proper/commons-site/trunk/src/site/xdoc/components.xml Thu Sep 1 10:24:49 2011 @@ -99,6 +99,8 @@ Mechanisms to create Model MBeans compatible with JMX specification. Net Collection of network utilities and protocol implementations. +OGNL +An Object-Graph Navigation Language Pool Generic object pooling component. Primitives Modified: commons/proper/commons-site/trunk/src/site/xdoc/index.xml URL: http://svn.apache.org/viewvc/commons/proper/commons-site/trunk/src/site/xdoc/index.xml?rev=1163984&r1=1163983&r2=1163984&view=diff == --- commons/proper/commons-site/trunk/src/site/xdoc/index.xml (original) +++ commons/proper/commons-site/trunk/src/site/xdoc/index.xml Thu Sep 1 10:24:49 2011 @@ -143,6 +143,8 @@ Mechanisms to create Model MBeans compatible with JMX specification. Net Collection of network utilities and protocol implementations. +OGNL +An Object-Graph Navigation Language Pool Generic object pooling component. Primitives
svn commit: r1072869 - in /commons/proper/exec/trunk/src: main/java/org/apache/commons/exec/DefaultExecutor.java main/java/org/apache/commons/exec/PumpStreamHandler.java test/java/org/apache/commons/e
Author: sgoeschl
Date: Mon Feb 21 07:30:50 2011
New Revision: 1072869
URL: http://svn.apache.org/viewvc?rev=1072869&view=rev
Log:
[EXEC-55] Set names for started threads and provide factory methods for thread
creation
Modified:
commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/DefaultExecutor.java
commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/PumpStreamHandler.java
commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/DefaultExecutorTest.java
Modified:
commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/DefaultExecutor.java
URL:
http://svn.apache.org/viewvc/commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/DefaultExecutor.java?rev=1072869&r1=1072868&r2=1072869&view=diff
==
---
commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/DefaultExecutor.java
(original)
+++
commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/DefaultExecutor.java
Mon Feb 21 07:30:50 2011
@@ -181,10 +181,12 @@ public class DefaultExecutor implements
throw new IOException(workingDirectory + " doesn't exist.");
}
-executorThread = new Thread() {
-public void run() {
+Runnable runnable = new Runnable()
+{
+public void run()
+{
int exitValue = Executor.INVALID_EXITVALUE;
-try {
+try {
exitValue = executeInternal(command, environment,
workingDirectory, streamHandler);
handler.onProcessComplete(exitValue);
} catch (ExecuteException e) {
@@ -195,6 +197,7 @@ public class DefaultExecutor implements
}
};
+this.executorThread = createThread(runnable, "Exec Default Executor");
getExecutorThread().start();
}
@@ -229,6 +232,18 @@ public class DefaultExecutor implements
}
/**
+ * Factory method to create a thread waiting for the result of an
+ * asynchronous execution.
+ *
+ * @param runnable the runnable passed to the thread
+ * @param name the name of the thread
+ * @return the thread
+ */
+protected Thread createThread(Runnable runnable, String name) {
+return new Thread(runnable, name);
+}
+
+/**
* Creates a process that runs a command.
*
* @param command
Modified:
commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/PumpStreamHandler.java
URL:
http://svn.apache.org/viewvc/commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/PumpStreamHandler.java?rev=1072869&r1=1072868&r2=1072869&view=diff
==
---
commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/PumpStreamHandler.java
(original)
+++
commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/PumpStreamHandler.java
Mon Feb 21 07:30:50 2011
@@ -284,12 +284,11 @@ public class PumpStreamHandler implement
protected Thread createPump(final InputStream is, final OutputStream os,
final boolean closeWhenExhausted) {
final Thread result = new Thread(new StreamPumper(is, os,
-closeWhenExhausted));
+closeWhenExhausted), "Exec Stream Pumper");
result.setDaemon(true);
return result;
}
-
/**
* Creates a stream pumper to copy the given input stream to the given
* output stream.
@@ -300,7 +299,7 @@ public class PumpStreamHandler implement
*/
private Thread createSystemInPump(InputStream is, OutputStream os) {
inputStreamPumper = new InputStreamPumper(is, os);
-final Thread result = new Thread(inputStreamPumper);
+final Thread result = new Thread(inputStreamPumper, "Exec Input Stream
Pumper");
result.setDaemon(true);
return result;
}
Modified:
commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/DefaultExecutorTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/DefaultExecutorTest.java?rev=1072869&r1=1072868&r2=1072869&view=diff
==
---
commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/DefaultExecutorTest.java
(original)
+++
commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/DefaultExecutorTest.java
Mon Feb 21 07:30:50 2011
@@ -598,7 +598,6 @@ public class DefaultExecutorTest extends
String environment = baos.toString().trim();
assertTrue("Found no environment variables", environment.length() > 0);
assertFalse(environment.indexOf("NEW_VAR") >= 0);
-System.out.println(
svn commit: r1055549 - /commons/proper/email/trunk/src/test/org/apache/commons/mail/HtmlEmailTest.java
Author: sgoeschl
Date: Wed Jan 5 17:38:39 2011
New Revision: 1055549
URL: http://svn.apache.org/viewvc?rev=1055549&view=rev
Log:
[EMAIL-101] Rolling back the changes because the patch breaks real emails and
disabled the test
Modified:
commons/proper/email/trunk/src/test/org/apache/commons/mail/HtmlEmailTest.java
Modified:
commons/proper/email/trunk/src/test/org/apache/commons/mail/HtmlEmailTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/email/trunk/src/test/org/apache/commons/mail/HtmlEmailTest.java?rev=1055549&r1=1055548&r2=1055549&view=diff
==
---
commons/proper/email/trunk/src/test/org/apache/commons/mail/HtmlEmailTest.java
(original)
+++
commons/proper/email/trunk/src/test/org/apache/commons/mail/HtmlEmailTest.java
Wed Jan 5 17:38:39 2011
@@ -619,9 +619,12 @@ public class HtmlEmailTest extends BaseE
* Test that the specified Content-ID is used when embedding a File
* object in an HtmlEmail.
*
+ * Rolled back the changes since they broke real emails therefore
+ * the test is currently disabled.
+ *
* see https://issues.apache.org/jira/browse/EMAIL-101
*/
- public void testEmbedFileWithCID() throws Exception
+ public void _testEmbedFileWithCID() throws Exception
{
//
// Test Success
svn commit: r1050187 - /commons/proper/email/trunk/pom.xml
Author: sgoeschl Date: Thu Dec 16 21:56:56 2010 New Revision: 1050187 URL: http://svn.apache.org/viewvc?rev=1050187&view=rev Log: Rolling back the version number after few SVN problems and fresh bugs Modified: commons/proper/email/trunk/pom.xml Modified: commons/proper/email/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/pom.xml?rev=1050187&r1=1050186&r2=1050187&view=diff == --- commons/proper/email/trunk/pom.xml (original) +++ commons/proper/email/trunk/pom.xml Thu Dec 16 21:56:56 2010 @@ -24,7 +24,7 @@ 4.0.0 org.apache.commons commons-email -1.3 +1.3-SNAPSHOT Commons Email 2001
svn commit: r1050182 - /commons/proper/email/trunk/src/changes/changes.xml
Author: sgoeschl Date: Thu Dec 16 21:53:09 2010 New Revision: 1050182 URL: http://svn.apache.org/viewvc?rev=1050182&view=rev Log: Keeping track of the changes Modified: commons/proper/email/trunk/src/changes/changes.xml Modified: commons/proper/email/trunk/src/changes/changes.xml URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/src/changes/changes.xml?rev=1050182&r1=1050181&r2=1050182&view=diff == --- commons/proper/email/trunk/src/changes/changes.xml (original) +++ commons/proper/email/trunk/src/changes/changes.xml Thu Dec 16 21:53:09 2010 @@ -22,7 +22,13 @@ - + + +Fixed HtmlEmail embed toLowerCase bug with Turkish locale. + + +Added a MultiPartEmail.attach(File) method since attaching a file is a simple and common. + Specified Content-ID is now used when embedding a File object in an HtmlEmail.
svn commit: r1050181 - /commons/proper/email/trunk/src/java/org/apache/commons/mail/HtmlEmail.java
Author: sgoeschl
Date: Thu Dec 16 21:52:00 2010
New Revision: 1050181
URL: http://svn.apache.org/viewvc?rev=1050181&view=rev
Log:
[EMAIL-101] Reverting changes since they break my EmalLiveTests
Modified:
commons/proper/email/trunk/src/java/org/apache/commons/mail/HtmlEmail.java
Modified:
commons/proper/email/trunk/src/java/org/apache/commons/mail/HtmlEmail.java
URL:
http://svn.apache.org/viewvc/commons/proper/email/trunk/src/java/org/apache/commons/mail/HtmlEmail.java?rev=1050181&r1=1050180&r2=1050181&view=diff
==
--- commons/proper/email/trunk/src/java/org/apache/commons/mail/HtmlEmail.java
(original)
+++ commons/proper/email/trunk/src/java/org/apache/commons/mail/HtmlEmail.java
Thu Dec 16 21:52:00 2010
@@ -415,7 +415,7 @@ public class HtmlEmail extends MultiPart
throw new EmailException("file " + filePath + " isn't readable");
}
-return embed(new FileDataSource(file), file.getName(), cid);
+return embed(new FileDataSource(file), file.getName());
}
/**
svn commit: r1050180 - in /commons/proper/email/trunk/src: java/org/apache/commons/mail/MultiPartEmail.java test/org/apache/commons/mail/EmailLiveTest.java test/org/apache/commons/mail/MultiPartEmailT
Author: sgoeschl
Date: Thu Dec 16 21:50:57 2010
New Revision: 1050180
URL: http://svn.apache.org/viewvc?rev=1050180&view=rev
Log:
Adding a MultiPartEmail.attach(File) method
Modified:
commons/proper/email/trunk/src/java/org/apache/commons/mail/MultiPartEmail.java
commons/proper/email/trunk/src/test/org/apache/commons/mail/EmailLiveTest.java
commons/proper/email/trunk/src/test/org/apache/commons/mail/MultiPartEmailTest.java
Modified:
commons/proper/email/trunk/src/java/org/apache/commons/mail/MultiPartEmail.java
URL:
http://svn.apache.org/viewvc/commons/proper/email/trunk/src/java/org/apache/commons/mail/MultiPartEmail.java?rev=1050180&r1=1050179&r2=1050180&view=diff
==
---
commons/proper/email/trunk/src/java/org/apache/commons/mail/MultiPartEmail.java
(original)
+++
commons/proper/email/trunk/src/java/org/apache/commons/mail/MultiPartEmail.java
Thu Dec 16 21:50:57 2010
@@ -264,6 +264,39 @@ public class MultiPartEmail extends Emai
}
/**
+ * Attach a file
+ *
+ * @param file A file attachment
+ * @return A MultiPartEmail.
+ * @throws EmailException see javax.mail.internet.MimeBodyPart
+ * for definitions
+ * @since 1.3
+ */
+public MultiPartEmail attach(File file)
+throws EmailException
+{
+String fileName = file.getAbsolutePath();
+
+try
+{
+if (!file.exists())
+{
+throw new IOException("\"" + fileName + "\" does not exist");
+}
+
+FileDataSource fds = new FileDataSource(file);
+
+return attach(fds, file.getName(), null,
EmailAttachment.ATTACHMENT);
+}
+catch (IOException e)
+{
+throw new EmailException(
+"Cannot attach file \"" + fileName + "\"",
+e);
+}
+}
+
+/**
* Attach an EmailAttachment.
*
* @param attachment An EmailAttachment.
Modified:
commons/proper/email/trunk/src/test/org/apache/commons/mail/EmailLiveTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/email/trunk/src/test/org/apache/commons/mail/EmailLiveTest.java?rev=1050180&r1=1050179&r2=1050180&view=diff
==
---
commons/proper/email/trunk/src/test/org/apache/commons/mail/EmailLiveTest.java
(original)
+++
commons/proper/email/trunk/src/test/org/apache/commons/mail/EmailLiveTest.java
Thu Dec 16 21:50:57 2010
@@ -124,11 +124,26 @@ public class EmailLiveTest extends BaseE
public void testSimpleEmail() throws Exception
{
SimpleEmail email = (SimpleEmail) create(SimpleEmail.class);
-email.setSubject("TestMail");
+email.setSubject("TestSimpleMail");
email.setMsg("This is a test mail ... :-)");
EmailUtils.writeMimeMessage( new
File("./target/test-emails/simplemail.eml"), send(email).getMimeMessage());
}
+
+/**
+ * A sanity check that a simple email also works in reality.
+ *
+ * @throws Exception the test failed
+ */
+public void testMultiPartEmail() throws Exception
+{
+MultiPartEmail email = (MultiPartEmail) create(MultiPartEmail.class);
+email.setSubject("TestMultiPartMail");
+email.setMsg("This is a test mail ... :-)");
+email.attach(new File("./src/test/attachments/logo.pdf"));
+
+EmailUtils.writeMimeMessage( new
File("./target/test-emails/multipart.eml"), send(email).getMimeMessage());
+}
/**
* This test checks the various options of building a HTML email.
Modified:
commons/proper/email/trunk/src/test/org/apache/commons/mail/MultiPartEmailTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/email/trunk/src/test/org/apache/commons/mail/MultiPartEmailTest.java?rev=1050180&r1=1050179&r2=1050180&view=diff
==
---
commons/proper/email/trunk/src/test/org/apache/commons/mail/MultiPartEmailTest.java
(original)
+++
commons/proper/email/trunk/src/test/org/apache/commons/mail/MultiPartEmailTest.java
Thu Dec 16 21:50:57 2010
@@ -198,7 +198,7 @@ public class MultiPartEmailTest extends
EmailAttachment attachment;
//
-// Test Success - File
+// Test Success - EmailAttachment
//
attachment = new EmailAttachment();
attachment.setName("Test Attachment");
@@ -217,12 +217,18 @@ public class MultiPartEmailTest extends
this.email.attach(attachment);
// ===
svn commit: r1050178 - /commons/proper/email/trunk/src/java/org/apache/commons/mail/HtmlEmail.java
Author: sgoeschl
Date: Thu Dec 16 21:50:01 2010
New Revision: 1050178
URL: http://svn.apache.org/viewvc?rev=1050178&view=rev
Log:
[EMAIL-102] fixing HtmlEmail embed toLowerCase bug when using Turkish locale
Modified:
commons/proper/email/trunk/src/java/org/apache/commons/mail/HtmlEmail.java
Modified:
commons/proper/email/trunk/src/java/org/apache/commons/mail/HtmlEmail.java
URL:
http://svn.apache.org/viewvc/commons/proper/email/trunk/src/java/org/apache/commons/mail/HtmlEmail.java?rev=1050178&r1=1050177&r2=1050178&view=diff
==
--- commons/proper/email/trunk/src/java/org/apache/commons/mail/HtmlEmail.java
(original)
+++ commons/proper/email/trunk/src/java/org/apache/commons/mail/HtmlEmail.java
Thu Dec 16 21:50:01 2010
@@ -24,6 +24,7 @@ import java.net.URL;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
+import java.util.Locale;
import java.util.Map;
import javax.activation.DataHandler;
@@ -321,7 +322,7 @@ public class HtmlEmail extends MultiPart
*/
public String embed(File file) throws EmailException
{
-String cid =
EmailUtils.randomAlphabetic(HtmlEmail.CID_LENGTH).toLowerCase();
+String cid =
EmailUtils.randomAlphabetic(HtmlEmail.CID_LENGTH).toLowerCase(Locale.ENGLISH);
return embed(file, cid);
}
svn commit: r1040308 - /commons/proper/email/trunk/pom.xml
Author: sgoeschl Date: Mon Nov 29 21:33:43 2010 New Revision: 1040308 URL: http://svn.apache.org/viewvc?rev=1040308&view=rev Log: [maven-release-plugin] prepare release EMAIL_1_3_RC2 Modified: commons/proper/email/trunk/pom.xml Modified: commons/proper/email/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/pom.xml?rev=1040308&r1=1040307&r2=1040308&view=diff == --- commons/proper/email/trunk/pom.xml (original) +++ commons/proper/email/trunk/pom.xml Mon Nov 29 21:33:43 2010 @@ -24,7 +24,7 @@ 4.0.0 org.apache.commons commons-email -1.3-SNAPSHOT +1.3 Commons Email 2001
svn commit: r1040305 - /commons/proper/email/trunk/pom.xml
Author: sgoeschl Date: Mon Nov 29 21:27:10 2010 New Revision: 1040305 URL: http://svn.apache.org/viewvc?rev=1040305&view=rev Log: Test commit to see if the new SVN installation solves my release problems Modified: commons/proper/email/trunk/pom.xml Modified: commons/proper/email/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/pom.xml?rev=1040305&r1=1040304&r2=1040305&view=diff == --- commons/proper/email/trunk/pom.xml (original) +++ commons/proper/email/trunk/pom.xml Mon Nov 29 21:27:10 2010 @@ -44,7 +44,7 @@ scm:svn:http://svn.apache.org/repos/asf/commons/proper/email/tags/EMAIL_1_3_RC2 scm:svn:https://svn.apache.org/repos/asf/commons/proper/email/tags/EMAIL_1_3_RC2 http://svn.apache.org/viewvc/commons/proper/email/tags/EMAIL_1_3_RC2 - +
svn commit: r1040298 - /commons/proper/email/trunk/pom.xml
Author: sgoeschl Date: Mon Nov 29 21:10:18 2010 New Revision: 1040298 URL: http://svn.apache.org/viewvc?rev=1040298&view=rev Log: Rolling back the M2 release Modified: commons/proper/email/trunk/pom.xml Modified: commons/proper/email/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/pom.xml?rev=1040298&r1=1040297&r2=1040298&view=diff == --- commons/proper/email/trunk/pom.xml (original) +++ commons/proper/email/trunk/pom.xml Mon Nov 29 21:10:18 2010 @@ -24,7 +24,7 @@ 4.0.0 org.apache.commons commons-email -1.3 +1.3-SNAPSHOT Commons Email 2001
svn commit: r1040292 - /commons/proper/email/trunk/pom.xml
Author: sgoeschl Date: Mon Nov 29 21:03:42 2010 New Revision: 1040292 URL: http://svn.apache.org/viewvc?rev=1040292&view=rev Log: [maven-release-plugin] prepare release EMAIL_1_3_RC2 Modified: commons/proper/email/trunk/pom.xml Modified: commons/proper/email/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/pom.xml?rev=1040292&r1=1040291&r2=1040292&view=diff == --- commons/proper/email/trunk/pom.xml (original) +++ commons/proper/email/trunk/pom.xml Mon Nov 29 21:03:42 2010 @@ -24,7 +24,7 @@ 4.0.0 org.apache.commons commons-email -1.3-SNAPSHOT +1.3 Commons Email 2001
svn commit: r1040289 - /commons/proper/email/trunk/pom.xml
Author: sgoeschl Date: Mon Nov 29 21:01:17 2010 New Revision: 1040289 URL: http://svn.apache.org/viewvc?rev=1040289&view=rev Log: Rolling back the M2 release Modified: commons/proper/email/trunk/pom.xml Modified: commons/proper/email/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/pom.xml?rev=1040289&r1=1040288&r2=1040289&view=diff == --- commons/proper/email/trunk/pom.xml (original) +++ commons/proper/email/trunk/pom.xml Mon Nov 29 21:01:17 2010 @@ -24,7 +24,7 @@ 4.0.0 org.apache.commons commons-email -1.3 +1.3-SNAPSHOT Commons Email 2001
