removed spring http session with jdbc

Author: phasenraum2010

Diff for: pom.xml

@@ -305,11 +305,13 @@
   <build>
     <pluginManagement>
       <plugins>
+        <!--
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-changelog-plugin</artifactId>
           <version>2.3</version>
         </plugin>
+        -->
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>cobertura-maven-plugin</artifactId>

Diff for: src/main/java/org/woehlke/learn/learnneo4j/LearnNeo4jApplication.java

@@ -16,8 +16,6 @@
     MyServerProperties.class,
     MySpringBootProperties.class
 })
-
-@EnableSpringDataWebSupport
 public class LearnNeo4jApplication {
 
 	public static void main(String[] args) {

Diff for: src/main/java/org/woehlke/learn/learnneo4j/configuration/spring/WebSecurityConfig.java renamed to src/main/java/org/woehlke/learn/learnneo4j/configuration/Config.java

@@ -1,27 +1,62 @@
-package org.woehlke.learn.learnneo4j.configuration.spring;
+package org.woehlke.learn.learnneo4j.configuration;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.boot.jdbc.DataSourceBuilder;
+import org.springframework.boot.web.servlet.error.DefaultErrorAttributes;
+import org.springframework.boot.web.servlet.error.ErrorAttributes;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
+import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 import org.springframework.data.web.config.EnableSpringDataWebSupport;
+import org.springframework.jdbc.datasource.DataSourceTransactionManager;
 import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
-import org.woehlke.learn.learnneo4j.configuration.MyApplicationProperties;
+import org.springframework.transaction.PlatformTransactionManager;
+import org.springframework.validation.beanvalidation.MethodValidationPostProcessor;
 
+import javax.sql.DataSource;
 
 @Configuration
+@EnableJpaRepositories({
+    "org.woehlke.learn.learnneo4j.model.orm"
+})
 @EnableWebSecurity
 @EnableSpringDataWebSupport
-public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
+public class Config extends WebSecurityConfigurerAdapter {
+/*
+    @Bean
+    @Primary
+    @ConfigurationProperties(prefix = "spring.datasource")
+    public DataSource dataSource() {
+        return DataSourceBuilder.create().build();
+    }
+
+    @Bean
+    public PlatformTransactionManager transactionManager(DataSource dataSource) {
+        return new DataSourceTransactionManager(dataSource);
+    }
+
+    @Bean
+    MethodValidationPostProcessor methodValidationPostProcessor() {
+        return new MethodValidationPostProcessor();
+    }
+
+    @Bean
+    public ErrorAttributes errorAttributes(){
+        return new DefaultErrorAttributes();
+    }
+    */
 
-    @Override
     protected void configure(HttpSecurity http) throws Exception {
         http
             .authorizeRequests()
             .antMatchers(
-              myApplicationProperties.getWebSecurityConfigPublicPathsAsArray()
+                myApplicationProperties.getWebSecurityConfigPublicPathsAsArray()
             )
             .permitAll()
             .anyRequest().authenticated()
@@ -49,8 +84,8 @@ public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception
     }
 
     @Autowired
-    public WebSecurityConfig(MyApplicationProperties myApplicationProperties) {
-      this.myApplicationProperties = myApplicationProperties;
+    public Config(MyApplicationProperties myApplicationProperties) {
+        this.myApplicationProperties = myApplicationProperties;
     }
 
     private final MyApplicationProperties myApplicationProperties;

Diff for: src/main/java/org/woehlke/learn/learnneo4j/configuration/spring/DataSourceConfig.java

@@ -14,7 +14,7 @@ public class WelcomeController {
 
     @GetMapping("/welcome")
     public String home(Model model) {
-        PageContent pageContent = pageContentPopulator.pageContentSetSTandardValues("/adm//portinfo/available/fetch");
+        PageContent pageContent = pageContentPopulator.pageContentSetSTandardValues("open/welcome");
         log.debug(pageContent.toString());
         model.addAttribute("pageContent", pageContent);
         return "open/welcome";

Diff for: src/main/java/org/woehlke/learn/learnneo4j/configuration/spring/WebMvcConfig.java

@@ -0,0 +1,32 @@
+package org.woehlke.learn.learnneo4j.frontend.control.open.login;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.woehlke.learn.learnneo4j.configuration.PageContentPopulator;
+import org.woehlke.learn.learnneo4j.frontend.control.open.home.WelcomeController;
+import org.woehlke.learn.learnneo4j.frontend.model.PageContent;
+
+@Controller
+public class LoginController {
+
+    @GetMapping("/login")
+    public String loginForm(Model model) {
+        PageContent pageContent = pageContentPopulator.pageContentSetSTandardValues("open/login");
+        log.debug(pageContent.toString());
+        model.addAttribute("pageContent", pageContent);
+        return "open/login";
+    }
+
+    private final PageContentPopulator pageContentPopulator;
+
+    @Autowired
+    public LoginController(PageContentPopulator pageContentPopulator) {
+        this.pageContentPopulator = pageContentPopulator;
+    }
+
+    private static final Log log = LogFactory.getLog(WelcomeController.class);
+}

Diff for: src/main/java/org/woehlke/learn/learnneo4j/frontend/control/open/home/WelcomeController.java

@@ -105,9 +105,13 @@ org:
           pageSubTitle: Graph DB. Power of cool Persistence with Neo4J and Spring-Boot.
           webSecurityConfigPublicPaths:
             - "/welcome"
+            - "/welcome/*"
             - "/welcome/**"
+            - "/open/*"
             - "/open/**"
+            - "/graph/*"
             - "/graph/**"
+            - "/db/*"
             - "/db/**"
             - "/img/*"
             - "/img/**"

Diff for: src/main/java/org/woehlke/learn/learnneo4j/frontend/control/open/login/LoginController.java

@@ -63,19 +63,19 @@
     <meta name="geo.position" content="52.5248355;13.3470349" />
     <meta name="geo.region" content="DE-BE" />
     <meta name="geo.placename" content="Berlin" />
-    <link rel="apple-touch-icon" sizes="57x57" href="/icon/tomcat/apple-icon-57x57.png"/>
-    <link rel="apple-touch-icon" sizes="60x60" href="/icon/tomcat/apple-icon-60x60.png"/>
-    <link rel="apple-touch-icon" sizes="72x72" href="/icon/tomcat/apple-icon-72x72.png"/>
-    <link rel="apple-touch-icon" sizes="76x76" href="/icon/tomcat/apple-icon-76x76.png"/>
-    <link rel="apple-touch-icon" sizes="114x114" href="/icon/tomcat/apple-icon-114x114.png"/>
-    <link rel="apple-touch-icon" sizes="120x120" href="/icon/tomcat/apple-icon-120x120.png"/>
-    <link rel="apple-touch-icon" sizes="144x144" href="/icon/tomcat/apple-icon-144x144.png"/>
-    <link rel="apple-touch-icon" sizes="152x152" href="/icon/tomcat/apple-icon-152x152.png"/>
-    <link rel="apple-touch-icon" sizes="180x180" href="/icon/tomcat/apple-icon-180x180.png"/>
-    <link rel="icon" type="image/png" sizes="192x192"  href="/icon/tomcat/android-icon-192x192.png"/>
-    <link rel="icon" type="image/png" sizes="32x32" href="/icon/tomcat/favicon-32x32.png"/>
-    <link rel="icon" type="image/png" sizes="96x96" href="/icon/tomcat/favicon-96x96.png"/>
-    <link rel="icon" type="image/png" sizes="16x16" href="/icon/tomcat/favicon-16x16.png"/>
+    <link rel="apple-touch-icon" sizes="57x57" href="/favicon/tomcat/apple-icon-57x57.png"/>
+    <link rel="apple-touch-icon" sizes="60x60" href="/favicon/tomcat/apple-icon-60x60.png"/>
+    <link rel="apple-touch-icon" sizes="72x72" href="/favicon/tomcat/apple-icon-72x72.png"/>
+    <link rel="apple-touch-icon" sizes="76x76" href="/favicon/tomcat/apple-icon-76x76.png"/>
+    <link rel="apple-touch-icon" sizes="114x114" href="/favicon/tomcat/apple-icon-114x114.png"/>
+    <link rel="apple-touch-icon" sizes="120x120" href="/favicon/tomcat/apple-icon-120x120.png"/>
+    <link rel="apple-touch-icon" sizes="144x144" href="/favicon/tomcat/apple-icon-144x144.png"/>
+    <link rel="apple-touch-icon" sizes="152x152" href="/favicon/tomcat/apple-icon-152x152.png"/>
+    <link rel="apple-touch-icon" sizes="180x180" href="/favicon/tomcat/apple-icon-180x180.png"/>
+    <link rel="icon" type="image/png" sizes="192x192"  href="/favicon/tomcat/android-icon-192x192.png"/>
+    <link rel="icon" type="image/png" sizes="32x32" href="/favicon/tomcat/favicon-32x32.png"/>
+    <link rel="icon" type="image/png" sizes="96x96" href="/favicon/tomcat/favicon-96x96.png"/>
+    <link rel="icon" type="image/png" sizes="16x16" href="/favicon/tomcat/favicon-16x16.png"/>
     <link rel="manifest" href="/manifest.json"/>
     <meta name="msapplication-TileColor" content="#ffffff"/>
     <meta name="msapplication-TileImage" content="/ms-icon-144x144.png"/>

Diff for: src/main/resources/application.yml

@@ -0,0 +1,10 @@
+<!doctype html>
+<html lang="de" xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:th="http://www.thymeleaf.org"
+      xmlns:sec="http://www.thymeleaf.org/extras/spring-security">
+<head th:include="layoutMain :: tw-head">
+</head>
+<body th:include="layoutMain :: tw-body">
+
+</body>
+</html>