From 273b876127cf270bc3b4f8c338496a89f039b5b9 Mon Sep 17 00:00:00 2001
From: mikr <michael.krimgen@ximedes.com>
Date: Tue, 7 Jul 2020 00:54:52 +0200
Subject: [PATCH] JAVA-71 spring-security-config

---
 spring-security-modules/pom.xml               |  3 +--
 .../cache-control}/README.md                  |  0
 .../cache-control}/pom.xml                    |  6 +++---
 .../com/baeldung/cachecontrol/AppRunner.java  |  0
 .../cachecontrol/ResourceEndpoint.java        |  0
 .../config/SpringSecurityConfig.java          |  0
 .../cachecontrol/model/TimestampDto.java      |  0
 .../baeldung/cachecontrol/model/UserDto.java  |  0
 .../src/main/resources/logback.xml            |  0
 .../java/com/baeldung/SpringContextTest.java  |  0
 .../ResourceEndpointIntegrationTest.java      |  0
 .../cors}/README.md                           |  0
 .../cors}/pom.xml                             |  4 ++--
 .../SpringBootSecurityApplication.java        |  0
 .../basicauth/config/WebSecurityConfig.java   |  0
 .../controller/ResourceController.java        |  0
 .../ResourceControllerUnitTest.java           |  0
 .../spring-security-config/pom.xml            | 21 +++++++++++++++++++
 18 files changed, 27 insertions(+), 7 deletions(-)
 rename spring-security-modules/{spring-security-cache-control => spring-security-config/cache-control}/README.md (100%)
 rename spring-security-modules/{spring-security-cache-control => spring-security-config/cache-control}/pom.xml (88%)
 rename spring-security-modules/{spring-security-cache-control => spring-security-config/cache-control}/src/main/java/com/baeldung/cachecontrol/AppRunner.java (100%)
 rename spring-security-modules/{spring-security-cache-control => spring-security-config/cache-control}/src/main/java/com/baeldung/cachecontrol/ResourceEndpoint.java (100%)
 rename spring-security-modules/{spring-security-cache-control => spring-security-config/cache-control}/src/main/java/com/baeldung/cachecontrol/config/SpringSecurityConfig.java (100%)
 rename spring-security-modules/{spring-security-cache-control => spring-security-config/cache-control}/src/main/java/com/baeldung/cachecontrol/model/TimestampDto.java (100%)
 rename spring-security-modules/{spring-security-cache-control => spring-security-config/cache-control}/src/main/java/com/baeldung/cachecontrol/model/UserDto.java (100%)
 rename spring-security-modules/{spring-security-cache-control => spring-security-config/cache-control}/src/main/resources/logback.xml (100%)
 rename spring-security-modules/{spring-security-cache-control => spring-security-config/cache-control}/src/test/java/com/baeldung/SpringContextTest.java (100%)
 rename spring-security-modules/{spring-security-cache-control => spring-security-config/cache-control}/src/test/java/com/baeldung/cachecontrol/ResourceEndpointIntegrationTest.java (100%)
 rename spring-security-modules/{spring-security-cors => spring-security-config/cors}/README.md (100%)
 rename spring-security-modules/{spring-security-cors => spring-security-config/cors}/pom.xml (96%)
 rename spring-security-modules/{spring-security-cors => spring-security-config/cors}/src/main/java/com/baeldung/springbootsecuritycors/basicauth/SpringBootSecurityApplication.java (100%)
 rename spring-security-modules/{spring-security-cors => spring-security-config/cors}/src/main/java/com/baeldung/springbootsecuritycors/basicauth/config/WebSecurityConfig.java (100%)
 rename spring-security-modules/{spring-security-cors => spring-security-config/cors}/src/main/java/com/baeldung/springbootsecuritycors/controller/ResourceController.java (100%)
 rename spring-security-modules/{spring-security-cors => spring-security-config/cors}/src/test/java/com/baeldung/springbootsecuritycors/ResourceControllerUnitTest.java (100%)
 create mode 100644 spring-security-modules/spring-security-config/pom.xml

diff --git a/spring-security-modules/pom.xml b/spring-security-modules/pom.xml
index e78b7fe80c..472c6b6e0d 100644
--- a/spring-security-modules/pom.xml
+++ b/spring-security-modules/pom.xml
@@ -17,9 +17,8 @@
         <module>spring-security-acl</module>
         <module>spring-security-auth0</module>
         <module>spring-security-angular/server</module>
-        <module>spring-security-cache-control</module>
+        <module>spring-security-config</module>
         <module>spring-security-core</module>
-        <module>spring-security-cors</module>
         <module>spring-security-mvc</module>
         <module>spring-security-mvc-boot-1</module>
         <module>spring-security-mvc-boot-2</module>
