iSharkFly-Docs/java-tutorials
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[JAVA-961] Standardize packages in spring-security-modules: spring-security-rest-custom (finalized)

Browse Source
This commit is contained in:
dupirefr 2020-03-19 21:43:08 +01:00
parent 06347b6f1f
commit 15ead38004
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-security-modules/spring-security-rest-custom/src/main/java/com/baeldung/config/MainWebAppInitializer.java
View File

@ -30,7 +30,7 @@ public class MainWebAppInitializer implements WebApplicationInitializer {
// Create the 'root' Spring application context // Create the 'root' Spring application context
final AnnotationConfigWebApplicationContext root = new AnnotationConfigWebApplicationContext(); final AnnotationConfigWebApplicationContext root = new AnnotationConfigWebApplicationContext();
root.scan("org.baeldung.config.parent"); root.scan("com.baeldung.config.parent");
// root.getEnvironment().setDefaultProfiles("embedded"); // root.getEnvironment().setDefaultProfiles("embedded");
// Manages the lifecycle of the root application context // Manages the lifecycle of the root application context
@ -38,7 +38,7 @@ public class MainWebAppInitializer implements WebApplicationInitializer {
// Handles requests into the application // Handles requests into the application
final AnnotationConfigWebApplicationContext childWebApplicationContext = new AnnotationConfigWebApplicationContext(); final AnnotationConfigWebApplicationContext childWebApplicationContext = new AnnotationConfigWebApplicationContext();
childWebApplicationContext.scan("org.baeldung.config.child"); childWebApplicationContext.scan("com.baeldung.config.child");
final ServletRegistration.Dynamic appServlet = sc.addServlet("api", new DispatcherServlet(childWebApplicationContext)); final ServletRegistration.Dynamic appServlet = sc.addServlet("api", new DispatcherServlet(childWebApplicationContext));
appServlet.setLoadOnStartup(1); appServlet.setLoadOnStartup(1);
final Set<String> mappingConflicts = appServlet.addMapping("/"); final Set<String> mappingConflicts = appServlet.addMapping("/");

2
spring-security-modules/spring-security-rest-custom/src/main/java/com/baeldung/config/child/WebConfig.java
View File

@ -23,7 +23,7 @@ import org.thymeleaf.templateresolver.ITemplateResolver;
@Configuration @Configuration
@EnableWebMvc @EnableWebMvc
@ComponentScan("org.baeldung.web") @ComponentScan("com.baeldung.web")
//@ImportResource({ "classpath:prop.xml" }) //@ImportResource({ "classpath:prop.xml" })
//@PropertySource("classpath:foo.properties") //@PropertySource("classpath:foo.properties")
public class WebConfig implements WebMvcConfigurer { public class WebConfig implements WebMvcConfigurer {

2
spring-security-modules/spring-security-rest-custom/src/main/java/com/baeldung/config/parent/SecurityConfig.java
View File

@ -12,7 +12,7 @@ import org.springframework.security.config.annotation.web.configuration.WebSecur
@Configuration @Configuration
//@ImportResource({ "classpath:webSecurityConfig.xml" }) //@ImportResource({ "classpath:webSecurityConfig.xml" })
@EnableWebSecurity @EnableWebSecurity
@ComponentScan("org.baeldung.security") @ComponentScan("com.baeldung.security")
public class SecurityConfig extends WebSecurityConfigurerAdapter { public class SecurityConfig extends WebSecurityConfigurerAdapter {
@Autowired @Autowired

2
spring-security-modules/spring-security-rest-custom/src/main/java/com/baeldung/config/parent/ServiceConfig.java
View File

@ -7,7 +7,7 @@ import org.springframework.context.annotation.PropertySource;
import org.springframework.context.support.PropertySourcesPlaceholderConfigurer; import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
@Configuration @Configuration
@ComponentScan("org.baeldung.service") @ComponentScan("com.baeldung.service")
// @ImportResource({ "classpath:prop.xml" }) // @ImportResource({ "classpath:prop.xml" })
@PropertySource("classpath:foo.properties") @PropertySource("classpath:foo.properties")
public class ServiceConfig { public class ServiceConfig {

4
spring-security-modules/spring-security-rest-custom/src/main/webapp/WEB-INF/web_old.xml
View File

@ -16,7 +16,7 @@
</context-param> </context-param>
<context-param> <context-param>
<param-name>contextConfigLocation</param-name> <param-name>contextConfigLocation</param-name>
<param-value>org.baeldung.config.parent</param-value> <param-value>com.baeldung.config.parent</param-value>
</context-param> </context-param>
<listener> <listener>
@ -29,7 +29,7 @@
<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class> <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
<!-- <init-param> --> <!-- <init-param> -->
<!-- <param-name>contextConfigLocation</param-name> --> <!-- <param-name>contextConfigLocation</param-name> -->
<!-- <param-value>org.baeldung.config.child</param-value> --> <!-- <param-value>com.baeldung.config.child</param-value> -->
<!-- </init-param> --> <!-- </init-param> -->
<load-on-startup>1</load-on-startup> <load-on-startup>1</load-on-startup>
</servlet> </servlet>