From 8d699c1b5d0e4655869982dcfc8a3f5091a92049 Mon Sep 17 00:00:00 2001
From: tschiman <tschiman@gmail.com>
Date: Sun, 6 Nov 2016 03:35:52 +0100
Subject: [PATCH] BAEL-89 modifying the module names and changing the
 dependencies to be in line with what we would get from start.spring.io

---
 spring-session/{jetty-ex => jetty-session-demo}/pom.xml  | 6 +++---
 .../spring/session/tomcatex/JettyWebApplication.java     | 5 +++++
 .../baeldung/spring/session/tomcatex/SecurityConfig.java | 0
 .../baeldung/spring/session/tomcatex/SessionConfig.java  | 0
 .../src/main/resources/application.properties            | 0
 spring-session/pom.xml                                   | 4 ++--
 .../{tomcat-ex => tomcat-session-demo}/pom.xml           | 9 ++-------
 .../baeldung/spring/session/tomcatex/SecurityConfig.java | 0
 .../baeldung/spring/session/tomcatex/SessionConfig.java  | 0
 .../spring/session/tomcatex/TomcatWebApplication.java    | 0
 .../src/main/resources/application.properties            | 0
 11 files changed, 12 insertions(+), 12 deletions(-)
 rename spring-session/{jetty-ex => jetty-session-demo}/pom.xml (98%)
 rename spring-session/{jetty-ex => jetty-session-demo}/src/main/java/com/baeldung/spring/session/tomcatex/JettyWebApplication.java (85%)
 rename spring-session/{jetty-ex => jetty-session-demo}/src/main/java/com/baeldung/spring/session/tomcatex/SecurityConfig.java (100%)
 rename spring-session/{jetty-ex => jetty-session-demo}/src/main/java/com/baeldung/spring/session/tomcatex/SessionConfig.java (100%)
 rename spring-session/{jetty-ex => jetty-session-demo}/src/main/resources/application.properties (100%)
 rename spring-session/{tomcat-ex => tomcat-session-demo}/pom.xml (91%)
 rename spring-session/{tomcat-ex => tomcat-session-demo}/src/main/java/com/baeldung/spring/session/tomcatex/SecurityConfig.java (100%)
 rename spring-session/{tomcat-ex => tomcat-session-demo}/src/main/java/com/baeldung/spring/session/tomcatex/SessionConfig.java (100%)
 rename spring-session/{tomcat-ex => tomcat-session-demo}/src/main/java/com/baeldung/spring/session/tomcatex/TomcatWebApplication.java (100%)
 rename spring-session/{tomcat-ex => tomcat-session-demo}/src/main/resources/application.properties (100%)

diff --git a/spring-session/jetty-ex/pom.xml b/spring-session/jetty-session-demo/pom.xml
similarity index 98%
rename from spring-session/jetty-ex/pom.xml
rename to spring-session/jetty-session-demo/pom.xml
index 339821b5fe..717506fbce 100644
--- a/spring-session/jetty-ex/pom.xml
+++ b/spring-session/jetty-session-demo/pom.xml
@@ -20,9 +20,10 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-jetty</artifactId>
         </dependency>
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
+            <artifactId>spring-boot-starter-data-redis</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -31,11 +32,10 @@
         <dependency>
             <groupId>org.springframework.session</groupId>
             <artifactId>spring-session</artifactId>
-            <version>1.2.1.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-redis</artifactId>
+            <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
     </dependencies>
 
diff --git a/spring-session/jetty-ex/src/main/java/com/baeldung/spring/session/tomcatex/JettyWebApplication.java b/spring-session/jetty-session-demo/src/main/java/com/baeldung/spring/session/tomcatex/JettyWebApplication.java
similarity index 85%
rename from spring-session/jetty-ex/src/main/java/com/baeldung/spring/session/tomcatex/JettyWebApplication.java
rename to spring-session/jetty-session-demo/src/main/java/com/baeldung/spring/session/tomcatex/JettyWebApplication.java
index 0da6316560..2cdc5f99af 100644
--- a/spring-session/jetty-ex/src/main/java/com/baeldung/spring/session/tomcatex/JettyWebApplication.java
+++ b/spring-session/jetty-session-demo/src/main/java/com/baeldung/spring/session/tomcatex/JettyWebApplication.java
@@ -16,4 +16,9 @@ public class JettyWebApplication {
         public String helloJetty() {
                 return "hello Jetty";
         }
+
+        @RequestMapping("/test")
+        public String lksjdf() {
+                return "";
+        }
 }
