Skip to content

Commit f4b7309

Browse files
authored
Merge pull request eugenp#5625 from eugenp/BAEL-10161-v2
rename package, add java init
2 parents d079fc0 + da1a2cb commit f4b7309

14 files changed

+54
-18
lines changed
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
package com.baeldung;
2+
3+
import javax.servlet.ServletContext;
4+
import javax.servlet.ServletException;
5+
import javax.servlet.ServletRegistration;
6+
7+
import org.springframework.web.WebApplicationInitializer;
8+
import org.springframework.web.context.ContextLoaderListener;
9+
import org.springframework.web.context.support.AnnotationConfigWebApplicationContext;
10+
import org.springframework.web.context.support.GenericWebApplicationContext;
11+
import org.springframework.web.filter.DelegatingFilterProxy;
12+
import org.springframework.web.servlet.DispatcherServlet;
13+
14+
public class AppInitializer implements WebApplicationInitializer {
15+
16+
@Override
17+
public void onStartup(final ServletContext sc) throws ServletException {
18+
19+
AnnotationConfigWebApplicationContext root = new AnnotationConfigWebApplicationContext();
20+
21+
root.scan("com.baeldung");
22+
sc.addListener(new ContextLoaderListener(root));
23+
24+
ServletRegistration.Dynamic appServlet = sc.addServlet("mvc", new DispatcherServlet(new GenericWebApplicationContext()));
25+
appServlet.setLoadOnStartup(1);
26+
appServlet.addMapping("/");
27+
28+
sc.addFilter("securityFilter", new DelegatingFilterProxy("springSecurityFilterChain"))
29+
.addMappingForUrlPatterns(null, false, "/*");
30+
31+
}
32+
33+
}

spring-security-mvc-login/src/main/java/org/baeldung/controller/SecuredResourceController.java renamed to spring-security-mvc-login/src/main/java/com/baeldung/controller/SecuredResourceController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.baeldung.controller;
1+
package com.baeldung.controller;
22

33
import org.springframework.stereotype.Controller;
44
import org.springframework.web.bind.annotation.RequestMapping;

spring-security-mvc-login/src/main/java/org/baeldung/security/CustomAccessDeniedHandler.java renamed to spring-security-mvc-login/src/main/java/com/baeldung/security/CustomAccessDeniedHandler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.baeldung.security;
1+
package com.baeldung.security;
22

33
import java.io.IOException;
44

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.baeldung.security;
1+
package com.baeldung.security;
22

33
import org.springframework.http.HttpStatus;
44
import org.springframework.security.core.AuthenticationException;

spring-security-mvc-login/src/main/java/org/baeldung/security/CustomLogoutSuccessHandler.java renamed to spring-security-mvc-login/src/main/java/com/baeldung/security/CustomLogoutSuccessHandler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.baeldung.security;
1+
package com.baeldung.security;
22

33
import java.io.IOException;
44

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.baeldung.security;
1+
package com.baeldung.security;
22

33
import org.springframework.security.web.authentication.AuthenticationSuccessHandler;
44
import org.springframework.security.web.authentication.SimpleUrlAuthenticationSuccessHandler;

spring-security-mvc-login/src/main/java/org/baeldung/spring/ChannelSecSecurityConfig.java renamed to spring-security-mvc-login/src/main/java/com/baeldung/spring/ChannelSecSecurityConfig.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
package org.baeldung.spring;
1+
package com.baeldung.spring;
22

3-
import org.baeldung.security.CustomLogoutSuccessHandler;
43
import org.springframework.context.annotation.Bean;
54
import org.springframework.context.annotation.Configuration;
65
import org.springframework.context.annotation.Profile;
@@ -10,6 +9,8 @@
109
import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
1110
import org.springframework.security.web.authentication.logout.LogoutSuccessHandler;
1211

12+
import com.baeldung.security.CustomLogoutSuccessHandler;
13+
1314
@Configuration
1415
// @ImportResource({ "classpath:channelWebSecurityConfig.xml" })
1516
@EnableWebSecurity

spring-security-mvc-login/src/main/java/org/baeldung/spring/MvcConfig.java renamed to spring-security-mvc-login/src/main/java/com/baeldung/spring/MvcConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.baeldung.spring;
1+
package com.baeldung.spring;
22

33
import org.springframework.context.annotation.Bean;
44
import org.springframework.context.annotation.ComponentScan;

spring-security-mvc-login/src/main/java/org/baeldung/spring/RedirectionSecurityConfig.java renamed to spring-security-mvc-login/src/main/java/com/baeldung/spring/RedirectionSecurityConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.baeldung.spring;
1+
package com.baeldung.spring;
22

33
import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
44
import org.springframework.security.config.annotation.web.builders.HttpSecurity;

spring-security-mvc-login/src/main/java/org/baeldung/spring/SecSecurityConfig.java renamed to spring-security-mvc-login/src/main/java/com/baeldung/spring/SecSecurityConfig.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
1-
package org.baeldung.spring;
1+
package com.baeldung.spring;
22

3-
import org.baeldung.security.CustomAccessDeniedHandler;
4-
import org.baeldung.security.CustomAuthenticationFailureHandler;
5-
import org.baeldung.security.CustomLogoutSuccessHandler;
63
import org.springframework.context.annotation.Bean;
74
import org.springframework.context.annotation.Configuration;
85
import org.springframework.context.annotation.Profile;
@@ -16,6 +13,10 @@
1613
import org.springframework.security.web.authentication.AuthenticationFailureHandler;
1714
import org.springframework.security.web.authentication.logout.LogoutSuccessHandler;
1815

16+
import com.baeldung.security.CustomAccessDeniedHandler;
17+
import com.baeldung.security.CustomAuthenticationFailureHandler;
18+
import com.baeldung.security.CustomLogoutSuccessHandler;
19+
1920
@Configuration
2021
// @ImportResource({ "classpath:webSecurityConfig.xml" })
2122
@EnableWebSecurity

spring-security-mvc-login/src/main/webapp/WEB-INF/web.xml renamed to spring-security-mvc-login/src/main/webapp/WEB-INF/web-old.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
</context-param>
1616
<context-param>
1717
<param-name>contextConfigLocation</param-name>
18-
<param-value>org.baeldung.spring</param-value>
18+
<param-value>com.baeldung.spring</param-value>
1919
</context-param>
2020

2121
<listener>

spring-security-mvc-login/src/test/java/org/baeldung/SpringContextIntegrationTest.java renamed to spring-security-mvc-login/src/test/java/com/baeldung/SpringContextIntegrationTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.baeldung;
1+
package com.baeldung;
22

33
import org.junit.Test;
44
import org.junit.runner.RunWith;

spring-security-mvc-login/src/test/java/org/baeldung/security/FormLoginUnitTest.java renamed to spring-security-mvc-login/src/test/java/com/baeldung/security/FormLoginUnitTest.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
package org.baeldung.security;
1+
package com.baeldung.security;
22

3-
import org.baeldung.spring.SecSecurityConfig;
43
import org.junit.Before;
54
import org.junit.Test;
65
import org.junit.runner.RunWith;
@@ -13,6 +12,8 @@
1312
import org.springframework.test.web.servlet.setup.MockMvcBuilders;
1413
import org.springframework.web.context.WebApplicationContext;
1514

15+
import com.baeldung.spring.SecSecurityConfig;
16+
1617
import javax.servlet.Filter;
1718

1819
import static org.junit.Assert.assertTrue;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.baeldung.security;
1+
package com.baeldung.security;
22

33
import org.junit.Before;
44
import org.junit.Test;

0 commit comments

Comments
 (0)