Project: javamail
Repository: mercurial
Revision: 193
Author: shannon
Date: 2009-11-05 23:00:06 UTC
Link:
Log Message:
------------
Clarify that getMessagesByUID(start, end) returns at least one message,
unless the folder is empty.
Don't create unique artifacts in the maven repository for SNAPSHOT releases.
Add mail.<protocol>.ssl.trust property.
Workaround broken IMAP servers that don't quote the folder name in the STATUS
response when they need to; contributed by Thomas Krammer.
Add probe points to support GlassFish monitoring.
OSGi imports of some packages need to be optional
Update version to 1.4.3-rc1.
Added tag JAVAMAIL-1_4_3-RC1 for changeset dfaa56e47386
Revisions:
----------
186
187
188
189
190
191
192
193
Modified Paths:
---------------
mail/src/main/java/javax/mail/UIDFolder.java
pom.xml
doc/release/CHANGES.txt
mail/src/main/java/com/sun/mail/imap/package.html
mail/src/main/java/com/sun/mail/pop3/package.html
mail/src/main/java/com/sun/mail/smtp/package.html
mail/src/main/java/com/sun/mail/util/SocketFetcher.java
mail/src/main/java/com/sun/mail/imap/protocol/Status.java
mail/pom.xml
mail/src/main/java/com/sun/mail/iap/Protocol.java
mail/src/main/java/com/sun/mail/pop3/Protocol.java
mail/src/main/java/com/sun/mail/smtp/SMTPTransport.java
client/pom.xml
demo/pom.xml
dsn/pom.xml
imap/pom.xml
javadoc/pom.xml
logging/pom.xml
mailapi/pom.xml
mbox/dist/pom.xml
mbox/native/pom.xml
mbox/pom.xml
parent-distrib/pom.xml
pop3/pom.xml
servlet/pom.xml
smtp/pom.xml
taglib/pom.xml
webapp/pom.xml
.hgtags
Added Paths:
------------
mail/src/test/java/com/sun/mail/imap/protocol/StratoImapBugfixTest.java
mail/src/main/resources/META-INF/gfprobe-provider.xml
Diffs:
------
diff -r f4cf60a59073 -r 25bfc9a12570 mail/src/main/java/javax/mail/UIDFolder.java
--- a/mail/src/main/java/javax/mail/UIDFolder.java Thu Oct 29 00:28:26 2009 -0700
+++ b/mail/src/main/java/javax/mail/UIDFolder.java Fri Oct 30 11:02:07 2009 -0700
@@ -1,7 +1,7 @@
/*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
*
- * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
*
* The contents of this file are subject to the terms of either the GNU
* General Public License Version 2 only ("GPL") or the Common Development
@@ -132,7 +132,13 @@
/**
* Get the Messages specified by the given range. The special
* value LASTUID can be used for the <code>end</code> parameter
- * to indicate the UID of the last message in the folder.
+ * to indicate the UID of the last message in the folder. <p>
+ *
+ * Note that <code>end</code> need not be greater than <code>start</code>;
+ * the order of the range doesn't matter.
+ * Note also that, unless the folder is empty, use of LASTUID ensures
+ * that at least one message will be returned - the last message in the
+ * folder.
*
* @param start start UID
* @param end end UID
diff -r 25bfc9a12570 -r e07e5ce29ee3 pom.xml
--- a/pom.xml Fri Oct 30 11:02:07 2009 -0700
+++ b/pom.xml Fri Oct 30 15:30:01 2009 -0700
@@ -150,6 +150,7 @@
<repository>
<id>java.net-m2-repository</id>
<url>java-net:/maven2-repository/trunk/repository/</url>
+ <uniqueVersion>false</uniqueVersion>
</repository>
</distributionManagement>
diff -r e07e5ce29ee3 -r 21d3dfdb1e55 doc/release/CHANGES.txt
--- a/doc/release/CHANGES.txt Fri Oct 30 15:30:01 2009 -0700
+++ b/doc/release/CHANGES.txt Tue Nov 03 09:21:21 2009 -0800
@@ -35,6 +35,7 @@
<no id> include server error message in exception when SMTP authentication fails
<no id> com.sun.mail.util.logging.MailHandler contributed by Jason Mehrens
<no id> add mail.smtp.noop.strict property, default true
+<no id> add mail.<protocol>.ssl.trust property to list hosts to be trusted
CHANGES IN THE 1.4.2 RELEASE
diff -r e07e5ce29ee3 -r 21d3dfdb1e55 mail/src/main/java/com/sun/mail/imap/package.html
--- a/mail/src/main/java/com/sun/mail/imap/package.html Fri Oct 30 15:30:01 2009 -0700
+++ b/mail/src/main/java/com/sun/mail/imap/package.html Tue Nov 03 09:21:21 2009 -0800
@@ -420,6 +420,18 @@
</TR>
<TR>
+<TD>mail.imap.ssl.trust</TD>
+<TD>String</TD>
+<TD>
+If set, and a socket factory hasn't been specified, enables use of a
+{_at_link com.sun.mail.util.MailSSLSocketFactory MailSSLSocketFactory}.
+If set to "*", all hosts are trusted.
+If set to a whitespace separated list of hosts, those hosts are trusted.
+Otherwise, trust depends on the certificate the server presents.
+</TD>
+</TR>
+
+<TR>
<TD>mail.imap.ssl.socketFactory</TD>
<TD>SSLSocketFactory</TD>
<TD>
diff -r e07e5ce29ee3 -r 21d3dfdb1e55 mail/src/main/java/com/sun/mail/pop3/package.html
--- a/mail/src/main/java/com/sun/mail/pop3/package.html Fri Oct 30 15:30:01 2009 -0700
+++ b/mail/src/main/java/com/sun/mail/pop3/package.html Tue Nov 03 09:21:21 2009 -0800
@@ -301,6 +301,18 @@
</TR>
<TR>
+<TD>mail.pop3.ssl.trust</TD>
+<TD>String</TD>
+<TD>
+If set, and a socket factory hasn't been specified, enables use of a
+{_at_link com.sun.mail.util.MailSSLSocketFactory MailSSLSocketFactory}.
+If set to "*", all hosts are trusted.
+If set to a whitespace separated list of hosts, those hosts are trusted.
+Otherwise, trust depends on the certificate the server presents.
+</TD>
+</TR>
+
+<TR>
<TD>mail.pop3.ssl.socketFactory</TD>
<TD>SSLSocketFactory</TD>
<TD>
diff -r e07e5ce29ee3 -r 21d3dfdb1e55 mail/src/main/java/com/sun/mail/smtp/package.html
--- a/mail/src/main/java/com/sun/mail/smtp/package.html Fri Oct 30 15:30:01 2009 -0700
+++ b/mail/src/main/java/com/sun/mail/smtp/package.html Tue Nov 03 09:21:21 2009 -0800
@@ -451,6 +451,18 @@
</TR>
<TR>
+<TD>mail.smtp.ssl.trust</TD>
+<TD>String</TD>
+<TD>
+If set, and a socket factory hasn't been specified, enables use of a
+{_at_link com.sun.mail.util.MailSSLSocketFactory MailSSLSocketFactory}.
+If set to "*", all hosts are trusted.
+If set to a whitespace separated list of hosts, those hosts are trusted.
+Otherwise, trust depends on the certificate the server presents.
+</TD>
+</TR>
+
+<TR>
<TD>mail.smtp.ssl.socketFactory</TD>
<TD>SSLSocketFactory</TD>
<TD>
diff -r e07e5ce29ee3 -r 21d3dfdb1e55 mail/src/main/java/com/sun/mail/util/SocketFetcher.java
--- a/mail/src/main/java/com/sun/mail/util/SocketFetcher.java Fri Oct 30 15:30:01 2009 -0700
+++ b/mail/src/main/java/com/sun/mail/util/SocketFetcher.java Tue Nov 03 09:21:21 2009 -0800
@@ -199,7 +199,7 @@
if (sfPort == -1)
sfPort = port;
socket = createSocket(localaddr, localport,
- host, sfPort, cto, sf, useSSL, idCheck);
+ host, sfPort, cto, props, prefix, sf, useSSL, idCheck);
}
} catch (SocketTimeoutException sex) {
throw sex;
@@ -225,7 +225,7 @@
if (socket == null)
socket = createSocket(localaddr, localport,
- host, port, cto, null, useSSL, idCheck);
+ host, port, cto, props, prefix, null, useSSL, idCheck);
int to = PropUtil.getIntProperty(props, prefix + ".timeout", -1);
if (to >= 0)
@@ -248,6 +248,7 @@
*/
private static Socket createSocket(InetAddress localaddr, int localport,
String host, int port, int cto,
+ Properties props, String prefix,
SocketFactory sf, boolean useSSL,
boolean idCheck) throws IOException {
Socket socket;
@@ -255,7 +256,23 @@
if (sf != null)
socket = sf.createSocket();
else if (useSSL) {
- sf = SSLSocketFactory.getDefault();
+ String trusted;
+ if ((trusted = props.getProperty(prefix + ".ssl.trust")) != null) {
+ try {
+ MailSSLSocketFactory msf = new MailSSLSocketFactory();
+ if (trusted.equals("*"))
+ msf.setTrustAllHosts(true);
+ else
+ msf.setTrustedHosts(trusted.split("\\s+"));
+ sf = msf;
+ } catch (GeneralSecurityException gex) {
+ IOException ioex = new IOException(
+ "Can't create MailSSLSocketFactory");
+ ioex.initCause(gex);
+ throw ioex;
+ }
+ } else
+ sf = SSLSocketFactory.getDefault();
socket = sf.createSocket();
} else
socket = new Socket();
@@ -274,7 +291,7 @@
try {
socket.close();
} finally {
- throw new IOException("Server is not trusted");
+ throw new IOException("Server is not trusted: " + host);
}
}
}
@@ -385,8 +402,27 @@
// finally, use the default SSL socket factory
if (ssf == null) {
- ssf = (SSLSocketFactory)SSLSocketFactory.getDefault();
- sfErr = "default SSL socket factory";
+ String trusted;
+ if ((trusted = props.getProperty(prefix + ".ssl.trust")) !=
+ null) {
+ try {
+ MailSSLSocketFactory msf = new MailSSLSocketFactory();
+ if (trusted.equals("*"))
+ msf.setTrustAllHosts(true);
+ else
+ msf.setTrustedHosts(trusted.split("\\s+"));
+ ssf = msf;
+ sfErr = "mail SSL socket factory";
+ } catch (GeneralSecurityException gex) {
+ IOException ioex = new IOException(
+ "Can't create MailSSLSocketFactory");
+ ioex.initCause(gex);
+ throw ioex;
+ }
+ } else {
+ ssf = (SSLSocketFactory)SSLSocketFactory.getDefault();
+ sfErr = "default SSL socket factory";
+ }
}
socket = ssf.createSocket(socket, host, port, true);
@@ -400,7 +436,7 @@
try {
socket.close();
} finally {
- throw new IOException("Server is not trusted");
+ throw new IOException("Server is not trusted: " + host);
}
}
}
diff -r 21d3dfdb1e55 -r 4071616924f5 doc/release/CHANGES.txt
--- a/doc/release/CHANGES.txt Tue Nov 03 09:21:21 2009 -0800
+++ b/doc/release/CHANGES.txt Tue Nov 03 10:59:59 2009 -0800
@@ -36,6 +36,7 @@
<no id> com.sun.mail.util.logging.MailHandler contributed by Jason Mehrens
<no id> add mail.smtp.noop.strict property, default true
<no id> add mail.<protocol>.ssl.trust property to list hosts to be trusted
+<no id> work around buggy IMAP servers that don't quote mbox name in STATUS resp
CHANGES IN THE 1.4.2 RELEASE
diff -r 21d3dfdb1e55 -r 4071616924f5 mail/src/main/java/com/sun/mail/imap/protocol/Status.java
--- a/mail/src/main/java/com/sun/mail/imap/protocol/Status.java Tue Nov 03 09:21:21 2009 -0800
+++ b/mail/src/main/java/com/sun/mail/imap/protocol/Status.java Tue Nov 03 10:59:59 2009 -0800
@@ -1,7 +1,7 @@
/*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
*
- * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
*
* The contents of this file are subject to the terms of either the GNU
* General Public License Version 2 only ("GPL") or the Common Development
@@ -57,7 +57,26 @@
public Status(Response r) throws ParsingException {
mbox = r.readAtomString(); // mailbox := astring
- r.skipSpaces();
+
+ // Workaround buggy IMAP servers that don't quote folder names
+ // with spaces.
+ final StringBuffer buffer = new StringBuffer();
+ boolean onlySpaces = true;
+
+ while (r.peekByte() != '(' && r.peekByte() != 0) {
+ final char next = (char)r.readByte();
+
+ buffer.append(next);
+
+ if (next != ' ') {
+ onlySpaces = false;
+ }
+ }
+
+ if (!onlySpaces) {
+ mbox = (mbox + buffer).trim();
+ }
+
if (r.readByte() != '(')
throw new ParsingException("parse error in STATUS");
diff -r 21d3dfdb1e55 -r 4071616924f5 mail/src/test/java/com/sun/mail/imap/protocol/StratoImapBugfixTest.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/src/test/java/com/sun/mail/imap/protocol/StratoImapBugfixTest.java Tue Nov 03 10:59:59 2009 -0800
@@ -0,0 +1,92 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common Development
+ * and Distribution License("CDDL") (collectively, the "License"). You
+ * may not use this file except in compliance with the License. You can obtain
+ * a copy of the License at
https://glassfish.dev.java.net/public/CDDL+GPL.html
+ * or glassfish/bootstrap/legal/LICENSE.txt. See the License for the specific
+ * language governing permissions and limitations under the License.
+ *
+ * When distributing the software, include this License Header Notice in each
+ * file and include the License file at glassfish/bootstrap/legal/LICENSE.txt.
+ * Sun designates this particular file as subject to the "Classpath" exception
+ * as provided by Sun in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the License
+ * Header, with the fields enclosed by brackets [] replaced by your own
+ * identifying information: "Portions Copyrighted [year]
+ * [name of copyright owner]"
+ *
+ * Contributor(s):
+ *
+ * If you wish your version of this file to be governed by only the CDDL or
+ * only the GPL Version 2, indicate your decision by adding "[Contributor]
+ * elects to include this software in this distribution under the [CDDL or GPL
+ * Version 2] license." If you don't indicate a single choice of license, a
+ * recipient has the option to distribute your version of this file under
+ * either the CDDL, the GPL Version 2 or to extend the choice of license to
+ * its licensees as provided above. However, if you add GPL Version 2 code
+ * and therefore, elected the GPL Version 2 license, then the option applies
+ * only if the new code is made subject to such option by the copyright
+ * holder.
+ */
+
+package com.sun.mail.imap.protocol;
+
+import com.sun.mail.iap.ParsingException;
+import com.sun.mail.iap.Response;
+import com.sun.mail.imap.protocol.Status;
+// XXX - need to work with JDK 1.4
+//import static org.junit.Assert.assertEquals;
+//import static org.junit.Assert.fail;
+import junit.framework.TestCase;
+import org.junit.Test;
+
+/**
+ * @author tkrammer
+ */
+public class StratoImapBugfixTest extends TestCase {
+ //_at_Test
+ public void testValidStatusResponseLeadingSpaces() throws Exception {
+ final Response response =
+ new Response("STATUS \" Sent Items \" (UIDNEXT 1)");
+ final Status status = new Status(response);
+
+ assertEquals(" Sent Items ", status.mbox);
+ assertEquals(1, status.uidnext);
+ }
+
+ //_at_Test
+ public void testValidStatusResponse() throws Exception {
+ final Response response =
+ new Response("STATUS \"Sent Items\" (UIDNEXT 1)");
+ final Status status = new Status(response);
+
+ assertEquals("Sent Items", status.mbox);
+ assertEquals(1, status.uidnext);
+ }
+
+ //_at_Test
+ public void testInvalidStatusResponse() throws Exception {
+ Response response = new Response("STATUS Sent Items (UIDNEXT 1)");
+ final Status status = new Status(response);
+
+ assertEquals("Sent Items", status.mbox);
+ assertEquals(1, status.uidnext);
+ }
+
+ //_at_Test
+ public void testMissingBracket() throws Exception {
+ final Response response =
+ new Response("STATUS \"Sent Items\" UIDNEXT 1)");
+
+ try {
+ new Status(response);
+ fail("Must throw exception");
+ } catch(ParsingException e) {
+ }
+ }
+}
diff -r 4071616924f5 -r 43c30579eca8 mail/pom.xml
--- a/mail/pom.xml Tue Nov 03 10:59:59 2009 -0800
+++ b/mail/pom.xml Thu Nov 05 14:27:13 2009 -0800
@@ -69,6 +69,9 @@
com.sun.mail.util.logging; version=${mail.version},
com.sun.mail.handlers; version=${mail.version}
</mail.packages.export>
+ <mail.probeFile>
+ META-INF/gfprobe-provider.xml
+ </mail.probeFile>
</properties>
<build>
diff -r 4071616924f5 -r 43c30579eca8 mail/src/main/java/com/sun/mail/iap/Protocol.java
--- a/mail/src/main/java/com/sun/mail/iap/Protocol.java Tue Nov 03 10:59:59 2009 -0800
+++ b/mail/src/main/java/com/sun/mail/iap/Protocol.java Thu Nov 05 14:27:13 2009 -0800
@@ -285,6 +285,7 @@
* @return array of Response objects returned by the server
*/
public synchronized Response[] command(String command, Argument args) {
+ commandStart(command);
Vector v = new Vector();
boolean done = false;
String tag = null;
@@ -325,6 +326,7 @@
Response[] responses = new Response[v.size()];
v.copyInto(responses);
timestamp = System.currentTimeMillis();
+ commandEnd();
return responses;
}
@@ -432,4 +434,10 @@
super.finalize();
disconnect();
}
+
+ /*
+ * Probe points for GlassFish monitoring.
+ */
+ private void commandStart(String command) { }
+ private void commandEnd() { }
}
diff -r 4071616924f5 -r 43c30579eca8 mail/src/main/java/com/sun/mail/pop3/Protocol.java
--- a/mail/src/main/java/com/sun/mail/pop3/Protocol.java Tue Nov 03 10:59:59 2009 -0800
+++ b/mail/src/main/java/com/sun/mail/pop3/Protocol.java Thu Nov 05 14:27:13 2009 -0800
@@ -448,6 +448,7 @@
* Issue a simple POP3 command and return the response.
*/
private Response simpleCommand(String cmd) throws IOException {
+ simpleCommandStart(cmd);
if (socket == null)
throw new IOException("Folder is closed"); // XXX
@@ -492,6 +493,7 @@
int i;
if ((i = line.indexOf(' ')) >= 0)
r.data = line.substring(i + 1);
+ simpleCommandEnd();
return r;
}
@@ -500,9 +502,12 @@
* <code>size</code> is an estimate of the response size.
*/
private Response multilineCommand(String cmd, int size) throws IOException {
+ multilineCommandStart(cmd);
Response r = simpleCommand(cmd);
- if (!r.ok)
+ if (!r.ok) {
+ multilineCommandEnd();
return (r);
+ }
SharedByteArrayOutputStream buf = new SharedByteArrayOutputStream(size);
int b, lastb = '\n';
@@ -539,8 +544,17 @@
if (b < 0)
throw new EOFException("EOF on socket");
r.bytes = buf.toStream();
+ multilineCommandEnd();
return r;
}
+
+ /*
+ * Probe points for GlassFish monitoring.
+ */
+ private void simpleCommandStart(String command) { }
+ private void simpleCommandEnd() { }
+ private void multilineCommandStart(String command) { }
+ private void multilineCommandEnd() { }
}
/**
diff -r 4071616924f5 -r 43c30579eca8 mail/src/main/java/com/sun/mail/smtp/SMTPTransport.java
--- a/mail/src/main/java/com/sun/mail/smtp/SMTPTransport.java Tue Nov 03 10:59:59 2009 -0800
+++ b/mail/src/main/java/com/sun/mail/smtp/SMTPTransport.java Thu Nov 05 14:27:13 2009 -0800
@@ -838,6 +838,7 @@
public synchronized void sendMessage(Message message, Address[] addresses)
throws MessagingException, SendFailedException {
+ sendMessageStart(message != null ? message.getSubject() : "");
checkConnected();
// check if the message is a valid MIME/RFC822 message and that
@@ -937,6 +938,7 @@
sendPartiallyFailed = false;
notificationDone = false; // reset for next send
}
+ sendMessageEnd();
}
/**
@@ -2096,4 +2098,10 @@
}
return sb != null ? sb.toString() : s;
}
+
+ /*
+ * Probe points for GlassFish monitoring.
+ */
+ private void sendMessageStart(String subject) { }
+ private void sendMessageEnd() { }
}
diff -r 4071616924f5 -r 43c30579eca8 mail/src/main/resources/META-INF/gfprobe-provider.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/src/main/resources/META-INF/gfprobe-provider.xml Thu Nov 05 14:27:13 2009 -0800
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<probe-providers>
+ <probe-provider moduleProviderName="glassfish" moduleName="javamail"
+ probeProviderName="smtp-transport"
+ class="com.sun.mail.smtp.SMTPTransport">
+ <probe name="sendMessageStart">
+ <method>sendMessageStart</method>
+ <probe-param type="java.lang.String" name="subject" />
+ <return-param type="void" />
+ </probe>
+ <probe name="sendMessageEnd">
+ <method>sendMessageEnd</method>
+ <return-param type="void" />
+ </probe>
+ </probe-provider>
+ <probe-provider moduleProviderName="glassfish" moduleName="javamail"
+ probeProviderName="iap-protocol"
+ class="com.sun.mail.iap.Protocol">
+ <probe name="commandStart">
+ <method>commandStart</method>
+ <probe-param type="java.lang.String" name="command" />
+ <return-param type="void" />
+ </probe>
+ <probe name="commandEnd">
+ <method>commandEnd</method>
+ <return-param type="void" />
+ </probe>
+ </probe-provider>
+ <probe-provider moduleProviderName="glassfish" moduleName="javamail"
+ probeProviderName="pop3-protocol"
+ class="com.sun.mail.pop3.Protocol">
+ <probe name="simpleCommandStart">
+ <method>simpleCommandStart</method>
+ <probe-param type="java.lang.String" name="command" />
+ <return-param type="void" />
+ </probe>
+ <probe name="simpleCommandEnd">
+ <method>simpleCommandEnd</method>
+ <return-param type="void" />
+ </probe>
+ <probe name="multilineCommandStart">
+ <method>multilineCommandStart</method>
+ <probe-param type="java.lang.String" name="command" />
+ <return-param type="void" />
+ </probe>
+ <probe name="multilineCommandEnd">
+ <method>multilineCommandEnd</method>
+ <return-param type="void" />
+ </probe>
+ </probe-provider>
+</probe-providers>
diff -r 4071616924f5 -r 43c30579eca8 pom.xml
--- a/pom.xml Tue Nov 03 10:59:59 2009 -0800
+++ b/pom.xml Thu Nov 05 14:27:13 2009 -0800
@@ -90,6 +90,7 @@
<mail.packages.private>
com.sun.mail.*
</mail.packages.private>
+ <mail.probeFile/>
</properties>
<developers>
@@ -237,6 +238,9 @@
<Implementation-Vendor-Id>
com.sun
</Implementation-Vendor-Id>
+ <Probe-Provider-XML-File-Names>
+ ${mail.probeFile}
+ </Probe-Provider-XML-File-Names>
</manifestEntries>
</archive>
<excludes>
diff -r 43c30579eca8 -r 76be0700b5ac pom.xml
--- a/pom.xml Thu Nov 05 14:27:13 2009 -0800
+++ b/pom.xml Thu Nov 05 14:28:36 2009 -0800
@@ -87,6 +87,12 @@
<mail.packages.export>
javax.mail.*; version=${mail.spec.version}
</mail.packages.export>
+ <mail.packages.import>
+ javax.security.sasl;resolution:=optional,
+ sun.security.util;resolution:=optional,
+ jcifs.ntlmssp;resolution:=optional,
+ *
+ </mail.packages.import>
<mail.packages.private>
com.sun.mail.*
</mail.packages.private>
@@ -172,6 +178,9 @@
<Export-Package>
${mail.packages.export}
</Export-Package>
+ <Import-Package>
+ ${mail.packages.import}
+ </Import-Package>
<Private-Package>
${mail.packages.private}
</Private-Package>
diff -r 76be0700b5ac -r dfaa56e47386 client/pom.xml
--- a/client/pom.xml Thu Nov 05 14:28:36 2009 -0800
+++ b/client/pom.xml Thu Nov 05 14:59:22 2009 -0800
@@ -42,7 +42,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>all</artifactId>
- <version>1.4.3-SNAPSHOT</version>
+ <version>1.4.3-rc1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.sun.mail</groupId>
diff -r 76be0700b5ac -r dfaa56e47386 demo/pom.xml
--- a/demo/pom.xml Thu Nov 05 14:28:36 2009 -0800
+++ b/demo/pom.xml Thu Nov 05 14:59:22 2009 -0800
@@ -42,7 +42,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>all</artifactId>
- <version>1.4.3-SNAPSHOT</version>
+ <version>1.4.3-rc1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.sun.mail</groupId>
diff -r 76be0700b5ac -r dfaa56e47386 dsn/pom.xml
--- a/dsn/pom.xml Thu Nov 05 14:28:36 2009 -0800
+++ b/dsn/pom.xml Thu Nov 05 14:59:22 2009 -0800
@@ -42,7 +42,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>all</artifactId>
- <version>1.4.3-SNAPSHOT</version>
+ <version>1.4.3-rc1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.sun.mail</groupId>
diff -r 76be0700b5ac -r dfaa56e47386 imap/pom.xml
--- a/imap/pom.xml Thu Nov 05 14:28:36 2009 -0800
+++ b/imap/pom.xml Thu Nov 05 14:59:22 2009 -0800
@@ -42,7 +42,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>parent-distrib</artifactId>
- <version>1.4.3-SNAPSHOT</version>
+ <version>1.4.3-rc1</version>
<relativePath>../parent-distrib/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff -r 76be0700b5ac -r dfaa56e47386 javadoc/pom.xml
--- a/javadoc/pom.xml Thu Nov 05 14:28:36 2009 -0800
+++ b/javadoc/pom.xml Thu Nov 05 14:59:22 2009 -0800
@@ -42,13 +42,13 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>all</artifactId>
- <version>1.4.3-SNAPSHOT</version>
+ <version>1.4.3-rc1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.sun.mail</groupId>
<artifactId>javadoc</artifactId>
<packaging>pom</packaging>
- <version>1.4.3-SNAPSHOT</version>
+ <version>1.4.3-rc1</version>
<name>JavaMail API javadocs</name>
<description>${project.name}</description>
diff -r 76be0700b5ac -r dfaa56e47386 logging/pom.xml
--- a/logging/pom.xml Thu Nov 05 14:28:36 2009 -0800
+++ b/logging/pom.xml Thu Nov 05 14:59:22 2009 -0800
@@ -42,7 +42,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>all</artifactId>
- <version>1.4.3-SNAPSHOT</version>
+ <version>1.4.3-rc1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.sun.mail</groupId>
@@ -58,7 +58,7 @@
<dependency>
<groupId>com.sun.mail</groupId>
<artifactId>demo</artifactId>
- <version>1.4.3-SNAPSHOT</version>
+ <version>1.4.3-rc1</version>
</dependency>
</dependencies>
</project>
diff -r 76be0700b5ac -r dfaa56e47386 mail/pom.xml
--- a/mail/pom.xml Thu Nov 05 14:28:36 2009 -0800
+++ b/mail/pom.xml Thu Nov 05 14:59:22 2009 -0800
@@ -42,7 +42,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>all</artifactId>
- <version>1.4.3-SNAPSHOT</version>
+ <version>1.4.3-rc1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>javax.mail</groupId>
diff -r 76be0700b5ac -r dfaa56e47386 mailapi/pom.xml
--- a/mailapi/pom.xml Thu Nov 05 14:28:36 2009 -0800
+++ b/mailapi/pom.xml Thu Nov 05 14:59:22 2009 -0800
@@ -42,7 +42,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>all</artifactId>
- <version>1.4.3-SNAPSHOT</version>
+ <version>1.4.3-rc1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>javax.mail</groupId>
diff -r 76be0700b5ac -r dfaa56e47386 mbox/dist/pom.xml
--- a/mbox/dist/pom.xml Thu Nov 05 14:28:36 2009 -0800
+++ b/mbox/dist/pom.xml Thu Nov 05 14:59:22 2009 -0800
@@ -42,7 +42,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>all</artifactId>
- <version>1.4.3-SNAPSHOT</version>
+ <version>1.4.3-rc1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff -r 76be0700b5ac -r dfaa56e47386 mbox/native/pom.xml
--- a/mbox/native/pom.xml Thu Nov 05 14:28:36 2009 -0800
+++ b/mbox/native/pom.xml Thu Nov 05 14:59:22 2009 -0800
@@ -42,7 +42,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>all</artifactId>
- <version>1.4.3-SNAPSHOT</version>
+ <version>1.4.3-rc1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff -r 76be0700b5ac -r dfaa56e47386 mbox/pom.xml
--- a/mbox/pom.xml Thu Nov 05 14:28:36 2009 -0800
+++ b/mbox/pom.xml Thu Nov 05 14:59:22 2009 -0800
@@ -42,7 +42,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>all</artifactId>
- <version>1.4.3-SNAPSHOT</version>
+ <version>1.4.3-rc1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.sun.mail</groupId>
diff -r 76be0700b5ac -r dfaa56e47386 parent-distrib/pom.xml
--- a/parent-distrib/pom.xml Thu Nov 05 14:28:36 2009 -0800
+++ b/parent-distrib/pom.xml Thu Nov 05 14:59:22 2009 -0800
@@ -42,7 +42,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>all</artifactId>
- <version>1.4.3-SNAPSHOT</version>
+ <version>1.4.3-rc1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.sun.mail</groupId>
diff -r 76be0700b5ac -r dfaa56e47386 pom.xml
--- a/pom.xml Thu Nov 05 14:28:36 2009 -0800
+++ b/pom.xml Thu Nov 05 14:59:22 2009 -0800
@@ -43,7 +43,7 @@
<groupId>com.sun.mail</groupId>
<artifactId>all</artifactId>
<packaging>pom</packaging>
- <version>1.4.3-SNAPSHOT</version>
+ <version>1.4.3-rc1</version>
<name>JavaMail API distribution</name>
<description>${project.name}</description>
<url>
http://java.sun.com/projects/javamail</url>
@@ -69,9 +69,9 @@
</organization>
<properties>
- <mail.version>1.4.3-SNAPSHOT</mail.version>
+ <mail.version>1.4.3-rc1</mail.version>
<!-- like mail.version, but with underscores instead of dots -->
- <mail.zipversion>1_4_3-SNAPSHOT</mail.zipversion>
+ <mail.zipversion>1_4_3-rc1</mail.zipversion>
<mail.spec.version>1.4</mail.spec.version>
<activation-api.version>1.1</activation-api.version>
<!-- defaults that are overridden in mail module -->
diff -r 76be0700b5ac -r dfaa56e47386 pop3/pom.xml
--- a/pop3/pom.xml Thu Nov 05 14:28:36 2009 -0800
+++ b/pop3/pom.xml Thu Nov 05 14:59:22 2009 -0800
@@ -42,7 +42,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>parent-distrib</artifactId>
- <version>1.4.3-SNAPSHOT</version>
+ <version>1.4.3-rc1</version>
<relativePath>../parent-distrib/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff -r 76be0700b5ac -r dfaa56e47386 servlet/pom.xml
--- a/servlet/pom.xml Thu Nov 05 14:28:36 2009 -0800
+++ b/servlet/pom.xml Thu Nov 05 14:59:22 2009 -0800
@@ -42,7 +42,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>all</artifactId>
- <version>1.4.3-SNAPSHOT</version>
+ <version>1.4.3-rc1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.sun.mail</groupId>
diff -r 76be0700b5ac -r dfaa56e47386 smtp/pom.xml
--- a/smtp/pom.xml Thu Nov 05 14:28:36 2009 -0800
+++ b/smtp/pom.xml Thu Nov 05 14:59:22 2009 -0800
@@ -42,7 +42,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>parent-distrib</artifactId>
- <version>1.4.3-SNAPSHOT</version>
+ <version>1.4.3-rc1</version>
<relativePath>../parent-distrib/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff -r 76be0700b5ac -r dfaa56e47386 taglib/pom.xml
--- a/taglib/pom.xml Thu Nov 05 14:28:36 2009 -0800
+++ b/taglib/pom.xml Thu Nov 05 14:59:22 2009 -0800
@@ -42,7 +42,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>all</artifactId>
- <version>1.4.3-SNAPSHOT</version>
+ <version>1.4.3-rc1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.sun.mail</groupId>
diff -r 76be0700b5ac -r dfaa56e47386 webapp/pom.xml
--- a/webapp/pom.xml Thu Nov 05 14:28:36 2009 -0800
+++ b/webapp/pom.xml Thu Nov 05 14:59:22 2009 -0800
@@ -42,7 +42,7 @@
<parent>
<groupId>com.sun.mail</groupId>
<artifactId>all</artifactId>
- <version>1.4.3-SNAPSHOT</version>
+ <version>1.4.3-rc1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.sun.mail</groupId>
diff -r dfaa56e47386 -r 712d07e0bd2b .hgtags
--- a/.hgtags Thu Nov 05 14:59:22 2009 -0800
+++ b/.hgtags Thu Nov 05 15:00:06 2009 -0800
@@ -1,3 +1,4 @@
da19cbb2014590348273983815b35ac8a48717c5 JAVAMAIL-1_4_1
dfb709919353eec53e9dca61b379163186f4d154 1.4.2-beta
24c89d103755d49d62c67368cea5c13b39c2b399 JAVAMAIL-1_4_2
+dfaa56e47386544f4002ade511f2cb0207107734 JAVAMAIL-1_4_3-RC1