[BAEL-3066] (Reverted and Redone) Spring Security: Exploring JDBC Authentication article

spring-security-mvc-boot/pom.xml

@@ -7,7 +7,7 @@
     <artifactId>spring-security-mvc-boot</artifactId>
     <version>0.0.1-SNAPSHOT</version>
     <name>spring-security-mvc-boot</name>
-    <packaging>pom</packaging>
+    <packaging>war</packaging>
     <description>Spring Security MVC Boot</description>
 
     <parent>
@@ -46,6 +46,20 @@
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-data</artifactId>
         </dependency>
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.postgresql</groupId>
+            <artifactId>postgresql</artifactId>
+            <scope>runtime</scope>
+        </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest-core</artifactId>
@@ -214,13 +228,22 @@
         </profile>
     </profiles>
 
-    <modules>
-        <module>spring-security-mvc-boot-default</module>
-        <module>spring-security-mvc-boot-mysql</module>
-        <module>spring-security-mvc-boot-postgre</module>
-    </modules>
 
     <properties>
+        <start-class>org.baeldung.custom.Application</start-class>
+        <!--If you want to run the example with the voters comment the tag 
+            above and uncomment the one below -->
+        <!--<start-class>org.baeldung.voter.VoterApplication</start-class> -->
+        <!--If you want to run the example with the multiple logins, comment 
+            the tag above and uncomment the one below -->
+        <!--<start-class>org.baeldung.multiplelogin.MultipleLoginApplication</start-class> -->
+        <!--If you want to run the example with the multiple http elements, 
+            comment the tag above and uncomment the one below -->
+        <!--<start-class>org.baeldung.multipleentrypoints.MultipleEntryPointsApplication</start-class> -->
+        <!--If you want to run the example with the Https enabled endpoints, 
+            comment the tag above and uncomment the one below -->
+        <!-- <start-class>org.baeldung.ssl.HttpsEnabledApplication</start-class> -->
+
         <taglibs-standard.version>1.1.2</taglibs-standard.version>
         <cargo-maven2-plugin.version>1.6.1</cargo-maven2-plugin.version>
         <ehcache-core.version>2.6.11</ehcache-core.version>

spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/com/baeldung/AppConfig.java → spring-security-mvc-boot/src/main/java/com/baeldung/AppConfig.java

@@ -18,7 +18,7 @@
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
 
 @SpringBootApplication
-@PropertySource("classpath:persistence-h2.properties")
+@PropertySource({"classpath:persistence-h2.properties", "classpath:application-defaults.properties"})
 @EnableJpaRepositories(basePackages = { "com.baeldung.data.repositories" })
 @EnableWebMvc
 @Import(SpringSecurityConfig.class)

spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/custom/Application.java → spring-security-mvc-boot/src/main/java/org/baeldung/custom/Application.java

@@ -3,8 +3,10 @@
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
+import org.springframework.context.annotation.PropertySource;
 
 @SpringBootApplication
