[patch] Patch for enhancement described above

emailnotifier_patch.txt (text/plain), 4.76 KB, created by Markus Angst on 2007-07-27 09:52:49 UTC

(hide)

Description: Patch for enhancement described above

Filename:

MIME Type:

Creator: Markus Angst

Created: 2007-07-27 09:52:49 UTC

Size: 4.76 KB

patch

obsolete

>Index: C:/lenya/lenya-1.4-dev/src/modules/notification/java/src/org/apache/lenya/notification/EmailNotifier.java >=================================================================== >--- C:/lenya/lenya-1.4-dev/src/modules/notification/java/src/org/apache/lenya/notification/EmailNotifier.java (revision 560220) >+++ C:/lenya/lenya-1.4-dev/src/modules/notification/java/src/org/apache/lenya/notification/EmailNotifier.java (working copy) >@@ -24,7 +24,10 @@ > import org.apache.avalon.framework.configuration.Configuration; > import org.apache.avalon.framework.configuration.ConfigurationException; > import org.apache.avalon.framework.service.ServiceException; >+import org.apache.avalon.framework.service.ServiceSelector; >+import org.apache.cocoon.components.modules.input.InputModule; > import org.apache.cocoon.mail.MailSender; >+import org.apache.cocoon.sitemap.PatternException; > import org.apache.lenya.ac.Identifiable; > import org.apache.lenya.ac.User; > import org.apache.lenya.inbox.InboxNotifier; >@@ -34,8 +37,11 @@ > */ > public class EmailNotifier extends InboxNotifier implements Configurable { > >- protected void notify(User recipient, Message translatedMessage) throws NotificationException { >- >+ protected ServiceSelector selector; >+ >+ protected void notify(User recipient, Message translatedMessage) >+ throws NotificationException { >+ initializeAttributesIfNotDone(); > super.notify(recipient, translatedMessage); > > if (!this.manager.hasService(MailSender.ROLE)) { >@@ -77,17 +83,82 @@ > } > } > >+ private boolean init; > private String smtpHost; > private String username; > private String password; >+ private Configuration conf; > > public void configure(Configuration config) throws ConfigurationException { >- Configuration smtp = config.getChild("smtp"); >- this.smtpHost = smtp.getAttribute("host"); >- this.username = smtp.getAttribute("username", null); >- if (this.username != null) { >- this.password = smtp.getAttribute("password"); >+ this.conf = config; >+ this.init = false; >+ } >+ >+ public void initializeAttributesIfNotDone() throws NotificationException { >+ if (this.init == true) { >+ return; >+ } >+ try { >+ Configuration smtp = conf.getChild("smtp"); >+ this.smtpHost = getAttr(smtp, "host", false); >+ this.username = getAttr(smtp, "username", true); >+ if (this.username != null) { >+ this.password = getAttr(smtp, "password", false); >+ } >+ } catch (ConfigurationException e) { >+ getLogger().error("Sending mail failed (configuration error): ", e); >+ throw new NotificationException(e); >+ } catch (PatternException e) { >+ getLogger().error("Sending mail failed (pattern error): ", e); >+ throw new NotificationException(e); >+ } >+ this.init = true; >+ } >+ >+ private String getAttr(Configuration smtp, String attName, boolean defval) >+ throws ConfigurationException, PatternException { >+ String s; >+ int start; >+ >+ if (defval == true) { >+ s = smtp.getAttribute(attName, null); >+ } else { >+ s = smtp.getAttribute(attName); > } >+ start = s.indexOf("${"); >+ if (start != -1) { >+ s = s.substring(start + 2, s.length() - 1); >+ s = resolveVariable(s); >+ } >+ return s; > } > >+ private String resolveVariable(String variableName) throws PatternException { >+ InputModule module = null; >+ String moduleName = "properties"; >+ >+ if (this.selector == null) { >+ try { >+ // First access to a module : lookup selector >+ this.selector = (ServiceSelector)this.manager.lookup(InputModule.ROLE + >+ "Selector"); >+ } catch(ServiceException ce) { >+ throw new PatternException("Cannot access input modules selector", ce); >+ } >+ } >+ try { >+ module = (InputModule)this.selector.select(moduleName); >+ Object value = module.getAttribute(variableName, null, null); >+ if (value != null) { >+ return (String)value; >+ } >+ } catch(ServiceException compEx) { >+ throw new PatternException("Cannot get module '" + moduleName + "'"); >+ } catch(ConfigurationException confEx) { >+ throw new PatternException("Cannot get variable '" + variableName + "'"); >+ } finally { >+ this.selector.release(module); >+ } >+ return ""; >+ } > } View Attachment As Diff View Attachment As Raw

This is ASF Bugzilla: the Apache Software Foundation bug system. In case of problems with the functioning of ASF Bugzilla, please contact bugzilla-admin@apache.org. Please Note: this e-mail address is only for reporting problems with ASF Bugzilla. Mail about any other subject will be silently ignored.

• • Home
  • | New
  • | Browse
  • | Search
  • |
    [?]
  • | Reports
  • | Help
  • | New Account
  • | Log In
    Remember [x]
  • | Forgot Password
    Login: [x]