From d1748592317772444c58d61fd3e4ad3ff3aac954 Mon Sep 17 00:00:00 2001 From: sampadawagde Date: Sat, 11 Jul 2020 10:02:44 +0530 Subject: [PATCH] BAEL-4019: changed package name --- .../java/com/baeldung/{ => comparison}/shiro/CustomRealm.java | 2 +- .../com/baeldung/{ => comparison}/shiro/ShiroApplication.java | 2 +- .../{ => comparison}/shiro/controllers/ShiroController.java | 4 ++-- .../{ => comparison}/shiro/models/UserCredentials.java | 2 +- .../baeldung/{ => comparison}/springsecurity/Application.java | 2 +- .../springsecurity/config/SecurityConfig.java | 2 +- .../{ => comparison}/springsecurity/web/SpringController.java | 2 +- .../com/baeldung/{shiro => }/permissions/custom/Main.java | 2 +- .../{shiro => }/permissions/custom/PathPermission.java | 2 +- .../permissions/custom/PathPermissionResolver.java | 2 +- .../baeldung/{ => comparison}/shiro/SpringContextTest.java | 4 +++- .../{ => comparison}/springsecurity/SpringContextTest.java | 4 +++- 12 files changed, 17 insertions(+), 13 deletions(-) rename apache-shiro/src/main/java/com/baeldung/{ => comparison}/shiro/CustomRealm.java (98%) rename apache-shiro/src/main/java/com/baeldung/{ => comparison}/shiro/ShiroApplication.java (96%) rename apache-shiro/src/main/java/com/baeldung/{ => comparison}/shiro/controllers/ShiroController.java (96%) rename apache-shiro/src/main/java/com/baeldung/{ => comparison}/shiro/models/UserCredentials.java (91%) rename apache-shiro/src/main/java/com/baeldung/{ => comparison}/springsecurity/Application.java (94%) rename apache-shiro/src/main/java/com/baeldung/{ => comparison}/springsecurity/config/SecurityConfig.java (96%) rename apache-shiro/src/main/java/com/baeldung/{ => comparison}/springsecurity/web/SpringController.java (98%) rename apache-shiro/src/main/java/com/baeldung/{shiro => }/permissions/custom/Main.java (98%) rename apache-shiro/src/main/java/com/baeldung/{shiro => }/permissions/custom/PathPermission.java (90%) rename apache-shiro/src/main/java/com/baeldung/{shiro => }/permissions/custom/PathPermissionResolver.java (88%) rename apache-shiro/src/test/java/com/baeldung/{ => comparison}/shiro/SpringContextTest.java (81%) rename apache-shiro/src/test/java/com/baeldung/{ => comparison}/springsecurity/SpringContextTest.java (79%) diff --git a/apache-shiro/src/main/java/com/baeldung/shiro/CustomRealm.java b/apache-shiro/src/main/java/com/baeldung/comparison/shiro/CustomRealm.java similarity index 98% rename from apache-shiro/src/main/java/com/baeldung/shiro/CustomRealm.java rename to apache-shiro/src/main/java/com/baeldung/comparison/shiro/CustomRealm.java index f1daed45aa..d82fb1a5d5 100644 --- a/apache-shiro/src/main/java/com/baeldung/shiro/CustomRealm.java +++ b/apache-shiro/src/main/java/com/baeldung/comparison/shiro/CustomRealm.java @@ -1,4 +1,4 @@ -package com.baeldung.shiro; +package com.baeldung.comparison.shiro; import java.sql.Connection; import java.sql.SQLException; diff --git a/apache-shiro/src/main/java/com/baeldung/shiro/ShiroApplication.java b/apache-shiro/src/main/java/com/baeldung/comparison/shiro/ShiroApplication.java similarity index 96% rename from apache-shiro/src/main/java/com/baeldung/shiro/ShiroApplication.java rename to apache-shiro/src/main/java/com/baeldung/comparison/shiro/ShiroApplication.java index f383382c86..92d43ea957 100644 --- a/apache-shiro/src/main/java/com/baeldung/shiro/ShiroApplication.java +++ b/apache-shiro/src/main/java/com/baeldung/comparison/shiro/ShiroApplication.java @@ -1,4 +1,4 @@ -package com.baeldung.shiro; +package com.baeldung.comparison.shiro; import org.apache.shiro.realm.Realm; import org.apache.shiro.spring.web.config.DefaultShiroFilterChainDefinition; diff --git a/apache-shiro/src/main/java/com/baeldung/shiro/controllers/ShiroController.java b/apache-shiro/src/main/java/com/baeldung/comparison/shiro/controllers/ShiroController.java similarity index 96% rename from apache-shiro/src/main/java/com/baeldung/shiro/controllers/ShiroController.java rename to apache-shiro/src/main/java/com/baeldung/comparison/shiro/controllers/ShiroController.java index 7205c44173..b819286c57 100644 --- a/apache-shiro/src/main/java/com/baeldung/shiro/controllers/ShiroController.java +++ b/apache-shiro/src/main/java/com/baeldung/comparison/shiro/controllers/ShiroController.java @@ -1,4 +1,4 @@ -package com.baeldung.shiro.controllers; +package com.baeldung.comparison.shiro.controllers; import javax.servlet.http.HttpServletRequest; @@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.servlet.mvc.support.RedirectAttributes; -import com.baeldung.shiro.models.UserCredentials; +import com.baeldung.comparison.shiro.models.UserCredentials; @Controller public class ShiroController { diff --git a/apache-shiro/src/main/java/com/baeldung/shiro/models/UserCredentials.java b/apache-shiro/src/main/java/com/baeldung/comparison/shiro/models/UserCredentials.java similarity index 91% rename from apache-shiro/src/main/java/com/baeldung/shiro/models/UserCredentials.java rename to apache-shiro/src/main/java/com/baeldung/comparison/shiro/models/UserCredentials.java index 5dbafa30ec..100809f6ea 100644 --- a/apache-shiro/src/main/java/com/baeldung/shiro/models/UserCredentials.java +++ b/apache-shiro/src/main/java/com/baeldung/comparison/shiro/models/UserCredentials.java @@ -1,4 +1,4 @@ -package com.baeldung.shiro.models; +package com.baeldung.comparison.shiro.models; public class UserCredentials { diff --git a/apache-shiro/src/main/java/com/baeldung/springsecurity/Application.java b/apache-shiro/src/main/java/com/baeldung/comparison/springsecurity/Application.java similarity index 94% rename from apache-shiro/src/main/java/com/baeldung/springsecurity/Application.java rename to apache-shiro/src/main/java/com/baeldung/comparison/springsecurity/Application.java index 61adfb9cb6..6878c309df 100644 --- a/apache-shiro/src/main/java/com/baeldung/springsecurity/Application.java +++ b/apache-shiro/src/main/java/com/baeldung/comparison/springsecurity/Application.java @@ -1,4 +1,4 @@ -package com.baeldung.springsecurity; +package com.baeldung.comparison.springsecurity; import org.apache.shiro.spring.boot.autoconfigure.ShiroAnnotationProcessorAutoConfiguration; import org.apache.shiro.spring.boot.autoconfigure.ShiroAutoConfiguration; diff --git a/apache-shiro/src/main/java/com/baeldung/springsecurity/config/SecurityConfig.java b/apache-shiro/src/main/java/com/baeldung/comparison/springsecurity/config/SecurityConfig.java similarity index 96% rename from apache-shiro/src/main/java/com/baeldung/springsecurity/config/SecurityConfig.java rename to apache-shiro/src/main/java/com/baeldung/comparison/springsecurity/config/SecurityConfig.java index 3fa5632db9..d838eef9b3 100644 --- a/apache-shiro/src/main/java/com/baeldung/springsecurity/config/SecurityConfig.java +++ b/apache-shiro/src/main/java/com/baeldung/comparison/springsecurity/config/SecurityConfig.java @@ -1,4 +1,4 @@ -package com.baeldung.springsecurity.config; +package com.baeldung.comparison.springsecurity.config; import org.springframework.context.annotation.Bean; import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; diff --git a/apache-shiro/src/main/java/com/baeldung/springsecurity/web/SpringController.java b/apache-shiro/src/main/java/com/baeldung/comparison/springsecurity/web/SpringController.java similarity index 98% rename from apache-shiro/src/main/java/com/baeldung/springsecurity/web/SpringController.java rename to apache-shiro/src/main/java/com/baeldung/comparison/springsecurity/web/SpringController.java index 1bde241bf9..34b6b0c0e3 100644 --- a/apache-shiro/src/main/java/com/baeldung/springsecurity/web/SpringController.java +++ b/apache-shiro/src/main/java/com/baeldung/comparison/springsecurity/web/SpringController.java @@ -1,4 +1,4 @@ -package com.baeldung.springsecurity.web; +package com.baeldung.comparison.springsecurity.web; import java.util.Collection; diff --git a/apache-shiro/src/main/java/com/baeldung/shiro/permissions/custom/Main.java b/apache-shiro/src/main/java/com/baeldung/permissions/custom/Main.java similarity index 98% rename from apache-shiro/src/main/java/com/baeldung/shiro/permissions/custom/Main.java rename to apache-shiro/src/main/java/com/baeldung/permissions/custom/Main.java index a902a24388..c9ab2b6e37 100644 --- a/apache-shiro/src/main/java/com/baeldung/shiro/permissions/custom/Main.java +++ b/apache-shiro/src/main/java/com/baeldung/permissions/custom/Main.java @@ -1,4 +1,4 @@ -package com.baeldung.shiro.permissions.custom; +package com.baeldung.permissions.custom; import org.apache.shiro.SecurityUtils; import org.apache.shiro.authc.AuthenticationException; diff --git a/apache-shiro/src/main/java/com/baeldung/shiro/permissions/custom/PathPermission.java b/apache-shiro/src/main/java/com/baeldung/permissions/custom/PathPermission.java similarity index 90% rename from apache-shiro/src/main/java/com/baeldung/shiro/permissions/custom/PathPermission.java rename to apache-shiro/src/main/java/com/baeldung/permissions/custom/PathPermission.java index f7dfbda06a..828484087f 100644 --- a/apache-shiro/src/main/java/com/baeldung/shiro/permissions/custom/PathPermission.java +++ b/apache-shiro/src/main/java/com/baeldung/permissions/custom/PathPermission.java @@ -1,4 +1,4 @@ -package com.baeldung.shiro.permissions.custom; +package com.baeldung.permissions.custom; import org.apache.shiro.authz.Permission; diff --git a/apache-shiro/src/main/java/com/baeldung/shiro/permissions/custom/PathPermissionResolver.java b/apache-shiro/src/main/java/com/baeldung/permissions/custom/PathPermissionResolver.java similarity index 88% rename from apache-shiro/src/main/java/com/baeldung/shiro/permissions/custom/PathPermissionResolver.java rename to apache-shiro/src/main/java/com/baeldung/permissions/custom/PathPermissionResolver.java index 4b60d2fbd4..30bdece65f 100644 --- a/apache-shiro/src/main/java/com/baeldung/shiro/permissions/custom/PathPermissionResolver.java +++ b/apache-shiro/src/main/java/com/baeldung/permissions/custom/PathPermissionResolver.java @@ -1,4 +1,4 @@ -package com.baeldung.shiro.permissions.custom; +package com.baeldung.permissions.custom; import org.apache.shiro.authz.Permission; import org.apache.shiro.authz.permission.PermissionResolver; diff --git a/apache-shiro/src/test/java/com/baeldung/shiro/SpringContextTest.java b/apache-shiro/src/test/java/com/baeldung/comparison/shiro/SpringContextTest.java similarity index 81% rename from apache-shiro/src/test/java/com/baeldung/shiro/SpringContextTest.java rename to apache-shiro/src/test/java/com/baeldung/comparison/shiro/SpringContextTest.java index 0b5e690403..0d150d0fad 100644 --- a/apache-shiro/src/test/java/com/baeldung/shiro/SpringContextTest.java +++ b/apache-shiro/src/test/java/com/baeldung/comparison/shiro/SpringContextTest.java @@ -1,4 +1,4 @@ -package com.baeldung.shiro; +package com.baeldung.comparison.shiro; import org.junit.jupiter.api.Test; @@ -6,6 +6,8 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit.jupiter.SpringExtension; +import com.baeldung.comparison.shiro.ShiroApplication; + @ExtendWith(SpringExtension.class) @SpringBootTest(classes = { ShiroApplication.class }) public class SpringContextTest { diff --git a/apache-shiro/src/test/java/com/baeldung/springsecurity/SpringContextTest.java b/apache-shiro/src/test/java/com/baeldung/comparison/springsecurity/SpringContextTest.java similarity index 79% rename from apache-shiro/src/test/java/com/baeldung/springsecurity/SpringContextTest.java rename to apache-shiro/src/test/java/com/baeldung/comparison/springsecurity/SpringContextTest.java index a3adfa30c4..5044b40e31 100644 --- a/apache-shiro/src/test/java/com/baeldung/springsecurity/SpringContextTest.java +++ b/apache-shiro/src/test/java/com/baeldung/comparison/springsecurity/SpringContextTest.java @@ -1,10 +1,12 @@ -package com.baeldung.springsecurity; +package com.baeldung.comparison.springsecurity; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit.jupiter.SpringExtension; +import com.baeldung.comparison.springsecurity.Application; + @ExtendWith(SpringExtension.class) @SpringBootTest(classes = { Application.class }) public class SpringContextTest {