[Wonder-cvs] CVS: Wonder/Common/Frameworks/ERJavaMail/Sources/er/javamail ERJavaMail.java, 1.22, 1.23

[Mike S. <ms...@us...>]

Update of /cvsroot/wonder/Wonder/Common/Frameworks/ERJavaMail/Sources/er/javamail
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv20046/Sources/er/javamail

Modified Files:
	ERJavaMail.java 
Log Message:
initialize framework from System properties with new framework loader, require adminEmail only if centralize is true, and throw an exception from setAdminEmail if the address is invalid (rather than silently ignoring)

Index: ERJavaMail.java
===================================================================
RCS file: /cvsroot/wonder/Wonder/Common/Frameworks/ERJavaMail/Sources/er/javamail/ERJavaMail.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** ERJavaMail.java	20 Sep 2006 22:15:07 -0000	1.22
--- ERJavaMail.java	25 Sep 2006 15:00:59 -0000	1.23
***************
*** 88,91 ****
--- 88,92 ----
                  ("The compilation of the ORO Regexp pattern failed in ERJavaMail!");
          }
+         initializeFrameworkFromSystemProperties();
      }
  
***************
*** 97,106 ****
       */
      public void initializeFrameworkFromSystemProperties () {
!         // Admin Email
!         String adminEmail = System.getProperty ("er.javamail.adminEmail");
!         if ((adminEmail == null) || (adminEmail.length () == 0))
!             throw new RuntimeException ("ERJavaMail: the property er.javamail.adminEmail is not specified!");
!         this.setAdminEmail (adminEmail);
!         log.debug ("er.javamail.adminEmail: " + _adminEmail);
  
          // JavaMail Debug Enabled ?
--- 98,117 ----
       */
      public void initializeFrameworkFromSystemProperties () {
!       // Centralize mails ?
!       boolean centralize = ERXProperties.booleanForKey ("er.javamail.centralize");
!       this.setCentralize (centralize);
!       log.debug ("er.javamail.centralize: " + centralize);
! 
!       if (centralize) {
!         try {
!           // Admin Email
!           String adminEmail = System.getProperty ("er.javamail.adminEmail");
!           this.setAdminEmail (adminEmail);
!           log.debug ("er.javamail.adminEmail: " + _adminEmail);
!         }
!         catch (IllegalArgumentException e) {
!           throw new RuntimeException("You must specify a valid er.javamail.adminEmail value when er.javamail.centralize is enabled.", e);
!         }
!       }
  
          // JavaMail Debug Enabled ?
***************
*** 109,117 ****
          log.debug ("er.javamail.debugEnabled: " + debug);
  
-         // Centralize mails ?
-         boolean centralize = ERXProperties.booleanForKey ("er.javamail.centralize");
-         this.setCentralize (centralize);
-         log.debug ("er.javamail.centralize: " + centralize);
- 
           // Number of messages that the sender queue can hold at a time
          int queueSize = ERXProperties.intForKey ("er.javamail.senderQueue.size");
--- 120,123 ----
***************
*** 268,272 ****
       */
      public void setAdminEmail (String adminEmail) {
! 	if (this.isValidEmail (adminEmail))
  	    _adminEmail = adminEmail;
      }
--- 274,280 ----
       */
      public void setAdminEmail (String adminEmail) {
!       if (!isValidEmail (adminEmail)) {
!         throw new IllegalArgumentException("You specified an invalid admin email address '" + adminEmail + "'.");
!       }
  	    _adminEmail = adminEmail;
      }