Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50303

Update JavaMail download location
JAF is included in Java SE 6

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1036975 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 30edd47..9a4b27d 100644 (file)
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -265,6 +265,10 @@
       <update>
         Improve Tomcat Logging documentation. (kkolinko)
       </update>
+      <fix>
+        <bug>50303</bug>: Update JNDI how-to to reflect new JavaMail download
+        location and that JAF is now included in Java SE 6. (markt) 
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Other">

diff --git a/webapps/docs/jndi-resources-howto.xml b/webapps/docs/jndi-resources-howto.xml
index 763622f..e0011e2 100644 (file)
--- a/webapps/docs/jndi-resources-howto.xml
+++ b/webapps/docs/jndi-resources-howto.xml
@@ -456,7 +456,7 @@ Context envCtx = (Context) initCtx.lookup("java:comp/env");
 Session session = (Session) envCtx.lookup("mail/Session");
 
 Message message = new MimeMessage(session);
-message.setFrom(new InternetAddress(request.getParameter("from"));
+message.setFrom(new InternetAddress(request.getParameter("from")));
 InternetAddress to[] = new InternetAddress[1];
 to[0] = new InternetAddress(request.getParameter("to"));
 message.setRecipients(Message.RecipientType.TO, to);
@@ -494,21 +494,22 @@ Transport.send(message);
 
     <h3>4.  Install the JavaMail libraries</h3>
 
-    <p><a href="http://java.sun.com/products/javamail/downloads/index.html" target="_blank">
-    Download the JavaMail API</a>.  The JavaMail API requires the Java Activation
-    Framework (JAF) API as well.  The Java Activation Framework can be downloaded
-    from <a href="http://java.sun.com/products/javabeans/glasgow/jaf.html">Sun's site</a>.
-    </p>
+    <p><a href="http://www.oracle.com/technetwork/java/index-138643.html">
+    Download the JavaMail API</a>.</p>
 
-    <p>This download includes 2 vital libraries for the configuration; 
-    activation.jar and mail.jar. Unpackage both distributions and place 
-    them into $CATALINA_HOME/lib so that they are available to
-    Tomcat during the initialization of the mail Session Resource.
-    <strong>Note:</strong> placing these jars in both $CATALINA_HOME/lib and a 
-    web application's lib folder will cause an error, so ensure you have
-    them in the $CATALINA_HOME/lib location only.
+    <p>Unpackage the distribution and place mail.jar  into $CATALINA_HOME/lib so
+    that it is available to Tomcat during the initialization of the mail Session
+    Resource. <strong>Note:</strong> placing this jar in both $CATALINA_HOME/lib
+    and a  web application's lib folder will cause an error, so ensure you have
+    it in the $CATALINA_HOME/lib location only.
     </p>
 
+    <h3>5.  Restart Tomcat</h3>
+    
+    <p>For the additional JAR to be visible to Tomcat, it is necessary for the
+    Tomcat instance to be restarted.</p>
+
+
     <h3>Example Application</h3>
 
     <p>The <code>/examples</code> application included with Tomcat contains