diff --git a/spring-session/jetty-ex/src/main/java/com/baeldung/spring/session/tomcatex/SecurityConfig.java b/spring-session/jetty-session-demo/src/main/java/com/baeldung/spring/session/tomcatex/SecurityConfig.java
similarity index 100%
rename from spring-session/jetty-ex/src/main/java/com/baeldung/spring/session/tomcatex/SecurityConfig.java
rename to spring-session/jetty-session-demo/src/main/java/com/baeldung/spring/session/tomcatex/SecurityConfig.java
diff --git a/spring-session/jetty-ex/src/main/java/com/baeldung/spring/session/tomcatex/SessionConfig.java b/spring-session/jetty-session-demo/src/main/java/com/baeldung/spring/session/tomcatex/SessionConfig.java
similarity index 100%
rename from spring-session/jetty-ex/src/main/java/com/baeldung/spring/session/tomcatex/SessionConfig.java
rename to spring-session/jetty-session-demo/src/main/java/com/baeldung/spring/session/tomcatex/SessionConfig.java
diff --git a/spring-session/jetty-ex/src/main/resources/application.properties b/spring-session/jetty-session-demo/src/main/resources/application.properties
similarity index 100%
rename from spring-session/jetty-ex/src/main/resources/application.properties
rename to spring-session/jetty-session-demo/src/main/resources/application.properties
diff --git a/spring-session/pom.xml b/spring-session/pom.xml
index 1e4bec0014..74561edc59 100644
--- a/spring-session/pom.xml
+++ b/spring-session/pom.xml
@@ -14,7 +14,7 @@
     <version>1.0.0-SNAPSHOT</version>
 
     <modules>
-        <module>jetty-ex</module>
-        <module>tomcat-ex</module>
+        <module>jetty-session-demo</module>
+        <module>tomcat-session-demo</module>
     </modules>
 </project>
\ No newline at end of file
diff --git a/spring-session/tomcat-ex/pom.xml b/spring-session/tomcat-session-demo/pom.xml
similarity index 91%
rename from spring-session/tomcat-ex/pom.xml
rename to spring-session/tomcat-session-demo/pom.xml
index aed49df5e3..cade029ac8 100644
--- a/spring-session/tomcat-ex/pom.xml
+++ b/spring-session/tomcat-session-demo/pom.xml
@@ -18,24 +18,19 @@
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
+            <artifactId>spring-boot-starter-data-redis</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-security</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-zuul</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.springframework.session</groupId>
             <artifactId>spring-session</artifactId>
-            <version>1.2.1.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-redis</artifactId>
+            <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
     </dependencies>
 
diff --git a/spring-session/tomcat-ex/src/main/java/com/baeldung/spring/session/tomcatex/SecurityConfig.java b/spring-session/tomcat-session-demo/src/main/java/com/baeldung/spring/session/tomcatex/SecurityConfig.java
similarity index 100%
rename from spring-session/tomcat-ex/src/main/java/com/baeldung/spring/session/tomcatex/SecurityConfig.java
rename to spring-session/tomcat-session-demo/src/main/java/com/baeldung/spring/session/tomcatex/SecurityConfig.java
diff --git a/spring-session/tomcat-ex/src/main/java/com/baeldung/spring/session/tomcatex/SessionConfig.java b/spring-session/tomcat-session-demo/src/main/java/com/baeldung/spring/session/tomcatex/SessionConfig.java
similarity index 100%
rename from spring-session/tomcat-ex/src/main/java/com/baeldung/spring/session/tomcatex/SessionConfig.java
rename to spring-session/tomcat-session-demo/src/main/java/com/baeldung/spring/session/tomcatex/SessionConfig.java
diff --git a/spring-session/tomcat-ex/src/main/java/com/baeldung/spring/session/tomcatex/TomcatWebApplication.java b/spring-session/tomcat-session-demo/src/main/java/com/baeldung/spring/session/tomcatex/TomcatWebApplication.java
similarity index 100%
rename from spring-session/tomcat-ex/src/main/java/com/baeldung/spring/session/tomcatex/TomcatWebApplication.java
rename to spring-session/tomcat-session-demo/src/main/java/com/baeldung/spring/session/tomcatex/TomcatWebApplication.java
diff --git a/spring-session/tomcat-ex/src/main/resources/application.properties b/spring-session/tomcat-session-demo/src/main/resources/application.properties
similarity index 100%
rename from spring-session/tomcat-ex/src/main/resources/application.properties
rename to spring-session/tomcat-session-demo/src/main/resources/application.properties