diff --git a/spring-security-modules/spring-security-cache-control/README.md b/spring-security-modules/spring-security-config/cache-control/README.md
similarity index 100%
rename from spring-security-modules/spring-security-cache-control/README.md
rename to spring-security-modules/spring-security-config/cache-control/README.md
diff --git a/spring-security-modules/spring-security-cache-control/pom.xml b/spring-security-modules/spring-security-config/cache-control/pom.xml
similarity index 88%
rename from spring-security-modules/spring-security-cache-control/pom.xml
rename to spring-security-modules/spring-security-config/cache-control/pom.xml
index 743b3c291d..753307493d 100644
--- a/spring-security-modules/spring-security-cache-control/pom.xml
+++ b/spring-security-modules/spring-security-config/cache-control/pom.xml
@@ -2,15 +2,15 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>spring-security-cache-control</artifactId>
+    <artifactId>cache-control</artifactId>
     <version>1.0-SNAPSHOT</version>
-    <name>spring-security-cache-control</name>
+    <name>cache-control</name>
 
     <parent>
         <groupId>com.baeldung</groupId>
         <artifactId>parent-boot-2</artifactId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../../parent-boot-2</relativePath>
+        <relativePath>../../../parent-boot-2</relativePath>
     </parent>
 
     <dependencies>
diff --git a/spring-security-modules/spring-security-cache-control/src/main/java/com/baeldung/cachecontrol/AppRunner.java b/spring-security-modules/spring-security-config/cache-control/src/main/java/com/baeldung/cachecontrol/AppRunner.java
similarity index 100%
rename from spring-security-modules/spring-security-cache-control/src/main/java/com/baeldung/cachecontrol/AppRunner.java
rename to spring-security-modules/spring-security-config/cache-control/src/main/java/com/baeldung/cachecontrol/AppRunner.java
diff --git a/spring-security-modules/spring-security-cache-control/src/main/java/com/baeldung/cachecontrol/ResourceEndpoint.java b/spring-security-modules/spring-security-config/cache-control/src/main/java/com/baeldung/cachecontrol/ResourceEndpoint.java
similarity index 100%
rename from spring-security-modules/spring-security-cache-control/src/main/java/com/baeldung/cachecontrol/ResourceEndpoint.java
rename to spring-security-modules/spring-security-config/cache-control/src/main/java/com/baeldung/cachecontrol/ResourceEndpoint.java
diff --git a/spring-security-modules/spring-security-cache-control/src/main/java/com/baeldung/cachecontrol/config/SpringSecurityConfig.java b/spring-security-modules/spring-security-config/cache-control/src/main/java/com/baeldung/cachecontrol/config/SpringSecurityConfig.java
similarity index 100%
rename from spring-security-modules/spring-security-cache-control/src/main/java/com/baeldung/cachecontrol/config/SpringSecurityConfig.java
rename to spring-security-modules/spring-security-config/cache-control/src/main/java/com/baeldung/cachecontrol/config/SpringSecurityConfig.java
diff --git a/spring-security-modules/spring-security-cache-control/src/main/java/com/baeldung/cachecontrol/model/TimestampDto.java b/spring-security-modules/spring-security-config/cache-control/src/main/java/com/baeldung/cachecontrol/model/TimestampDto.java
similarity index 100%
rename from spring-security-modules/spring-security-cache-control/src/main/java/com/baeldung/cachecontrol/model/TimestampDto.java
rename to spring-security-modules/spring-security-config/cache-control/src/main/java/com/baeldung/cachecontrol/model/TimestampDto.java
diff --git a/spring-security-modules/spring-security-cache-control/src/main/java/com/baeldung/cachecontrol/model/UserDto.java b/spring-security-modules/spring-security-config/cache-control/src/main/java/com/baeldung/cachecontrol/model/UserDto.java
similarity index 100%
rename from spring-security-modules/spring-security-cache-control/src/main/java/com/baeldung/cachecontrol/model/UserDto.java
rename to spring-security-modules/spring-security-config/cache-control/src/main/java/com/baeldung/cachecontrol/model/UserDto.java
diff --git a/spring-security-modules/spring-security-cache-control/src/main/resources/logback.xml b/spring-security-modules/spring-security-config/cache-control/src/main/resources/logback.xml
similarity index 100%
rename from spring-security-modules/spring-security-cache-control/src/main/resources/logback.xml
rename to spring-security-modules/spring-security-config/cache-control/src/main/resources/logback.xml
diff --git a/spring-security-modules/spring-security-cache-control/src/test/java/com/baeldung/SpringContextTest.java b/spring-security-modules/spring-security-config/cache-control/src/test/java/com/baeldung/SpringContextTest.java
similarity index 100%
rename from spring-security-modules/spring-security-cache-control/src/test/java/com/baeldung/SpringContextTest.java
rename to spring-security-modules/spring-security-config/cache-control/src/test/java/com/baeldung/SpringContextTest.java
diff --git a/spring-security-modules/spring-security-cache-control/src/test/java/com/baeldung/cachecontrol/ResourceEndpointIntegrationTest.java b/spring-security-modules/spring-security-config/cache-control/src/test/java/com/baeldung/cachecontrol/ResourceEndpointIntegrationTest.java
similarity index 100%
rename from spring-security-modules/spring-security-cache-control/src/test/java/com/baeldung/cachecontrol/ResourceEndpointIntegrationTest.java
rename to spring-security-modules/spring-security-config/cache-control/src/test/java/com/baeldung/cachecontrol/ResourceEndpointIntegrationTest.java
diff --git a/spring-security-modules/spring-security-cors/README.md b/spring-security-modules/spring-security-config/cors/README.md
similarity index 100%
rename from spring-security-modules/spring-security-cors/README.md
rename to spring-security-modules/spring-security-config/cors/README.md
diff --git a/spring-security-modules/spring-security-cors/pom.xml b/spring-security-modules/spring-security-config/cors/pom.xml
similarity index 96%
rename from spring-security-modules/spring-security-cors/pom.xml
rename to spring-security-modules/spring-security-config/cors/pom.xml
index 2acb99368f..f400527863 100644
--- a/spring-security-modules/spring-security-cors/pom.xml
+++ b/spring-security-modules/spring-security-config/cors/pom.xml
@@ -2,8 +2,8 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>spring-security-cors</artifactId>
-    <name>spring-security-cors</name>
+    <artifactId>cors</artifactId>
+    <name>cors</name>
     <packaging>jar</packaging>
     <description>Spring Security CORS</description>
 
