Skip to content

Linnea Samila / Moya

Go to a project
Commit 0b1e54fb by Tuukka Kivilahti, TKffTK
Options

will not send mail when debuggin

1 parent 638b114b
Inline Side-by-side
Showing with 49 additions and 19 deletions
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/MailMessageBean.java
...@@ -18,20 +18,20 @@ import javax.mail.internet.MimeMessage.RecipientType; ...@@ -18,20 +18,20 @@ import javax.mail.internet.MimeMessage.RecipientType;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import fi.insomnia.bortal.clientutils.BortalLocalContextHolder;
import fi.insomnia.bortal.util.MailMessage; import fi.insomnia.bortal.util.MailMessage;
/** /**
* Message-Driven Bean implementation class for: MailMessageBean * Message-Driven Bean implementation class for: MailMessageBean
* *
*/ */
@MessageDriven( @MessageDriven(activationConfig = { @ActivationConfigProperty(propertyName = "destinationType", propertyValue = "javax.jms.Queue") }, mappedName = "jms/mailque")
activationConfig = { @ActivationConfigProperty(propertyName = "destinationType", propertyValue = "javax.jms.Queue") },
mappedName = "jms/mailque")
public class MailMessageBean implements MessageListener { public class MailMessageBean implements MessageListener {
@Resource(name = "mail/lanbortal") @Resource(name = "mail/lanbortal")
private Session mailSession; private Session mailSession;
private static final Logger logger = LoggerFactory.getLogger(MailMessageBean.class); private static final Logger logger = LoggerFactory
.getLogger(MailMessageBean.class);
/** /**
* Default constructor. * Default constructor.
...@@ -50,19 +50,35 @@ public class MailMessageBean implements MessageListener { ...@@ -50,19 +50,35 @@ public class MailMessageBean implements MessageListener {
try { try {
mailmsg = (MailMessage) ((ObjectMessage) message).getObject(); mailmsg = (MailMessage) ((ObjectMessage) message).getObject();
logger.debug("Got message {}", mailmsg.getToName()); logger.debug("Got message {}", mailmsg.getToName());
MimeMessage msg = new MimeMessage(mailSession);
msg.setSubject(mailmsg.getSubject()); if (BortalLocalContextHolder.isInDevelopmentMode()) {
msg.setFrom(mailmsg.getFrom()); String dmessage = " To: "
msg.setRecipient(RecipientType.TO, mailmsg.getTo()); + mailmsg.getTo() + "\n Subject: "
msg.setText(mailmsg.getMessage(), mailmsg.getCharset()); + mailmsg.getSubject() + "\n Text: "
Transport.send(msg); + mailmsg.getMessage() + "\n";
logger.debug("Not sendet mail (debug -mode): {}", dmessage);
} else {
MimeMessage msg = new MimeMessage(mailSession);
msg.setSubject(mailmsg.getSubject());
msg.setFrom(mailmsg.getFrom());
msg.setRecipient(RecipientType.TO, mailmsg.getTo());
msg.setText(mailmsg.getMessage(), mailmsg.getCharset());
Transport.send(msg);
}
} catch (JMSException e) { } catch (JMSException e) {
logger.debug("Error receiving jms for {}", mailmsg, e); logger.debug("Error receiving jms for {}", mailmsg, e);
} catch (MessagingException e) { } catch (MessagingException e) {
logger.debug("Unsupported encoding exception while sending mail to {}", mailmsg, e); logger.debug(
"Unsupported encoding exception while sending mail to {}",
mailmsg, e);
} catch (UnsupportedEncodingException e) { } catch (UnsupportedEncodingException e) {
logger.debug("Unsupported encoding exception while sending mail to {}", mailmsg, e); logger.debug(
"Unsupported encoding exception while sending mail to {}",
mailmsg, e);
} }
} }
......
code/LanBortalBeansClient/ejbModule/fi/insomnia/bortal/clientutils/BortalLocalContextHolder.java
...@@ -11,6 +11,8 @@ public class BortalLocalContextHolder { ...@@ -11,6 +11,8 @@ public class BortalLocalContextHolder {
private String hostname; private String hostname;
private final Map<IAppPermission, Boolean> rightcache = new HashMap<IAppPermission, Boolean>(); private final Map<IAppPermission, Boolean> rightcache = new HashMap<IAppPermission, Boolean>();
private static boolean inDevelopmentMode = false;
public BortalLocalContextHolder() { public BortalLocalContextHolder() {
} }
...@@ -63,4 +65,16 @@ public class BortalLocalContextHolder { ...@@ -63,4 +65,16 @@ public class BortalLocalContextHolder {
return getThread(); return getThread();
} }
public static boolean isInDevelopmentMode() {
return inDevelopmentMode;
}
public static void setInDevelopmentMode(boolean developmentMode) {
inDevelopmentMode = developmentMode;
}
} }
\ No newline at end of file
code/LanBortalWeb/WebContent/index.xhtml
...@@ -10,10 +10,10 @@ ...@@ -10,10 +10,10 @@
<ui:define name="content"> <ui:define name="content">
<h:outputText rendered="#{sessionHandler.isInDevelopmentMode()}"> <h:outputLabel rendered="#{sessionHandler.isInDevelopmentMode()}">
Development-tilassa. Development-tilassa.
Vaihda web.xml-tiedostosta ohjelman tila (javax.faces.PROJECT_STAGE) Productioniksi ennen kuin julkaiset ohjelman tuotantoon. Vaihda web.xml-tiedostosta ohjelman tila (javax.faces.PROJECT_STAGE) Productioniksi ennen kuin julkaiset ohjelman tuotantoon.
</h:outputText> </h:outputLabel>
<h1>Insomnia lippukauppa</h1> <h1>Insomnia lippukauppa</h1>
<h3>Lippujen hinnat</h3> <h3>Lippujen hinnat</h3>
......
code/LanBortalWeb/src/fi/insomnia/bortal/HostnameFilter.java
...@@ -26,7 +26,7 @@ public class HostnameFilter implements Filter { ...@@ -26,7 +26,7 @@ public class HostnameFilter implements Filter {
private static final Logger logger = LoggerFactory private static final Logger logger = LoggerFactory
.getLogger(HostnameFilter.class); .getLogger(HostnameFilter.class);
private static boolean developmentMode = false; private boolean developmentMode = false;
/** /**
* Default constructor. * Default constructor.
...@@ -75,6 +75,7 @@ public class HostnameFilter implements Filter { ...@@ -75,6 +75,7 @@ public class HostnameFilter implements Filter {
EventBeanLocal.HTTP_URL_HOSTNAME, hostname); EventBeanLocal.HTTP_URL_HOSTNAME, hostname);
BortalLocalContextHolder.setHostname(hostname); BortalLocalContextHolder.setHostname(hostname);
BortalLocalContextHolder.setInDevelopmentMode(developmentMode);
if (httpRequest.getUserPrincipal() == null) { if (httpRequest.getUserPrincipal() == null) {
try { try {
...@@ -124,8 +125,5 @@ public class HostnameFilter implements Filter { ...@@ -124,8 +125,5 @@ public class HostnameFilter implements Filter {
return ret; return ret;
} }
public static boolean isDevelopmentMode() {
return developmentMode;
}
} }
code/LanBortalWeb/src/fi/insomnia/bortal/handler/SessionHandler.java
...@@ -21,6 +21,7 @@ import fi.insomnia.bortal.HostnameFilter; ...@@ -21,6 +21,7 @@ import fi.insomnia.bortal.HostnameFilter;
import fi.insomnia.bortal.beans.EventBeanLocal; import fi.insomnia.bortal.beans.EventBeanLocal;
import fi.insomnia.bortal.beans.PermissionBeanLocal; import fi.insomnia.bortal.beans.PermissionBeanLocal;
import fi.insomnia.bortal.beans.RoleBeanLocal; import fi.insomnia.bortal.beans.RoleBeanLocal;
import fi.insomnia.bortal.clientutils.BortalLocalContextHolder;
import fi.insomnia.bortal.enums.apps.IAppPermission; import fi.insomnia.bortal.enums.apps.IAppPermission;
import fi.insomnia.bortal.model.User; import fi.insomnia.bortal.model.User;
...@@ -155,6 +156,6 @@ public class SessionHandler { ...@@ -155,6 +156,6 @@ public class SessionHandler {
} }
public boolean isInDevelopmentMode() { public boolean isInDevelopmentMode() {
return HostnameFilter.isDevelopmentMode(); return BortalLocalContextHolder.isInDevelopmentMode();
} }
} }
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!