Author: jleroux
Date: Sat Apr 18 14:06:59 2009
New Revision: 766326
URL:
http://svn.apache.org/viewvc?rev=766326&view=revLog:
Applied fix from trunk for revision: 766325
Modified:
ofbiz/branches/release09.04/ (props changed)
ofbiz/branches/release09.04/framework/common/config/general.properties
Propchange: ofbiz/branches/release09.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Apr 18 14:06:59 2009
@@ -1 +1 @@
-/ofbiz/trunk:765933,766011,766015,766293,766307,766316
+/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325
Modified: ofbiz/branches/release09.04/framework/common/config/general.properties
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release09.04/framework/common/config/general.properties?rev=766326&r1=766325&r2=766326&view=diff==============================================================================
--- ofbiz/branches/release09.04/framework/common/config/general.properties (original)
+++ ofbiz/branches/release09.04/framework/common/config/general.properties Sat Apr 18 14:06:59 2009
@@ -60,17 +60,17 @@
usps.address.match=(^.*?p[\\. ]*o[\\. ]*box.*$)|(^.*?post.*?office.*?box.*$)|((^|(^.*? ))r[\\. ]*r[\\. ]*(( +)|([0-9#]+)).*$)|(^.*?rural.*?route.*$)
# -- mail notifications enabled (Y|N)
-mail.notifications.enabled=N
+mail.notifications.enabled=Y
# -- redirect all mail notifications to this address for testing
-#mail.notifications.redirectTo=
+mail.notifications.redirectTo=
[hidden email]
# -- the default mail server to use
-mail.smtp.relay.host=localhost
+mail.smtp.relay.host=192.168.2.3
# -- SMTP Auth settings
-#mail.smtp.auth.user=
-#mail.smtp.auth.password=
+mail.smtp.auth.user=
+mail.smtp.auth.password=
# -- Additional Required Fields needed for Gmail and other non traditional smtp servers
# -- These added fields also work for Yahoo business mail for instance
@@ -110,8 +110,11 @@
https.demo.ofbiz.org=ABQIAAAAtt0d8djaYFkk8N5LJVcDSBT8mLFVw0UmWN4r07bOuUQ4UabwzBR-S6mi2C6yWQ3KgNfeTwPMkzxS3w
http.demo.ofbiz.org=ABQIAAAAtt0d8djaYFkk8N5LJVcDSBRoVXyd5dd326mHOq_i9bqLAUXkDBRqjQ4AJUrcmS2zceBQ5QbrIybgdA
+https.demo904.ofbiz.org=ABQIAAAAtt0d8djaYFkk8N5LJVcDSBS-zH98ouEWMGSTtMT5OXqfumgA8hSRIGRTY_YC0K-6_hP7jNaWeRYcBw
+http.demo904.ofbiz.org=ABQIAAAAtt0d8djaYFkk8N5LJVcDSBQ40GxeoIYvic1lQQv1lf_QVdXOMhTx4uvOBVGpk7eDWpQLPY9iIhc3TQ
+
https.lamouline.myvnc.com=ABQIAAAAtt0d8djaYFkk8N5LJVcDSBSzEzroB3fSdgSb-2dwDb6HBu9wWBToPcXMOlizmh-CuuHcApTmyJLuZA
http.lamouline.myvnc.com=ABQIAAAAtt0d8djaYFkk8N5LJVcDSBSW4gdJuhtquQGZ6TdBCoQ9-UcKjBR51jwokpCIee0XaL6FQu35VzcqxA
https.localhost=ABQIAAAAtt0d8djaYFkk8N5LJVcDSBQN-clGH2vvMMwJjYtcwF78UzZgEBTN70S6uIgRoAtXRkADNoesbw5etg
-http.localhost=ABQIAAAAtt0d8djaYFkk8N5LJVcDSBT2yXp_ZAY8_ufC3CFXhHIE1NvwkxR3euHYk9bpwvdF2Qg1EYO1LQitHA
\ No newline at end of file
+http.localhost=ABQIAAAAtt0d8djaYFkk8N5LJVcDSBT2yXp_ZAY8_ufC3CFXhHIE1NvwkxR3euHYk9bpwvdF2Qg1EYO1LQitHA