diff --git a/spring-security-modules/spring-security-cors/src/main/java/com/baeldung/springbootsecuritycors/basicauth/SpringBootSecurityApplication.java b/spring-security-modules/spring-security-config/cors/src/main/java/com/baeldung/springbootsecuritycors/basicauth/SpringBootSecurityApplication.java
similarity index 100%
rename from spring-security-modules/spring-security-cors/src/main/java/com/baeldung/springbootsecuritycors/basicauth/SpringBootSecurityApplication.java
rename to spring-security-modules/spring-security-config/cors/src/main/java/com/baeldung/springbootsecuritycors/basicauth/SpringBootSecurityApplication.java
diff --git a/spring-security-modules/spring-security-cors/src/main/java/com/baeldung/springbootsecuritycors/basicauth/config/WebSecurityConfig.java b/spring-security-modules/spring-security-config/cors/src/main/java/com/baeldung/springbootsecuritycors/basicauth/config/WebSecurityConfig.java
similarity index 100%
rename from spring-security-modules/spring-security-cors/src/main/java/com/baeldung/springbootsecuritycors/basicauth/config/WebSecurityConfig.java
rename to spring-security-modules/spring-security-config/cors/src/main/java/com/baeldung/springbootsecuritycors/basicauth/config/WebSecurityConfig.java
diff --git a/spring-security-modules/spring-security-cors/src/main/java/com/baeldung/springbootsecuritycors/controller/ResourceController.java b/spring-security-modules/spring-security-config/cors/src/main/java/com/baeldung/springbootsecuritycors/controller/ResourceController.java
similarity index 100%
rename from spring-security-modules/spring-security-cors/src/main/java/com/baeldung/springbootsecuritycors/controller/ResourceController.java
rename to spring-security-modules/spring-security-config/cors/src/main/java/com/baeldung/springbootsecuritycors/controller/ResourceController.java
diff --git a/spring-security-modules/spring-security-cors/src/test/java/com/baeldung/springbootsecuritycors/ResourceControllerUnitTest.java b/spring-security-modules/spring-security-config/cors/src/test/java/com/baeldung/springbootsecuritycors/ResourceControllerUnitTest.java
similarity index 100%
rename from spring-security-modules/spring-security-cors/src/test/java/com/baeldung/springbootsecuritycors/ResourceControllerUnitTest.java
rename to spring-security-modules/spring-security-config/cors/src/test/java/com/baeldung/springbootsecuritycors/ResourceControllerUnitTest.java
diff --git a/spring-security-modules/spring-security-config/pom.xml b/spring-security-modules/spring-security-config/pom.xml
new file mode 100644
index 0000000000..b3796d1cc6
--- /dev/null
+++ b/spring-security-modules/spring-security-config/pom.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>spring-security-config</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <name>spring-security-conf</name>
+    <packaging>pom</packaging>
+
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-modules</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+
+    <modules>
+        <module>cache-control</module>
+        <module>cors</module>
+    </modules>
+
+</project>