+@PropertySource("classpath:application-defaults.properties")
 public class Application extends SpringBootServletInitializer {
     public static void main(String[] args) {
         SpringApplication.run(Application.class, args);

spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/ip/IpApplication.java → spring-security-mvc-boot/src/main/java/org/baeldung/ip/IpApplication.java

@@ -3,8 +3,10 @@
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
+import org.springframework.context.annotation.PropertySource;
 
 @SpringBootApplication
+@PropertySource("classpath:application-defaults.properties")
 public class IpApplication extends SpringBootServletInitializer {
     public static void main(String[] args) {
         SpringApplication.run(IpApplication.class, args);

spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/jdbcauthentication/h2/H2JdbcAuthenticationApplication.java → spring-security-mvc-boot/src/main/java/org/baeldung/jdbcauthentication/h2/H2JdbcAuthenticationApplication.java

@@ -2,10 +2,12 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.PropertySource;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 
 @SpringBootApplication
 @EnableWebSecurity
+@PropertySource("classpath:application-defaults.properties")
 public class H2JdbcAuthenticationApplication {
 
     public static void main(String[] args) {

spring-security-mvc-boot/spring-security-mvc-boot-mysql/src/main/java/com/baeldung/jdbcauthentication/mysql/MySqlJdbcAuthenticationApplication.java → spring-security-mvc-boot/src/main/java/org/baeldung/jdbcauthentication/mysql/MySqlJdbcAuthenticationApplication.java

@@ -1,9 +1,11 @@
-package com.baeldung.jdbcauthentication.mysql;
+package org.baeldung.jdbcauthentication.mysql;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.PropertySource;
 
 @SpringBootApplication
+@PropertySource("classpath:application-mysql.properties")
 public class MySqlJdbcAuthenticationApplication {
 
     public static void main(String[] args) {

spring-security-mvc-boot/spring-security-mvc-boot-mysql/src/main/java/com/baeldung/jdbcauthentication/mysql/config/SecurityConfiguration.java → spring-security-mvc-boot/src/main/java/org/baeldung/jdbcauthentication/mysql/config/SecurityConfiguration.java

@@ -1,4 +1,4 @@
-package com.baeldung.jdbcauthentication.mysql.config;
+package org.baeldung.jdbcauthentication.mysql.config;
 
 import javax.sql.DataSource;
 

spring-security-mvc-boot/spring-security-mvc-boot-mysql/src/main/java/com/baeldung/jdbcauthentication/mysql/web/UserController.java → spring-security-mvc-boot/src/main/java/org/baeldung/jdbcauthentication/mysql/web/UserController.java

@@ -1,4 +1,4 @@
-package com.baeldung.jdbcauthentication.mysql.web;
+package org.baeldung.jdbcauthentication.mysql.web;
 
 import java.security.Principal;
 

spring-security-mvc-boot/spring-security-mvc-boot-postgre/src/main/java/com/baeldung/jdbcauthentication/postgre/PostgreJdbcAuthenticationApplication.java → spring-security-mvc-boot/src/main/java/org/baeldung/jdbcauthentication/postgre/PostgreJdbcAuthenticationApplication.java

@@ -1,9 +1,11 @@
-package com.baeldung.jdbcauthentication.postgre;
+package org.baeldung.jdbcauthentication.postgre;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.PropertySource;
 
 @SpringBootApplication
+@PropertySource("classpath:application-postgre.properties")
 public class PostgreJdbcAuthenticationApplication {
 
     public static void main(String[] args) {

spring-security-mvc-boot/spring-security-mvc-boot-postgre/src/main/java/com/baeldung/jdbcauthentication/postgre/config/SecurityConfiguration.java → spring-security-mvc-boot/src/main/java/org/baeldung/jdbcauthentication/postgre/config/SecurityConfiguration.java

@@ -1,4 +1,4 @@
-package com.baeldung.jdbcauthentication.postgre.config;
+package org.baeldung.jdbcauthentication.postgre.config;
 
 import javax.sql.DataSource;
 

spring-security-mvc-boot/spring-security-mvc-boot-postgre/src/main/java/com/baeldung/jdbcauthentication/postgre/web/UserController.java → spring-security-mvc-boot/src/main/java/org/baeldung/jdbcauthentication/postgre/web/UserController.java

@@ -1,4 +1,4 @@
-package com.baeldung.jdbcauthentication.postgre.web;
+package org.baeldung.jdbcauthentication.postgre.web;
 
 import java.security.Principal;
 

spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/multipleauthproviders/MultipleAuthProvidersApplication.java → spring-security-mvc-boot/src/main/java/org/baeldung/multipleauthproviders/MultipleAuthProvidersApplication.java

@@ -2,8 +2,10 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.PropertySource;
 
 @SpringBootApplication
+@PropertySource("classpath:application-defaults.properties")
 // @ImportResource({ "classpath*:spring-security-multiple-auth-providers.xml" })
 public class MultipleAuthProvidersApplication {
     public static void main(String[] args) {

spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/multipleentrypoints/MultipleEntryPointsApplication.java → spring-security-mvc-boot/src/main/java/org/baeldung/multipleentrypoints/MultipleEntryPointsApplication.java

@@ -2,8 +2,10 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.PropertySource;
 
 @SpringBootApplication
+@PropertySource("classpath:application-defaults.properties")
 // @ImportResource({"classpath*:spring-security-multiple-entry.xml"})
 public class MultipleEntryPointsApplication {
     public static void main(String[] args) {

spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/multiplelogin/MultipleLoginApplication.java → spring-security-mvc-boot/src/main/java/org/baeldung/multiplelogin/MultipleLoginApplication.java

@@ -3,8 +3,10 @@
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.PropertySource;
 
 @SpringBootApplication
+@PropertySource("classpath:application-defaults.properties")
 @ComponentScan("org.baeldung.multiplelogin")
 public class MultipleLoginApplication {
     public static void main(String[] args) {

spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/ssl/HttpsEnabledApplication.java → spring-security-mvc-boot/src/main/java/org/baeldung/ssl/HttpsEnabledApplication.java

@@ -2,8 +2,10 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.PropertySource;
 
 @SpringBootApplication
+@PropertySource("classpath:application-defaults.properties")
 public class HttpsEnabledApplication {
 
     public static void main(String... args) {

spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/resources/application.properties → spring-security-mvc-boot/src/main/resources/application-defaults.properties

@@ -1,4 +1,3 @@
-server.port=8082
 spring.datasource.driver-class-name=org.h2.Driver
 spring.datasource.url=jdbc:h2:mem:security_permission;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE
 spring.datasource.username=sa
@@ -8,7 +7,7 @@ spring.jpa.database=H2
 spring.jpa.show-sql=false
 spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.H2Dialect
 
-logging.level.org.springframework.security.web.FilterChainProxy=DEBUG
+#logging.level.org.springframework.security.web.FilterChainProxy=DEBUG
 
 spring.h2.console.enabled=true
 spring.h2.console.path=/h2-console

spring-security-mvc-boot/spring-security-mvc-boot-mysql/src/main/resources/application.properties → spring-security-mvc-boot/src/main/resources/application-mysql.properties

@@ -1,8 +1,9 @@
-server.port=8082
-
+spring.datasource.platform=mysql
 spring.datasource.url=jdbc:mysql://localhost:3306/jdbc_authentication
 spring.datasource.username=root
 spring.datasource.password=pass
 
 spring.datasource.initialization-mode=always
 spring.jpa.hibernate.ddl-auto=none
+
+spring.profiles.active=mysql

spring-security-mvc-boot/spring-security-mvc-boot-postgre/src/main/resources/application.properties → spring-security-mvc-boot/src/main/resources/application-postgre.properties

@@ -1,5 +1,4 @@
-server.port=8082
-
+spring.datasource.platform=postgre
 spring.datasource.url=jdbc:postgresql://localhost:5432/jdbc_authentication
 spring.datasource.username=postgres
 spring.datasource.password=pass

spring-security-mvc-boot/src/main/resources/application.properties

@@ -0,0 +1 @@
+server.port=8082

spring-security-mvc-boot/spring-security-mvc-boot-mysql/src/test/java/com/baeldung/jdbcauthentication/mysql/SpringContextIntegrationTest.java → spring-security-mvc-boot/src/test/java/org/baeldung/jdbcauthentication/h2/SpringContextIntegrationTest.java

@@ -1,12 +1,12 @@
-package com.baeldung.jdbcauthentication.mysql;
+package org.baeldung.jdbcauthentication.h2;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 
 @RunWith(SpringRunner.class)
-@SpringBootTest(classes = MySqlJdbcAuthenticationApplication.class)
+@SpringBootTest(classes = H2JdbcAuthenticationApplication.class)
 public class SpringContextIntegrationTest {
 
     @Test

spring-security-mvc-boot/spring-security-mvc-boot-mysql/src/test/java/com/baeldung/jdbcauthentication/mysql/web/UserControllerLiveTest.java → spring-security-mvc-boot/src/test/java/org/baeldung/jdbcauthentication/mysql/web/UserControllerLiveTest.java

@@ -1,4 +1,4 @@
-package com.baeldung.jdbcauthentication.mysql.web;
+package org.baeldung.jdbcauthentication.mysql.web;
 
 import static io.restassured.RestAssured.given;
 import static org.hamcrest.CoreMatchers.is;

spring-security-mvc-boot/spring-security-mvc-boot-postgre/src/test/java/com/baeldung/jdbcauthentication/postgre/web/UserControllerLiveTest.java → spring-security-mvc-boot/src/test/java/org/baeldung/jdbcauthentication/postgre/web/UserControllerLiveTest.java

@@ -1,4 +1,4 @@
-package com.baeldung.jdbcauthentication.postgre.web;
+package org.baeldung.jdbcauthentication.postgre.web;
 
 import static io.restassured.RestAssured.given;
 import static org.hamcrest.CoreMatchers.is;
@@ -10,7 +10,7 @@
  * This Live Test requires:
  * *  a PostgreSQL instance running, that allows a 'root' user with password 'pass', and with a database named jdbc_authentication
  * (e.g. with the following command `docker run -p 5432:5432 --name bael-postgre -e POSTGRES_PASSWORD=pass -e POSTGRES_DB=jdbc_authentication postgres:latest`)
- * * the service up and running
+ * * the  service up and running
  *
  */
 public class UserControllerLiveTest {