From 990e0c15123907df656e26251a1c5d07f6e2dedc Mon Sep 17 00:00:00 2001
From: sampadawagde <sampada.wagde@gmail.com>
Date: Thu, 9 Jul 2020 18:05:11 +0530
Subject: [PATCH] BAEL-4019: movements for old code to accommodate new shiro
 application

---
 .../src/main/java/com/baeldung/{ => intro}/Main.java       | 2 +-
 .../main/java/com/baeldung/{ => intro}/MyCustomRealm.java  | 2 +-
 .../com/baeldung/{ => intro}/ShiroSpringApplication.java   | 7 ++++---
 .../{ => intro}/controllers/ShiroSpringController.java     | 5 +++--
 .../com/baeldung/{ => intro}/models/UserCredentials.java   | 2 +-
 5 files changed, 10 insertions(+), 8 deletions(-)
 rename apache-shiro/src/main/java/com/baeldung/{ => intro}/Main.java (99%)
 rename apache-shiro/src/main/java/com/baeldung/{ => intro}/MyCustomRealm.java (99%)
 rename apache-shiro/src/main/java/com/baeldung/{ => intro}/ShiroSpringApplication.java (80%)
 rename apache-shiro/src/main/java/com/baeldung/{ => intro}/controllers/ShiroSpringController.java (97%)
 rename apache-shiro/src/main/java/com/baeldung/{ => intro}/models/UserCredentials.java (95%)

diff --git a/apache-shiro/src/main/java/com/baeldung/Main.java b/apache-shiro/src/main/java/com/baeldung/intro/Main.java
similarity index 99%
rename from apache-shiro/src/main/java/com/baeldung/Main.java
rename to apache-shiro/src/main/java/com/baeldung/intro/Main.java
index 99515bb705..fbd3bc7ac7 100644
--- a/apache-shiro/src/main/java/com/baeldung/Main.java
+++ b/apache-shiro/src/main/java/com/baeldung/intro/Main.java
@@ -1,4 +1,4 @@
-package com.baeldung;
+package com.baeldung.intro;
 
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.authc.AuthenticationException;
diff --git a/apache-shiro/src/main/java/com/baeldung/MyCustomRealm.java b/apache-shiro/src/main/java/com/baeldung/intro/MyCustomRealm.java
similarity index 99%
rename from apache-shiro/src/main/java/com/baeldung/MyCustomRealm.java
rename to apache-shiro/src/main/java/com/baeldung/intro/MyCustomRealm.java
index 6d7c01d96e..9d65e37ec4 100644
--- a/apache-shiro/src/main/java/com/baeldung/MyCustomRealm.java
+++ b/apache-shiro/src/main/java/com/baeldung/intro/MyCustomRealm.java
@@ -1,4 +1,4 @@
-package com.baeldung;
+package com.baeldung.intro;
 
 import java.sql.Connection;
 import java.sql.SQLException;
diff --git a/apache-shiro/src/main/java/com/baeldung/ShiroSpringApplication.java b/apache-shiro/src/main/java/com/baeldung/intro/ShiroSpringApplication.java
similarity index 80%
rename from apache-shiro/src/main/java/com/baeldung/ShiroSpringApplication.java
rename to apache-shiro/src/main/java/com/baeldung/intro/ShiroSpringApplication.java
index e12d3ebffa..dc288a273b 100644
--- a/apache-shiro/src/main/java/com/baeldung/ShiroSpringApplication.java
+++ b/apache-shiro/src/main/java/com/baeldung/intro/ShiroSpringApplication.java
@@ -1,4 +1,4 @@
-package com.baeldung;
+package com.baeldung.intro;
 
 import org.apache.shiro.realm.Realm;
 import org.apache.shiro.spring.web.config.DefaultShiroFilterChainDefinition;
@@ -7,12 +7,13 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration;
 import org.springframework.context.annotation.Bean;
 
 /**
  * Created by smatt on 21/08/2017.
  */
-@SpringBootApplication
+@SpringBootApplication(exclude = SecurityAutoConfiguration.class)
 public class ShiroSpringApplication {
 
     private static final transient Logger log = LoggerFactory.getLogger(ShiroSpringApplication.class);
@@ -29,7 +30,7 @@ public class ShiroSpringApplication {
 
 
     @Bean
-    public ShiroFilterChainDefinition shiroFilterChainDefinition() {
+    public ShiroFilterChainDefinition filterChainDefinition() {
         DefaultShiroFilterChainDefinition filter
           = new DefaultShiroFilterChainDefinition();
 
diff --git a/apache-shiro/src/main/java/com/baeldung/controllers/ShiroSpringController.java b/apache-shiro/src/main/java/com/baeldung/intro/controllers/ShiroSpringController.java
similarity index 97%
rename from apache-shiro/src/main/java/com/baeldung/controllers/ShiroSpringController.java
rename to apache-shiro/src/main/java/com/baeldung/intro/controllers/ShiroSpringController.java
index 2713786d71..1605f390a8 100644
--- a/apache-shiro/src/main/java/com/baeldung/controllers/ShiroSpringController.java
+++ b/apache-shiro/src/main/java/com/baeldung/intro/controllers/ShiroSpringController.java
@@ -1,6 +1,5 @@
-package com.baeldung.controllers;
+package com.baeldung.intro.controllers;
 
-import com.baeldung.models.UserCredentials;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.authc.AuthenticationException;
 import org.apache.shiro.authc.UsernamePasswordToken;
@@ -13,6 +12,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
+import com.baeldung.intro.models.UserCredentials;
+
 import javax.servlet.http.HttpServletRequest;
 
 @Controller
diff --git a/apache-shiro/src/main/java/com/baeldung/models/UserCredentials.java b/apache-shiro/src/main/java/com/baeldung/intro/models/UserCredentials.java
similarity index 95%
rename from apache-shiro/src/main/java/com/baeldung/models/UserCredentials.java
rename to apache-shiro/src/main/java/com/baeldung/intro/models/UserCredentials.java
index 51b429046a..6614d07257 100644
--- a/apache-shiro/src/main/java/com/baeldung/models/UserCredentials.java
+++ b/apache-shiro/src/main/java/com/baeldung/intro/models/UserCredentials.java
@@ -1,4 +1,4 @@
-package com.baeldung.models;
+package com.baeldung.intro.models;
 
 public class UserCredentials {