diff --git a/spring-security-login-and-registration/src/main/resources/email.properties b/spring-security-login-and-registration/src/main/resources/email.properties
index d0eb54e097..6ad3923d8f 100644
--- a/spring-security-login-and-registration/src/main/resources/email.properties
+++ b/spring-security-login-and-registration/src/main/resources/email.properties
@@ -3,5 +3,5 @@ smtp.host=email-smtp.us-east-1.amazonaws.com
smtp.port=465
smtp.protocol=smtps
smtp.username=AKIAJIKXZAQFFJDXI4VQ
-smtp.password=
-support.email=xxx777@gmail.com
+smtp.password=AjYQNjXVTalbpfRL37RYqyXEkyQAvmKFcUFQllfAsBLh
+support.email=eugen@baeldung.com
diff --git a/spring-security-login-and-registration/src/main/resources/messages_en.properties b/spring-security-login-and-registration/src/main/resources/messages_en.properties
index 5939bf6e41..eba22ff73e 100644
--- a/spring-security-login-and-registration/src/main/resources/messages_en.properties
+++ b/spring-security-login-and-registration/src/main/resources/messages_en.properties
@@ -63,4 +63,4 @@ auth.message.blocked=This ip is blocked for 24 hours
message.accountVerified=Your account verified successfully
message.resetPasswordSuc=Password reset successfully
message.resetYourPassword=Reset your password
-message.resetPasswordEmail=We will send an email to reset your password
\ No newline at end of file
+message.resetPasswordEmail=You should receive an Password Reset Email shortly
\ No newline at end of file
diff --git a/spring-security-oauth/src/main/java/org/baeldung/config/ServletInitializer.java b/spring-security-oauth/src/main/java/org/baeldung/config/ServletInitializer.java
index a5b8708ffa..d9d3821757 100644
--- a/spring-security-oauth/src/main/java/org/baeldung/config/ServletInitializer.java
+++ b/spring-security-oauth/src/main/java/org/baeldung/config/ServletInitializer.java
@@ -30,6 +30,9 @@ public class ServletInitializer extends AbstractDispatcherServletInitializer {
@Override
public void onStartup(ServletContext servletContext) throws ServletException {
super.onStartup(servletContext);
+
+ servletContext.addListener(new SessionListener());
+
registerProxyFilter(servletContext, "oauth2ClientContextFilter");
}
diff --git a/spring-security-oauth/src/main/java/org/baeldung/config/SessionListener.java b/spring-security-oauth/src/main/java/org/baeldung/config/SessionListener.java
new file mode 100644
index 0000000000..128522b89f
--- /dev/null
+++ b/spring-security-oauth/src/main/java/org/baeldung/config/SessionListener.java
@@ -0,0 +1,18 @@
+package org.baeldung.config;
+
+import javax.servlet.http.HttpSessionEvent;
+import javax.servlet.http.HttpSessionListener;
+
+public class SessionListener implements HttpSessionListener {
+
+ @Override
+ public void sessionCreated(HttpSessionEvent event) {
+ System.out.println("==== Session is created ====");
+ event.getSession().setMaxInactiveInterval(1 * 60);
+ }
+
+ @Override
+ public void sessionDestroyed(HttpSessionEvent event) {
+ System.out.println("==== Session is destroyed ====");
+ }
+}
\ No newline at end of file
diff --git a/spring-security-oauth/src/main/resources/log4j.xml b/spring-security-oauth/src/main/resources/log4j.xml
deleted file mode 100644
index 090fbe7dce..0000000000
--- a/spring-security-oauth/src/main/resources/log4j.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/spring-security-oauth/src/main/resources/logback.xml b/spring-security-oauth/src/main/resources/logback.xml
new file mode 100644
index 0000000000..1146dade63
--- /dev/null
+++ b/spring-security-oauth/src/main/resources/logback.xml
@@ -0,0 +1,20 @@
+
+
+
+
+ web - %date [%thread] %-5level %logger{36} - %message%n
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/spring-security-oauth/src/test/resources/log4j.xml b/spring-security-oauth/src/test/resources/log4j.xml
deleted file mode 100644
index d867d97431..0000000000
--- a/spring-security-oauth/src/test/resources/log4j.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-