Project: javamail
Repository: mercurial
Revision: 310
Author: shannon
Date: 2010-10-26 19:30:10 UTC
Link:
Log Message:
------------
More fixes after changing group and artifact IDs.
Fix dependency for mbox build.
Fix NPE introduced by previous change.
Revisions:
----------
308
309
310
Modified Paths:
---------------
assembly.xml
client/pom.xml
demo/pom.xml
dsn/pom.xml
javadoc/pom.xml
logging/pom.xml
mbox/pom.xml
outlook/pom.xml
parent-distrib/pom.xml
pom.xml
servlet/pom.xml
taglib/pom.xml
webapp/pom.xml
mbox/native/pom.xml
mail/src/main/java/com/sun/mail/smtp/SMTPTransport.java
Diffs:
------
diff -r e1f64886091f -r 1a87fd576b3c assembly.xml
--- a/assembly.xml Sat Oct 23 23:33:41 2010 -0700
+++ b/assembly.xml Mon Oct 25 16:10:20 2010 -0700
@@ -50,13 +50,13 @@
<!-- include the main mail.jar file -->
<moduleSet>
<includes>
- <include>javax.mail:mail</include>
+ <include>com.sun.mail:javax.mail</include>
</includes>
<binaries>
<includeDependencies>false</includeDependencies>
<unpack>false</unpack>
<outputFileNameMapping>
- ${module.artifactId}.${module.extension}
+ mail.jar
</outputFileNameMapping>
</binaries>
</moduleSet>
@@ -64,7 +64,7 @@
<!-- include jar files from these modules in the lib directory -->
<moduleSet>
<includes>
- <include>javax.mail:mailapi</include>
+ <include>com.sun.mail:mailapi</include>
<include>com.sun.mail:smtp</include>
<include>com.sun.mail:imap</include>
<include>com.sun.mail:pop3</include>
diff -r e1f64886091f -r 1a87fd576b3c client/pom.xml
--- a/client/pom.xml Sat Oct 23 23:33:41 2010 -0700
+++ b/client/pom.xml Mon Oct 25 16:10:20 2010 -0700
@@ -58,8 +58,8 @@
<dependencies>
<dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
+ <groupId>com.sun.mail</groupId>
+ <artifactId>javax.mail</artifactId>
</dependency>
</dependencies>
</project>
diff -r e1f64886091f -r 1a87fd576b3c demo/pom.xml
--- a/demo/pom.xml Sat Oct 23 23:33:41 2010 -0700
+++ b/demo/pom.xml Mon Oct 25 16:10:20 2010 -0700
@@ -73,8 +73,8 @@
<dependencies>
<dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
+ <groupId>com.sun.mail</groupId>
+ <artifactId>javax.mail</artifactId>
</dependency>
</dependencies>
</project>
diff -r e1f64886091f -r 1a87fd576b3c dsn/pom.xml
--- a/dsn/pom.xml Sat Oct 23 23:33:41 2010 -0700
+++ b/dsn/pom.xml Mon Oct 25 16:10:20 2010 -0700
@@ -64,8 +64,8 @@
<dependencies>
<dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
+ <groupId>com.sun.mail</groupId>
+ <artifactId>javax.mail</artifactId>
</dependency>
</dependencies>
</project>
diff -r e1f64886091f -r 1a87fd576b3c javadoc/pom.xml
--- a/javadoc/pom.xml Sat Oct 23 23:33:41 2010 -0700
+++ b/javadoc/pom.xml Mon Oct 25 16:10:20 2010 -0700
@@ -173,28 +173,20 @@
</additionalparam>
<sourcepath>${basedir}/target/javadoc</sourcepath>
<links>
- <link>
http://java.sun.com/j2se/1.4.2/docs/api</link>
- <link>
http://java.sun.com/javase/technologies/desktop/javabeans/glasgow/javadocs</link>
+ <link>
http://java.sun.com/j2se/1.4.2/docs/api/</link>
+ <link>
http://java.sun.com/javase/technologies/desktop/javabeans/glasgow/javadocs/</link>
</links>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
-
- <!--
- <resources>
- <resource>
- <directory>../src/main/resources</directory>
- </resource>
- </resources>
- -->
</build>
<dependencies>
<dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
+ <groupId>com.sun.mail</groupId>
+ <artifactId>javax.mail</artifactId>
</dependency>
<dependency>
<groupId>com.sun.mail</groupId>
diff -r e1f64886091f -r 1a87fd576b3c logging/pom.xml
--- a/logging/pom.xml Sat Oct 23 23:33:41 2010 -0700
+++ b/logging/pom.xml Mon Oct 25 16:10:20 2010 -0700
@@ -58,13 +58,13 @@
<dependencies>
<dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
+ <groupId>com.sun.mail</groupId>
+ <artifactId>javax.mail</artifactId>
</dependency>
<dependency>
<groupId>com.sun.mail</groupId>
<artifactId>demo</artifactId>
- <version>1.4.4-SNAPSHOT</version>
+ <version>${mail.version}</version>
</dependency>
</dependencies>
</project>
diff -r e1f64886091f -r 1a87fd576b3c mbox/pom.xml
--- a/mbox/pom.xml Sat Oct 23 23:33:41 2010 -0700
+++ b/mbox/pom.xml Mon Oct 25 16:10:20 2010 -0700
@@ -64,8 +64,8 @@
<dependencies>
<dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
+ <groupId>com.sun.mail</groupId>
+ <artifactId>javax.mail</artifactId>
</dependency>
</dependencies>
</project>
diff -r e1f64886091f -r 1a87fd576b3c outlook/pom.xml
--- a/outlook/pom.xml Sat Oct 23 23:33:41 2010 -0700
+++ b/outlook/pom.xml Mon Oct 25 16:10:20 2010 -0700
@@ -58,8 +58,8 @@
<dependencies>
<dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
+ <groupId>com.sun.mail</groupId>
+ <artifactId>javax.mail</artifactId>
</dependency>
</dependencies>
</project>
diff -r e1f64886091f -r 1a87fd576b3c parent-distrib/pom.xml
--- a/parent-distrib/pom.xml Sat Oct 23 23:33:41 2010 -0700
+++ b/parent-distrib/pom.xml Mon Oct 25 16:10:20 2010 -0700
@@ -72,7 +72,7 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>com.sun..mail</groupId>
+ <groupId>com.sun.mail</groupId>
<artifactId>javax.mail</artifactId>
<version>${mail.version}</version>
</artifactItem>
diff -r e1f64886091f -r 1a87fd576b3c pom.xml
--- a/pom.xml Sat Oct 23 23:33:41 2010 -0700
+++ b/pom.xml Mon Oct 25 16:10:20 2010 -0700
@@ -469,8 +469,8 @@
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
+ <groupId>com.sun.mail</groupId>
+ <artifactId>javax.mail</artifactId>
<version>${mail.version}</version>
</dependency>
<dependency>
diff -r e1f64886091f -r 1a87fd576b3c servlet/pom.xml
--- a/servlet/pom.xml Sat Oct 23 23:33:41 2010 -0700
+++ b/servlet/pom.xml Mon Oct 25 16:10:20 2010 -0700
@@ -62,8 +62,8 @@
<artifactId>servlet-api</artifactId>
</dependency>
<dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
+ <groupId>com.sun.mail</groupId>
+ <artifactId>javax.mail</artifactId>
</dependency>
</dependencies>
</project>
diff -r e1f64886091f -r 1a87fd576b3c taglib/pom.xml
--- a/taglib/pom.xml Sat Oct 23 23:33:41 2010 -0700
+++ b/taglib/pom.xml Mon Oct 25 16:10:20 2010 -0700
@@ -67,8 +67,8 @@
<artifactId>servlet-api</artifactId>
</dependency>
<dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
+ <groupId>com.sun.mail</groupId>
+ <artifactId>javax.mail</artifactId>
</dependency>
</dependencies>
</project>
diff -r e1f64886091f -r 1a87fd576b3c webapp/pom.xml
--- a/webapp/pom.xml Sat Oct 23 23:33:41 2010 -0700
+++ b/webapp/pom.xml Mon Oct 25 16:10:20 2010 -0700
@@ -83,8 +83,8 @@
<artifactId>servlet-api</artifactId>
</dependency>
<dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
+ <groupId>com.sun.mail</groupId>
+ <artifactId>javax.mail</artifactId>
</dependency>
</dependencies>
</project>
diff -r 1a87fd576b3c -r 45bdb0e0fd9d mbox/native/pom.xml
--- a/mbox/native/pom.xml Mon Oct 25 16:10:20 2010 -0700
+++ b/mbox/native/pom.xml Tue Oct 26 10:57:28 2010 -0700
@@ -127,8 +127,8 @@
<dependencies>
<dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
+ <groupId>com.sun.mail</groupId>
+ <artifactId>javax.mail</artifactId>
</dependency>
<dependency>
<groupId>com.sun.mail</groupId>
diff -r 45bdb0e0fd9d -r 60282749aead mail/src/main/java/com/sun/mail/smtp/SMTPTransport.java
--- a/mail/src/main/java/com/sun/mail/smtp/SMTPTransport.java Tue Oct 26 10:57:28 2010 -0700
+++ b/mail/src/main/java/com/sun/mail/smtp/SMTPTransport.java Tue Oct 26 12:30:10 2010 -0700
@@ -666,7 +666,8 @@
if ((useAuth || (user != null && passwd != null)) &&
(supportsExtension("AUTH") ||
supportsExtension("AUTH=LOGIN"))) {
- return authenticate(user, passwd);
+ connected = authenticate(user, passwd);
+ return connected;
}
// we connected correctly