You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2015/01/04 20:48:53 UTC
[19/20] isis git commit: ISIS-987: introduce
EmailService#isConfigured() and EmailNotificationService#isConfigured() as a
way to determine if have been configured.
ISIS-987: introduce EmailService#isConfigured() and EmailNotificationService#isConfigured() as a way to determine if have been configured.
... rather than throwing exception in init(). the IsisSignInPanel now also checks tha the EmailNotificationService has been configured before rendering the signup or password reset links.
Also:
- completed the implementation in IsisSignInPanel to honour "isis.viewer.wicket.suppressPasswordReset" configuration property.
- minor tweaks to email templates and i18n properties for WicketSignInPage.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/09510a4c
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/09510a4c
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/09510a4c
Branch: refs/heads/master
Commit: 09510a4c3500440651a12b367d84183aa3340366
Parents: 65e998d
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Sun Jan 4 19:24:52 2015 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Sun Jan 4 19:24:52 2015 +0000
----------------------------------------------------------------------
.../wicket/ui/pages/login/IsisSignInPanel.java | 73 ++++++++-----
.../wicket/ui/pages/login/WicketSignInPage.java | 10 +-
.../ui/pages/login/WicketSignInPage.properties | 4 +-
.../applib/services/email/EmailService.java | 7 ++
.../userreg/EmailNotificationService.java | 6 ++
.../email/EmailNotificationServiceDefault.java | 49 +++++++--
.../services/email/EmailServiceDefault.java | 107 +++++++++----------
.../email/EmailVerificationTemplate.html | 2 +-
.../services/email/PasswordResetTemplate.html | 2 +-
9 files changed, 159 insertions(+), 101 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/09510a4c/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/IsisSignInPanel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/IsisSignInPanel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/IsisSignInPanel.java
index e8b657f..8d86355 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/IsisSignInPanel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/IsisSignInPanel.java
@@ -22,10 +22,13 @@ package org.apache.isis.viewer.wicket.ui.pages.login;
import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
import javax.inject.Inject;
+import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.Page;
import org.apache.wicket.authroles.authentication.panel.SignInPanel;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
+import org.apache.isis.applib.services.email.EmailService;
+import org.apache.isis.applib.services.userreg.EmailNotificationService;
import org.apache.isis.applib.services.userreg.UserRegistrationService;
import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.viewer.wicket.model.models.PageType;
@@ -40,7 +43,7 @@ import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistry;
public class IsisSignInPanel extends SignInPanel {
private final boolean clearOriginalDestination;
- private final boolean forgotPassword;
+ private final boolean passwordResetLink;
/**
* Constructor
@@ -49,16 +52,18 @@ public class IsisSignInPanel extends SignInPanel {
* the component id
* @param rememberMe
* True if form should include a remember-me checkbox
+ * @param passwordResetLink
+ * True if form should include the password reset link
* @param continueToOriginalDestination
* A flag indicating whether to continue to the originally requested destination
*/
public IsisSignInPanel(
final String id,
final boolean rememberMe,
- final boolean forgotPassword,
+ final boolean passwordResetLink,
final boolean continueToOriginalDestination) {
super(id, rememberMe);
- this.forgotPassword = forgotPassword;
+ this.passwordResetLink = passwordResetLink;
this.clearOriginalDestination = !continueToOriginalDestination;
}
@@ -66,43 +71,47 @@ public class IsisSignInPanel extends SignInPanel {
protected void onInitialize() {
super.onInitialize();
- addPasswdResetLink("passwdResetLink");
-
+ addPasswordResetLink("passwdResetLink");
addSignUpLink("signUpLink");
addNotificationPanel("feedback");
}
- private void addPasswdResetLink(String id) {
- Class < ?extends Page> passwdResetPageClass = pageClassRegistry.getPageClass(PageType.PASSWORD_RESET);
- final BookmarkablePageLink<Void> passwdResetLink = new BookmarkablePageLink<>(id, passwdResetPageClass);
- IsisContext.doInSession(new Runnable() {
- @Override
- public void run() {
- final UserRegistrationService userRegistrationService = IsisContext.getPersistenceSession().getServicesInjector().lookupService(UserRegistrationService.class);
- passwdResetLink.setVisibilityAllowed(userRegistrationService != null);
- }
- });
- getSignInForm().addOrReplace(passwdResetLink);
+ private void addPasswordResetLink(final String id) {
+ final Class < ?extends Page> passwordResetPageClass = pageClassRegistry.getPageClass(PageType.PASSWORD_RESET);
+ final BookmarkablePageLink<Void> passwordResetLink =
+ new BookmarkablePageLink<>(id, passwordResetPageClass);
+
+ setVisibilityAllowedBasedOnAvailableServices(passwordResetLink);
+
+ // in addition, don't show password reset link has been suppressed.
+ if(!this.passwordResetLink) {
+ passwordResetLink.setVisibilityAllowed(false);
+ }
+
+ getSignInForm().addOrReplace(passwordResetLink);
+ }
+
+ private void addSignUpLink(final String id) {
+ final Class<? extends Page> signUpPageClass = pageClassRegistry.getPageClass(PageType.SIGN_UP);
+ final BookmarkablePageLink<Void> signUpLink = new BookmarkablePageLink<>(id, signUpPageClass);
+ setVisibilityAllowedBasedOnAvailableServices(signUpLink);
+ getSignInForm().addOrReplace(signUpLink);
}
- protected void addNotificationPanel(String id) {
+ private void addNotificationPanel(final String id) {
addOrReplace(new NotificationPanel(id));
}
- protected void addSignUpLink(String id) {
- Class<? extends Page> signUpPageClass = pageClassRegistry.getPageClass(PageType.SIGN_UP);
- final BookmarkablePageLink<Void> signUpLink = new BookmarkablePageLink<>(id, signUpPageClass);
+ private void setVisibilityAllowedBasedOnAvailableServices(final Component component) {
IsisContext.doInSession(new Runnable() {
@Override
public void run() {
- final UserRegistrationService userRegistrationService = IsisContext.getPersistenceSession().getServicesInjector().lookupService(UserRegistrationService.class);
- signUpLink.setVisibilityAllowed(userRegistrationService != null);
+ final UserRegistrationService userRegistrationService = lookupService(UserRegistrationService.class);
+ final EmailNotificationService emailNotificationService = lookupService(EmailNotificationService.class);
+ component.setVisibilityAllowed(userRegistrationService != null && emailNotificationService.isConfigured());
}
});
- IsisContext.closeSession();
-
- getSignInForm().addOrReplace(signUpLink);
}
private MarkupContainer getSignInForm() {
@@ -126,6 +135,20 @@ public class IsisSignInPanel extends SignInPanel {
super.onSignInRemembered();
}
+
+ // //////////////////////////////////////
+
+ private <T> T lookupService(final Class<T> serviceClass) {
+ return IsisContext.getPersistenceSession().getServicesInjector().lookupService(serviceClass);
+ }
+
@Inject
private PageClassRegistry pageClassRegistry;
+
+ @Inject
+ private EmailNotificationService emailNotificationService;
+
+ @Inject
+ private EmailService emailService;
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/09510a4c/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.java
index eb0816a..0a72a5e 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.java
@@ -48,19 +48,19 @@ public class WicketSignInPage extends AccountManagementPageAbstract {
protected SignInPanel addSignInPanel() {
final boolean suppressRememberMe = getConfiguration().getBoolean("isis.viewer.wicket.suppressRememberMe", false);
- final boolean suppressForgotPassword = getConfiguration().getBoolean("isis.viewer.wicket.suppressForgotPassword", false);
+ final boolean suppressPasswordResetLink = getConfiguration().getBoolean("isis.viewer.wicket.suppressPasswordReset", false);
final boolean clearOriginalDestination = getConfiguration().getBoolean("isis.viewer.wicket.clearOriginalDestination", false);
final boolean rememberMe = !suppressRememberMe;
- final boolean forgotPassword = !suppressForgotPassword;
+ final boolean passwordReset = !suppressPasswordResetLink;
final boolean continueToOriginalDestination = !clearOriginalDestination;
- return addSignInPanel(rememberMe, forgotPassword, continueToOriginalDestination);
+ return addSignInPanel(rememberMe, passwordReset, continueToOriginalDestination);
}
private SignInPanel addSignInPanel(
final boolean rememberMe,
- final boolean forgotPassword,
+ final boolean passwordResetLink,
final boolean continueToOriginalDestination) {
- final SignInPanel signInPanel = new IsisSignInPanel("signInPanel", rememberMe, forgotPassword, continueToOriginalDestination);
+ final SignInPanel signInPanel = new IsisSignInPanel("signInPanel", rememberMe, passwordResetLink, continueToOriginalDestination);
add(signInPanel);
return signInPanel;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/09510a4c/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.properties
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.properties b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.properties
index d1e79e7..53f15ac 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.properties
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.properties
@@ -23,5 +23,5 @@ passwordLabel=Password
rememberMeLabel=Remember me
signInButtonLabel=Sign in
resetButtonLabel=Reset
-forgotPasswordLinkLabel=Forgot your password ?
-signUpButtonLabel=Don't have an account ? Sign up now ?
+forgotPasswordLinkLabel=Forgot your password?
+signUpButtonLabel=Don't have an account? Sign up now.
http://git-wip-us.apache.org/repos/asf/isis/blob/09510a4c/core/applib/src/main/java/org/apache/isis/applib/services/email/EmailService.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/email/EmailService.java b/core/applib/src/main/java/org/apache/isis/applib/services/email/EmailService.java
index 3f992e2..d26698b 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/email/EmailService.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/email/EmailService.java
@@ -16,4 +16,11 @@ public interface EmailService extends Serializable {
@Programmatic
boolean send(List<String> to, List<String> cc, List<String> bcc, String subject, String body);
+
+ /**
+ * Whether this service has been configured and thus available for use.
+ */
+ @Programmatic
+ boolean isConfigured();
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/09510a4c/core/applib/src/main/java/org/apache/isis/applib/services/userreg/EmailNotificationService.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/userreg/EmailNotificationService.java b/core/applib/src/main/java/org/apache/isis/applib/services/userreg/EmailNotificationService.java
index b10c982..5371e7d 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/userreg/EmailNotificationService.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/userreg/EmailNotificationService.java
@@ -20,4 +20,10 @@ public interface EmailNotificationService extends Serializable {
@Programmatic
boolean send(PasswordResetEvent emailRegistrationEvent);
+
+ /**
+ * Whether this service has been configured and thus available for use.
+ */
+ @Programmatic
+ boolean isConfigured();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/09510a4c/core/runtime/src/main/java/org/apache/isis/core/runtime/services/email/EmailNotificationServiceDefault.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/email/EmailNotificationServiceDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/email/EmailNotificationServiceDefault.java
index 32b9985..4845ba8 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/email/EmailNotificationServiceDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/email/EmailNotificationServiceDefault.java
@@ -17,8 +17,6 @@ import org.apache.isis.applib.services.userreg.EmailNotificationService;
import org.apache.isis.applib.services.userreg.events.EmailEventAbstract;
import org.apache.isis.applib.services.userreg.events.EmailRegistrationEvent;
import org.apache.isis.applib.services.userreg.events.PasswordResetEvent;
-import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.runtime.system.context.IsisContext;
import static java.util.regex.Pattern.compile;
import static java.util.regex.Pattern.quote;
@@ -32,12 +30,17 @@ public class EmailNotificationServiceDefault implements EmailNotificationService
private static final Logger LOG = LoggerFactory.getLogger(EmailNotificationServiceDefault.class);
+ //region > constants
+
private static final Pattern EMAIL_PATTERN = compile(quote("${email}"));
private static final Pattern CONFIRMATION_URL_PATTERN = compile(quote("${confirmationUrl}"));
private static final Pattern APPLICATION_NAME_PATTERN = compile(quote("${applicationName}"));
private String passwordResetTemplate;
private String emailVerificationTemplate;
+ //endregion
+
+ //region > init
private boolean initialized;
@@ -67,25 +70,50 @@ public class EmailNotificationServiceDefault implements EmailNotificationService
}
}
+ //endregion
+
+ //region > isConfigured
+
+ @Override
+ public boolean isConfigured() {
+ return emailService != null && emailService.isConfigured();
+ }
+
+ //endregion
+
+ //region > send
+
@Override
public boolean send(final EmailRegistrationEvent emailRegistrationEvent) {
+ ensureConfigured();
final String body = replace(emailVerificationTemplate, emailRegistrationEvent);
- return send(emailRegistrationEvent, body);
+ return sendEmail(emailRegistrationEvent, body);
}
@Override
public boolean send(final PasswordResetEvent passwordResetEvent) {
+ ensureConfigured();
final String body = replace(passwordResetTemplate, passwordResetEvent);
- return send(passwordResetEvent, body);
+ return sendEmail(passwordResetEvent, body);
+ }
+
+ //endregion
+
+ //region > helper methods for send(...)
+
+ private void ensureConfigured() {
+ if(!isConfigured()) {
+ throw new IllegalStateException("Not configured");
+ }
}
- protected boolean send(final EmailEventAbstract emailEvent, final String body) {
+ protected boolean sendEmail(final EmailEventAbstract emailEvent, final String body) {
final String subject = buildSubject(emailEvent);
final String to = emailEvent.getEmail();
- return send(to, subject, body);
+ return sendEmail(to, subject, body);
}
protected String buildSubject(final EmailEventAbstract emailEvent) {
@@ -98,7 +126,7 @@ public class EmailNotificationServiceDefault implements EmailNotificationService
return subject;
}
- protected boolean send(final String to, final String subject, final String body) {
+ protected boolean sendEmail(final String to, final String subject, final String body) {
final List<String> toList = Collections.singletonList(to);
final List<String> cc = Collections.emptyList();
@@ -114,11 +142,12 @@ public class EmailNotificationServiceDefault implements EmailNotificationService
return message;
}
- protected IsisConfiguration getConfiguration() {
- return IsisContext.getConfiguration();
- }
+ //endregion
+
+ //region > dependencies
@Inject
private EmailServiceDefault emailService;
+ //endregion
}
http://git-wip-us.apache.org/repos/asf/isis/blob/09510a4c/core/runtime/src/main/java/org/apache/isis/core/runtime/services/email/EmailServiceDefault.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/email/EmailServiceDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/email/EmailServiceDefault.java
index 0a89ee0..033026c 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/email/EmailServiceDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/email/EmailServiceDefault.java
@@ -2,7 +2,6 @@ package org.apache.isis.core.runtime.services.email;
import java.util.List;
import java.util.Properties;
-import java.util.regex.Pattern;
import javax.annotation.PostConstruct;
import com.google.common.base.Strings;
import org.apache.commons.mail.DefaultAuthenticator;
@@ -14,15 +13,9 @@ import org.slf4j.LoggerFactory;
import org.apache.isis.applib.annotation.DomainService;
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.services.email.EmailService;
-import org.apache.isis.applib.services.userreg.events.EmailEventAbstract;
-import org.apache.isis.applib.services.userreg.events.EmailRegistrationEvent;
-import org.apache.isis.applib.services.userreg.events.PasswordResetEvent;
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.runtime.system.context.IsisContext;
-import static java.util.regex.Pattern.compile;
-import static java.util.regex.Pattern.quote;
-
/**
* A service that sends email notifications when specific events occur
*/
@@ -32,21 +25,26 @@ public class EmailServiceDefault implements EmailService {
private static final Logger LOG = LoggerFactory.getLogger(EmailServiceDefault.class);
- private static final Pattern EMAIL_PATTERN = compile(quote("${email}"));
- private static final Pattern CONFIRMATION_URL_PATTERN = compile(quote("${confirmationUrl}"));
- private static final Pattern APPLICATION_NAME_PATTERN = compile(quote("${applicationName}"));
+ //region > constants
private static final String ISIS_SERVICE_EMAIL_SENDER_ADDRESS = "isis.service.email.sender.address";
private static final String ISIS_SERVICE_EMAIL_SENDER_PASSWORD = "isis.service.email.sender.password";
+
private static final String ISIS_SERVICE_EMAIL_SENDER_HOSTNAME = "isis.service.email.sender.hostname";
private static final String ISIS_SERVICE_EMAIL_SENDER_HOSTNAME_DEFAULT = "smtp.gmail.com";
+
private static final String ISIS_SERVICE_EMAIL_PORT = "isis.service.email.port";
+ private static final int ISIS_SERVICE_EMAIL_PORT_DEFAULT = 587;
+
private static final String ISIS_SERVICE_EMAIL_TLS_ENABLED = "isis.service.email.tls.enabled";
+ public static final boolean ISIS_SERVICE_EMAIL_TLS_ENABLED_DEFAULT = true;
private String senderEmailAddress;
private String senderEmailPassword;
private Integer senderEmailPort;
+ //endregion
+ //region > init
private boolean initialized;
/**
@@ -62,12 +60,47 @@ public class EmailServiceDefault implements EmailService {
senderEmailAddress = getSenderEmailAddress();
senderEmailPassword = getSenderEmailPassword();
-
senderEmailPort = getSenderEmailPort();
initialized = true;
+
+ if(!isConfigured()) {
+ LOG.warn("NOT configured");
+ } else {
+ LOG.debug("configured");
+ }
+ }
+
+ protected String getSenderEmailAddress() {
+ return getConfiguration().getString(ISIS_SERVICE_EMAIL_SENDER_ADDRESS);
+ }
+
+ protected String getSenderEmailPassword() {
+ return getConfiguration().getString(ISIS_SERVICE_EMAIL_SENDER_PASSWORD);
+ }
+
+ protected String getSenderEmailHostName() {
+ return getConfiguration().getString(ISIS_SERVICE_EMAIL_SENDER_HOSTNAME, ISIS_SERVICE_EMAIL_SENDER_HOSTNAME_DEFAULT);
+ }
+
+ protected Integer getSenderEmailPort() {
+ return getConfiguration().getInteger(ISIS_SERVICE_EMAIL_PORT, ISIS_SERVICE_EMAIL_PORT_DEFAULT);
+ }
+
+ protected Boolean getSenderEmailTlsEnabled() {
+ return getConfiguration().getBoolean(ISIS_SERVICE_EMAIL_TLS_ENABLED, ISIS_SERVICE_EMAIL_TLS_ENABLED_DEFAULT);
+ }
+ //endregion
+
+ //region > isConfigured
+
+ @Override
+ public boolean isConfigured() {
+ return !Strings.isNullOrEmpty(senderEmailAddress) && !Strings.isNullOrEmpty(senderEmailPassword);
}
+ //endregion
+ //region > send
@Override
public boolean send(final List<String> toList, final List<String> ccList, final List<String> bccList, final String subject, final String body) {
@@ -115,60 +148,20 @@ public class EmailServiceDefault implements EmailService {
return true;
}
+ //endregion
- protected boolean notEmpty(final List<String> toList) {
+ //region > helper methods
+ private boolean notEmpty(final List<String> toList) {
return toList != null && !toList.isEmpty();
}
+ //endregion
- private String replace(final String template, final EmailEventAbstract emailEvent) {
- String message = template;
- message = EMAIL_PATTERN.matcher(message).replaceFirst(emailEvent.getEmail());
- message = CONFIRMATION_URL_PATTERN.matcher(message).replaceFirst(emailEvent.getConfirmationUrl());
- message = APPLICATION_NAME_PATTERN.matcher(message).replaceAll(emailEvent.getApplicationName());
- return message;
- }
-
- protected String buildSubject(final EmailEventAbstract emailEvent) {
- String subject = "["+emailEvent.getApplicationName()+"]";
- if (emailEvent instanceof EmailRegistrationEvent) {
- subject += " Please confirm your identity";
- } else if (emailEvent instanceof PasswordResetEvent) {
- subject += " Password reset request";
- }
- return subject;
- }
-
- protected String getSenderEmailAddress() {
- return getConfigurationPropertyElseThrow(ISIS_SERVICE_EMAIL_SENDER_ADDRESS);
- }
-
- protected String getSenderEmailPassword() {
- return getConfigurationPropertyElseThrow(ISIS_SERVICE_EMAIL_SENDER_PASSWORD);
- }
-
- protected String getSenderEmailHostName() {
- return getConfiguration().getString(ISIS_SERVICE_EMAIL_SENDER_HOSTNAME, ISIS_SERVICE_EMAIL_SENDER_HOSTNAME_DEFAULT);
- }
-
- protected Integer getSenderEmailPort() {
- return getConfiguration().getInteger(ISIS_SERVICE_EMAIL_PORT, 587);
- }
-
- protected Boolean getSenderEmailTlsEnabled() {
- return getConfiguration().getBoolean(ISIS_SERVICE_EMAIL_TLS_ENABLED, true);
- }
-
+ //region > dependencies
protected IsisConfiguration getConfiguration() {
return IsisContext.getConfiguration();
}
+ //endregion
- private String getConfigurationPropertyElseThrow(final String configProperty) {
- final String configuredValue = getConfiguration().getString(configProperty);
- if(Strings.isNullOrEmpty(configuredValue)) {
- throw new IllegalStateException(configProperty + " not specified");
- }
- return configuredValue;
- }
}
http://git-wip-us.apache.org/repos/asf/isis/blob/09510a4c/core/runtime/src/main/java/org/apache/isis/core/runtime/services/email/EmailVerificationTemplate.html
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/email/EmailVerificationTemplate.html b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/email/EmailVerificationTemplate.html
index 78e168e..c6f0206 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/email/EmailVerificationTemplate.html
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/email/EmailVerificationTemplate.html
@@ -770,7 +770,7 @@
<table class="twelve columns">
<tr>
<td>
- <p>Hi, ${email}!</p>
+ <p>Hi, ${email}</p>
<h3>Account creation request.</h3>
http://git-wip-us.apache.org/repos/asf/isis/blob/09510a4c/core/runtime/src/main/java/org/apache/isis/core/runtime/services/email/PasswordResetTemplate.html
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/email/PasswordResetTemplate.html b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/email/PasswordResetTemplate.html
index 038a867..864f98b 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/email/PasswordResetTemplate.html
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/email/PasswordResetTemplate.html
@@ -792,7 +792,7 @@
<table class="twelve columns">
<tr>
<td>
- <p>Hi, ${email}!</p>
+ <p>Hi, ${email}</p>
<h3>Password reset request.</h3>