work in progress

Author: thomaswoehlke

pom.xml

@@ -68,7 +68,7 @@
             <dependency>
                 <groupId>org.springframework.session</groupId>
                 <artifactId>spring-session-bom</artifactId>
-                <version>Bean-RELEASE</version>
+                <version>Corn-SR2</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -198,6 +198,11 @@
         <dependency>
             <groupId>org.webjars</groupId>
             <artifactId>ckeditor</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.session</groupId>
+            <artifactId>spring-session-core</artifactId>
+            <scope>compile</scope>
         </dependency>
 		<dependency>
 			<groupId>org.springframework.session</groupId>

src/main/java/org/woehlke/simpleworklist/config/di/ApplicationConfig.java

@@ -17,7 +17,6 @@
 @Configuration
 @EnableAsync
 @EnableJpaAuditing
-@EnableJdbcHttpSession
 @EnableJpaRepositories({
     "org.woehlke.simpleworklist"
 })

src/main/java/org/woehlke/simpleworklist/config/di/WebMvcConfig.java

@@ -1,23 +1,38 @@
 package org.woehlke.simpleworklist.config.di;
 
+import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.MessageSource;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.support.ResourceBundleMessageSource;
+import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
 import org.springframework.data.web.config.EnableSpringDataWebSupport;
+import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.session.jdbc.config.annotation.web.http.EnableJdbcHttpSession;
 import org.springframework.validation.beanvalidation.MethodValidationPostProcessor;
 import org.springframework.web.servlet.LocaleResolver;
 import org.springframework.web.servlet.config.annotation.*;
 import org.springframework.web.servlet.i18n.LocaleChangeInterceptor;
 import org.springframework.web.servlet.i18n.SessionLocaleResolver;
 import org.thymeleaf.dialect.springdata.SpringDataDialect;
+import org.woehlke.simpleworklist.config.ApplicationProperties;
 
 import java.util.Locale;
 
 
 @Configuration
+@EnableAsync
+@EnableJpaAuditing
 @EnableWebMvc
 @EnableSpringDataWebSupport
+@EnableJdbcHttpSession
+@ImportAutoConfiguration({
+    ApplicationConfig.class
+})
+@EnableConfigurationProperties({
+    ApplicationProperties.class
+})
 public class WebMvcConfig extends WebMvcConfigurerAdapter implements WebMvcConfigurer {
 
     @Bean

src/main/java/org/woehlke/simpleworklist/config/di/WebSecurityConfig.java

@@ -1,9 +1,13 @@
 package org.woehlke.simpleworklist.config.di;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
 import org.springframework.data.web.config.EnableSpringDataWebSupport;
+import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
@@ -14,12 +18,27 @@
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.security.web.authentication.AuthenticationSuccessHandler;
 import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
+import org.springframework.session.jdbc.config.annotation.web.http.EnableJdbcHttpSession;
+import org.springframework.web.servlet.config.annotation.EnableWebMvc;
+import org.woehlke.simpleworklist.config.ApplicationProperties;
 import org.woehlke.simpleworklist.user.login.LoginSuccessHandler;
 import org.woehlke.simpleworklist.user.account.UserAccountSecurityService;
 
+
 @Configuration
-@EnableWebSecurity
+@EnableAsync
+@EnableJpaAuditing
+@EnableWebMvc
 @EnableSpringDataWebSupport
+@EnableJdbcHttpSession
+@EnableWebSecurity
+@ImportAutoConfiguration({
+    ApplicationConfig.class,
+    WebMvcConfig.class
+})
+@EnableConfigurationProperties({
+    ApplicationProperties.class
+})
 public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
 
     @Autowired

src/main/resources/application.yml

@@ -37,17 +37,13 @@ spring:
         dialect: org.hibernate.dialect.PostgreSQL95Dialect
         temp:
           use_jdbc_metadata_defaults: false
-        search:
-          default:
-            directory_provider : filesystem
-            indexBase : ${user.dir}/simpleworklistsearch
   session:
     store-type: jdbc
     jdbc:
       initialize-schema: ALWAYS
-      cleanup-cron: 0 * * * *simpleworklist *
-      schema: classpath:org/springframework/session/jdbc/schema-postgresql.sql
-      table-name: SPRING_SESSION
+      #cleanup-cron: 0 * * * *simpleworklist *
+      #schema: classpath:org/springframework/session/jdbc/schema-postgresql.sql
+      #table-name: SPRING_SESSION
   thymeleaf:
     cache: false
   main: