[OFBiz] SVN: r7740 - in trunk: base/config base/lib framework/service/src/org/ofbiz/service/mail

[jonesde@svn.ofbiz.org]

Author: jonesde
Date: 2006-06-04 00:45:50 -0500 (Sun, 04 Jun 2006)
New Revision: 7740

Added:
   trunk/base/lib/mail.jar
Modified:
   trunk/base/config/ofbiz-containers.xml
   trunk/framework/service/src/org/ofbiz/service/mail/JavaMailContainer.java
Log:
Added mail.jar from Glassfish v1 (rev 48) milestone; seems to work though it's not clear if some of this might require Java 5; changed ofbiz-containers to load the JavaMailContainer again, and fixed small NPE problem in there

Modified: trunk/base/config/ofbiz-containers.xml
===================================================================
--- trunk/base/config/ofbiz-containers.xml	2006-06-04 04:11:58 UTC (rev 7739)
+++ trunk/base/config/ofbiz-containers.xml	2006-06-04 05:45:50 UTC (rev 7740)
@@ -48,7 +48,6 @@
     </container>
 
     <!-- JavaMail Listener Container -->
-    <!--
     <container name="javamail-container" class="org.ofbiz.service.mail.JavaMailContainer">
         <property name="delegator-name" value="default"/>
         <property name="dispatcher-name" value="JavaMailDispatcher"/>
@@ -59,10 +58,9 @@
             <property name="mail.host" value="[host]"/>
             <property name="mail.user" value="[user]"/>
             <property name="mail.pass" value="[pass]"/>
-            <property name="mail.debug" value="false"/>
+            <property name="mail.debug" value="true"/>
         </property>
     </container>
-    -->
 
     <!-- load Shark Workflow Engine -->
     <!-- NOTE: before uncommenting this please see the instructions in the ofbiz/OPTIONAL_LIBRARIES file.

Added: trunk/base/lib/mail.jar
===================================================================
(Binary files differ)


Property changes on: trunk/base/lib/mail.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/framework/service/src/org/ofbiz/service/mail/JavaMailContainer.java
===================================================================
--- trunk/framework/service/src/org/ofbiz/service/mail/JavaMailContainer.java	2006-06-04 04:11:58 UTC (rev 7739)
+++ trunk/framework/service/src/org/ofbiz/service/mail/JavaMailContainer.java	2006-06-04 05:45:50 UTC (rev 7740)
@@ -172,7 +172,7 @@
         }
 
         // re-write the URLName including the password for this store
-        if (store != null) {
+        if (store != null && store.getURLName() != null) {
             URLName urlName = this.updateUrlName(store.getURLName(), session.getProperties());
             Debug.log("URLName - " + urlName.toString(), module);
             try {