Repository: isis Updated Branches: refs/heads/master 2f9c65bc7 -> 55e569c9b
ISIS-1052: tiny fix to sentence in email template and to simpleapp's logging.properties (reduce noise) Project: http://git-wip-us.apache.org/repos/asf/isis/repo Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/1014fcce Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/1014fcce Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/1014fcce Branch: refs/heads/master Commit: 1014fcce0d941efd0313ee98735dce90f90e8e5e Parents: 2f9c65b Author: Dan Haywood <[email protected]> Authored: Tue Mar 3 18:34:28 2015 +0000 Committer: Dan Haywood <[email protected]> Committed: Tue Mar 3 18:35:21 2015 +0000 ---------------------------------------------------------------------- .../core/runtime/services/userreg/EmailVerificationTemplate.html | 2 +- .../simpleapp/webapp/src/main/webapp/WEB-INF/logging.properties | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/isis/blob/1014fcce/core/runtime/src/main/java/org/apache/isis/core/runtime/services/userreg/EmailVerificationTemplate.html ---------------------------------------------------------------------- diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/userreg/EmailVerificationTemplate.html b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/userreg/EmailVerificationTemplate.html index 3f3ccd6..937ad8a 100644 --- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/userreg/EmailVerificationTemplate.html +++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/userreg/EmailVerificationTemplate.html @@ -795,7 +795,7 @@ <br>It seems someone has requested creation of an account at <strong>${applicationName}</strong>. - <br>If this was you then please follow this <a href="${confirmationUrl}">link</a> where you can set specify a username and new password. + <br>If this was you then please follow this <a href="${confirmationUrl}">link</a> where you can specify a username and new password. <br>Otherwise please just ignore this email. </td> http://git-wip-us.apache.org/repos/asf/isis/blob/1014fcce/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/logging.properties ---------------------------------------------------------------------- diff --git a/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/logging.properties b/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/logging.properties index 83dfcd5..62fd8ea 100644 --- a/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/logging.properties +++ b/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/logging.properties @@ -177,6 +177,10 @@ log4j.logger.org.apache.isis.core.runtime.installers.InstallerLookupDefault=WARN log4j.additivity.org.apache.isis.core.runtime.installers.InstallerLookupDefault=false +# quieten Shiro +log4j.logger.org.apache.shiro.realm.AuthorizingRealm=WARN,Console +log4j.additivity.log4j.logger.org.apache.shiro.realm.AuthorizingRealm=false + # Application-specific logging log4j.logger.dom.simple.SimpleObject=DEBUG, Stderr
