svn commit: r1498354 - /commons/cms-site/trunk/content/xdoc/releases/prepare.xml
Author: sebb Date: Mon Jul 1 10:24:40 2013 New Revision: 1498354 URL: http://svn.apache.org/r1498354 Log: Drop URL as alternative: shorter, but harder to use, and not as future-proof Modified: commons/cms-site/trunk/content/xdoc/releases/prepare.xml Modified: commons/cms-site/trunk/content/xdoc/releases/prepare.xml URL: http://svn.apache.org/viewvc/commons/cms-site/trunk/content/xdoc/releases/prepare.xml?rev=1498354r1=1498353r2=1498354view=diff == --- commons/cms-site/trunk/content/xdoc/releases/prepare.xml (original) +++ commons/cms-site/trunk/content/xdoc/releases/prepare.xml Mon Jul 1 10:24:40 2013 @@ -616,10 +616,6 @@ http://svn.apache.org/repos/asf/commons/proper/foo/tags/FOO_1_2_RC1/ (svn revision) N.B. the SVN revision is required because SVN tags are not immutable. - [Alternatively, use the URL from the SVN commit mail, for example: - URL: http://svn.apache.org/r1498185] - - Site: http://people.apache.org/~luckyrm/foo-1.2-RC1/ (note some *relative* links are broken and the 1.2 directories are
svn commit: r868014 - in /websites/staging/commons/trunk/content: ./ downloads/ gsoc/ gsoc/2010/ releases/
Author: buildbot Date: Mon Jul 1 10:24:53 2013 New Revision: 868014 Log: Staging update by buildbot for commons Modified: websites/staging/commons/trunk/content/ (props changed) websites/staging/commons/trunk/content/bugs.html websites/staging/commons/trunk/content/building-m1.html websites/staging/commons/trunk/content/building.html websites/staging/commons/trunk/content/charter.html websites/staging/commons/trunk/content/commons-parent-pom.html websites/staging/commons/trunk/content/components.html websites/staging/commons/trunk/content/dormant.html websites/staging/commons/trunk/content/downloads/index.html websites/staging/commons/trunk/content/gsoc/2010/index.html websites/staging/commons/trunk/content/gsoc/index.html websites/staging/commons/trunk/content/index.html websites/staging/commons/trunk/content/mail-lists.html websites/staging/commons/trunk/content/new-sandbox-component.html websites/staging/commons/trunk/content/oldcharter.html websites/staging/commons/trunk/content/patches.html websites/staging/commons/trunk/content/project-info.html websites/staging/commons/trunk/content/releases/index.html websites/staging/commons/trunk/content/releases/prepare.html websites/staging/commons/trunk/content/releases/publish-site.html websites/staging/commons/trunk/content/releases/release.html websites/staging/commons/trunk/content/releases/versioning.html websites/staging/commons/trunk/content/sandbox.html websites/staging/commons/trunk/content/site-publish.html websites/staging/commons/trunk/content/svninfo.html websites/staging/commons/trunk/content/team-list.html websites/staging/commons/trunk/content/volunteering.html Propchange: websites/staging/commons/trunk/content/ -- --- cms:source-revision (original) +++ cms:source-revision Mon Jul 1 10:24:53 2013 @@ -1 +1 @@ -1498192 +1498354 Modified: websites/staging/commons/trunk/content/bugs.html == --- websites/staging/commons/trunk/content/bugs.html (original) +++ websites/staging/commons/trunk/content/bugs.html Mon Jul 1 10:24:53 2013 @@ -1,5 +1,5 @@ !DOCTYPE html PUBLIC -//W3C//DTD XHTML 1.0 Transitional//EN http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd; -!-- Generated by Apache Maven Doxia at Jun 30, 2013 ( $Revision: 1080083 $ ) -- +!-- Generated by Apache Maven Doxia at Jul 1, 2013 ( $Revision: 1080083 $ ) -- !-- $HeadURL: https://svn.apache.org/repos/asf/commons/proper/commons-skin/trunk/src/main/resources/META-INF/maven/site.vm $ -- html xmlns=http://www.w3.org/1999/xhtml; xml:lang=en lang=en head @@ -13,7 +13,7 @@ /style link rel=stylesheet href=./css/print.css type=text/css media=print / meta name=author content=The Apache Commons Team / -meta name=Date-Revision-mmdd content=20130630 / +meta name=Date-Revision-mmdd content=20130701 / meta http-equiv=Content-Language content=en / /head @@ -32,7 +32,7 @@ div class=xleft -span id=publishDateLast Published: 30 June 2013/span +span id=publishDateLast Published: 01 July 2013/span /div div class=xrighta href=components.html title=ComponentsComponents/a | Modified: websites/staging/commons/trunk/content/building-m1.html == --- websites/staging/commons/trunk/content/building-m1.html (original) +++ websites/staging/commons/trunk/content/building-m1.html Mon Jul 1 10:24:53 2013 @@ -1,5 +1,5 @@ !DOCTYPE html PUBLIC -//W3C//DTD XHTML 1.0 Transitional//EN http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd; -!-- Generated by Apache Maven Doxia at Jun 30, 2013 ( $Revision: 1080083 $ ) -- +!-- Generated by Apache Maven Doxia at Jul 1, 2013 ( $Revision: 1080083 $ ) -- !-- $HeadURL: https://svn.apache.org/repos/asf/commons/proper/commons-skin/trunk/src/main/resources/META-INF/maven/site.vm $ -- html xmlns=http://www.w3.org/1999/xhtml; xml:lang=en lang=en head @@ -13,7 +13,7 @@ /style link rel=stylesheet href=./css/print.css type=text/css media=print / meta name=author content=Commons Documentation Team / -meta name=Date-Revision-mmdd content=20130630 / +meta name=Date-Revision-mmdd content=20130701 / meta http-equiv=Content-Language content=en / /head @@ -32,7 +32,7 @@ div class=xleft -span id=publishDateLast Published: 30 June 2013/span +span id=publishDateLast Published: 01 July 2013/span /div div class=xrighta href=components.html title=ComponentsComponents
svn commit: r868015 - in /websites/production/commons/content: ./ dormant/ proper/ sandbox/
Author: sebb Date: Mon Jul 1 10:30:00 2013 New Revision: 868015 Log: Publishing svnmucc operation to commons site by sebb Added: websites/production/commons/content/ - copied from r868014, websites/staging/commons/trunk/content/ websites/production/commons/content/dormant/ - copied from r868014, websites/production/commons/content/dormant/ websites/production/commons/content/proper/ - copied from r868014, websites/production/commons/content/proper/ websites/production/commons/content/sandbox/ - copied from r868014, websites/production/commons/content/sandbox/
svn commit: r1498387 - /commons/proper/dbcp/trunk/src/site/site.xml
Author: olamy Date: Mon Jul 1 11:30:21 2013 New Revision: 1498387 URL: http://svn.apache.org/r1498387 Log: fix javadoc links Modified: commons/proper/dbcp/trunk/src/site/site.xml Modified: commons/proper/dbcp/trunk/src/site/site.xml URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/site/site.xml?rev=1498387r1=1498386r2=1498387view=diff == --- commons/proper/dbcp/trunk/src/site/site.xml (original) +++ commons/proper/dbcp/trunk/src/site/site.xml Mon Jul 1 11:30:21 2013 @@ -26,9 +26,9 @@ menu name=Commons#xA0;DBCP item name=Overview href=/index.html / item name=Configuration href=/configuration.html / -item name=Javadoc (1.2.2 release) href=http://commons.apache.org/dbcp/api-1.2.2/index.html/ -item name=Javadoc (1.3 release) href=http://commons.apache.org/dbcp/api-1.3/index.html/ -item name=Javadoc (1.4 release) href=http://commons.apache.org/dbcp/api-1.4/index.html/ +item name=Javadoc (1.2.2 release) href=http://commons.apache.org/dbcp/javadocs/api-1.2.2/index.html/ +item name=Javadoc (1.3 release) href=http://commons.apache.org/dbcp/javadocs/api-1.3/index.html/ +item name=Javadoc (1.4 release) href=http://commons.apache.org/dbcp/javadocs/api-1.4/index.html/ item name=Javadoc (1.4.1-SNAPSHOT) href=apidocs/index.html/ item name=Developers#xA0;Guide href=/guide/index.html collapse=true item name=JNDI#xA0;Howto href=/guide/jndi-howto.html/
Nexus: Promotion Completed.
Description:Vote passedDetails:The following artifacts have been promoted to the Releases repository.archetype-catalog.xmlcommons-parent-32.pom.asccommons-parent-32-site.xml.asccommons-parent-32.pomcommons-parent-32-site.xml
svn commit: r1498471 - /commons/proper/commons-parent/tags/commons-parent-32/
Author: sebb Date: Mon Jul 1 14:21:44 2013 New Revision: 1498471 URL: http://svn.apache.org/r1498471 Log: Create GA tag Added: commons/proper/commons-parent/tags/commons-parent-32/ - copied from r1498469, commons/proper/commons-parent/tags/commons-parent-32-RC1/
svn commit: r1498625 - in /commons/proper/email/trunk/src: changes/changes.xml main/java/org/apache/commons/mail/ImageHtmlEmail.java test/java/org/apache/commons/mail/ImageHtmlEmailTest.java
Author: tn
Date: Mon Jul 1 19:07:19 2013
New Revision: 1498625
URL: http://svn.apache.org/r1498625
Log:
[EMAIL-127] Escape replacement string when building mime message. Thanks to
Dominik Stadler.
Modified:
commons/proper/email/trunk/src/changes/changes.xml
commons/proper/email/trunk/src/main/java/org/apache/commons/mail/ImageHtmlEmail.java
commons/proper/email/trunk/src/test/java/org/apache/commons/mail/ImageHtmlEmailTest.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=1498625r1=1498624r2=1498625view=diff
==
--- commons/proper/email/trunk/src/changes/changes.xml (original)
+++ commons/proper/email/trunk/src/changes/changes.xml Mon Jul 1 19:07:19 2013
@@ -22,7 +22,11 @@
/properties
body
-release version=1.4 date=TBD
+release version=1.3.2 date=TBD
+ action dev=tn type=fix issue=EMAIL-127 date=2013-07-01
due-to=Dominik Stadler
+Special characters in the body of an HTML email could lead to an
exception when the
+mime message was built.
+ /action
/release
release version=1.3.1 date=2013-03-04
action dev=tn type=fix issue=EMAIL-125 date=2013-02-22
due-to=Jean-Marc
Modified:
commons/proper/email/trunk/src/main/java/org/apache/commons/mail/ImageHtmlEmail.java
URL:
http://svn.apache.org/viewvc/commons/proper/email/trunk/src/main/java/org/apache/commons/mail/ImageHtmlEmail.java?rev=1498625r1=1498624r2=1498625view=diff
==
---
commons/proper/email/trunk/src/main/java/org/apache/commons/mail/ImageHtmlEmail.java
(original)
+++
commons/proper/email/trunk/src/main/java/org/apache/commons/mail/ImageHtmlEmail.java
Mon Jul 1 19:07:19 2013
@@ -177,7 +177,8 @@ public class ImageHtmlEmail extends Html
// if we embedded something, then we need to replace the URL
with
// the CID, otherwise the Matcher takes care of adding the
// non-replaced text afterwards, so no else is necessary here!
-matcher.appendReplacement(stringBuffer, matcher.group(1) +
cid: + cid + matcher.group(3));
+matcher.appendReplacement(stringBuffer,
+Matcher.quoteReplacement(matcher.group(1) + cid: +
cid + matcher.group(3)));
}
}
Modified:
commons/proper/email/trunk/src/test/java/org/apache/commons/mail/ImageHtmlEmailTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/email/trunk/src/test/java/org/apache/commons/mail/ImageHtmlEmailTest.java?rev=1498625r1=1498624r2=1498625view=diff
==
---
commons/proper/email/trunk/src/test/java/org/apache/commons/mail/ImageHtmlEmailTest.java
(original)
+++
commons/proper/email/trunk/src/test/java/org/apache/commons/mail/ImageHtmlEmailTest.java
Mon Jul 1 19:07:19 2013
@@ -399,15 +399,44 @@ public class ImageHtmlEmailTest extends
assertTrue(matcher.find());
assertEquals(file5, matcher.group(2));
-// try with invalid HTML that is seens sometimes, i.e. without closing
/ or /img
-matcher = pattern
-.matcher(img src=\file1\img src=\file2\);
+// try with invalid HTML that is seems sometimes, i.e. without closing
/ or /img
+matcher = pattern.matcher(img src=\file1\img src=\file2\);
assertTrue(matcher.find());
assertEquals(file1, matcher.group(2));
assertTrue(matcher.find());
assertEquals(file2, matcher.group(2));
}
+@Test
+public void testEmail127() throws Exception {
+
Logger.getLogger(ImageHtmlEmail.class.getName()).setLevel(Level.FINEST);
+
+getMailServer();
+
+String strSubject = Test HTML Send default with URL;
+
+// Create the email message
+email = new MockImageHtmlEmailConcrete();
+email.setHostName(strTestMailServer);
+email.setSmtpPort(getMailServerPort());
+email.setFrom(strTestMailFrom);
+email.addTo(strTestMailTo);
+email.setSubject(strSubject);
+email.setDataSourceResolver(new
DataSourceUrlResolver(TEST_IMAGE_DIR.toURI().toURL(), TEST_IS_LENIENT));
+
+// set the html message
+email.setHtmlMsg(htmlbodyimg title=\$\
src=\http://www.apache.org/images/feather.gif\//body/html);
+
+// send the email
+email.send();
+
+fakeMailServer.stop();
+// validate txt message
+validateSend(fakeMailServer, strSubject, email.getHtmlMsg(),
+ email.getFromAddress(), email.getToAddresses(),
+ email.getCcAddresses(), email.getBccAddresses(), true);
+}
+
private String loadUrlContent(URL url) throws IOException {
InputStream stream = url.openStream();
svn commit: r1498626 - /commons/proper/email/trunk/pom.xml
Author: tn Date: Mon Jul 1 19:10:13 2013 New Revision: 1498626 URL: http://svn.apache.org/r1498626 Log: Upgrade to latest commons-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=1498626r1=1498625r2=1498626view=diff == --- commons/proper/email/trunk/pom.xml (original) +++ commons/proper/email/trunk/pom.xml Mon Jul 1 19:10:13 2013 @@ -19,7 +19,7 @@ parent groupIdorg.apache.commons/groupId artifactIdcommons-parent/artifactId - version28/version + version32/version /parent modelVersion4.0.0/modelVersion groupIdorg.apache.commons/groupId
svn commit: r1498650 - /commons/proper/codec/trunk/src/site/site.xml
Author: tn Date: Mon Jul 1 20:00:32 2013 New Revision: 1498650 URL: http://svn.apache.org/r1498650 Log: Update javadoc links. Modified: commons/proper/codec/trunk/src/site/site.xml Modified: commons/proper/codec/trunk/src/site/site.xml URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/site/site.xml?rev=1498650r1=1498649r2=1498650view=diff == --- commons/proper/codec/trunk/src/site/site.xml (original) +++ commons/proper/codec/trunk/src/site/site.xml Mon Jul 1 20:00:32 2013 @@ -27,7 +27,9 @@ item name=Overview href=/index.html/ item name=Download href=http://commons.apache.org/codec/download_codec.cgi/ item name=Users guide href=/userguide.html/ -item name=Javadoc v1.7 href=javadocs/api-release/index.html/ +item name=Javadoc trunk href=apidocs/index.html/ +item name=Javadoc 1.8 href=javadocs/api-release/index.html/ +item name=Javadoc 1.7 href=javadocs/api-1.7/index.html/ /menu menu name=Development @@ -35,7 +37,7 @@ item name=Mailing Listshref=/mail-lists.html/ item name=Issue Tracking href=/issue-tracking.html/ item name=Source Repositoryhref=/source-repository.html/ -item name=Javadoc SVN latest href=apidocs/index.html/ +item name=Javadoc SVN latest href=apidocs/index.html/ /menu /body
svn commit: r1498757 - /commons/proper/codec/trunk/pom.xml
Author: ggregory Date: Tue Jul 2 02:05:06 2013 New Revision: 1498757 URL: http://svn.apache.org/r1498757 Log: Use commons-parent 32. Modified: commons/proper/codec/trunk/pom.xml Modified: commons/proper/codec/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/pom.xml?rev=1498757r1=1498756r2=1498757view=diff == --- commons/proper/codec/trunk/pom.xml (original) +++ commons/proper/codec/trunk/pom.xml Tue Jul 2 02:05:06 2013 @@ -24,7 +24,7 @@ limitations under the License. parent groupIdorg.apache.commons/groupId artifactIdcommons-parent/artifactId -version28/version +version32/version /parent modelVersion4.0.0/modelVersion groupIdcommons-codec/groupId
svn commit: r1498776 - /commons/proper/compress/trunk/pom.xml
Author: bodewig
Date: Tue Jul 2 04:17:30 2013
New Revision: 1498776
URL: http://svn.apache.org/r1498776
Log:
upgrade to CP32
Modified:
commons/proper/compress/trunk/pom.xml
Modified: commons/proper/compress/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/compress/trunk/pom.xml?rev=1498776r1=1498775r2=1498776view=diff
==
--- commons/proper/compress/trunk/pom.xml (original)
+++ commons/proper/compress/trunk/pom.xml Tue Jul 2 04:17:30 2013
@@ -20,7 +20,7 @@
parent
groupIdorg.apache.commons/groupId
artifactIdcommons-parent/artifactId
-version30/version
+version32/version
/parent
groupIdorg.apache.commons/groupId
@@ -35,8 +35,8 @@ These include: bzip2, gzip, pack200, xz
/description
properties
-maven.compile.source1.5/maven.compile.source
-maven.compile.target1.5/maven.compile.target
+maven.compiler.source1.5/maven.compiler.source
+maven.compiler.target1.5/maven.compiler.target
commons.componentidcompress/commons.componentid
commons.jira.idCOMPRESS/commons.jira.id
commons.jira.pid12310904/commons.jira.pid
@@ -199,7 +199,7 @@ These include: bzip2, gzip, pack200, xz
version2.5/version
configuration
minimumTokens200/minimumTokens
- targetJdk${maven.compile.source}/targetJdk
+ targetJdk${maven.compiler.source}/targetJdk
rulesets
ruleset${basedir}/pmd-ruleset.xml/ruleset
/rulesets
@@ -211,7 +211,7 @@ These include: bzip2, gzip, pack200, xz
artifactIdmaven-javadoc-plugin/artifactId
configuration
quiettrue/quiet
- source${maven.compile.source}/source
+ source${maven.compiler.source}/source
encoding${commons.encoding}/encoding
docEncoding${commons.docEncoding}/docEncoding
linksourcetrue/linksource
