migrated the following modules using parent-spring-5 to spring 5.1:

spring-mvc-simple
spring-security-mvc-custom
spring-security-mvc-login
spring-security-rest
spring-security-rest-basic-auth
spring-static-resources
spring-thymeleaf
This commit is contained in:
geroza
2019-01-08 16:16:51 -02:00
parent 3bad1ab7d3
commit c7ba38ffcd
16 changed files with 64 additions and 40 deletions

View File

@@ -4,7 +4,7 @@ import org.apache.http.HttpHost;
import org.springframework.beans.factory.FactoryBean;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.http.client.ClientHttpRequestFactory;
import org.springframework.http.client.support.BasicAuthorizationInterceptor;
import org.springframework.http.client.support.BasicAuthenticationInterceptor;
import org.springframework.stereotype.Component;
import org.springframework.web.client.RestTemplate;
@@ -38,7 +38,7 @@ public class RestTemplateFactory implements FactoryBean<RestTemplate>, Initializ
HttpHost host = new HttpHost("localhost", 8082, "http");
final ClientHttpRequestFactory requestFactory = new HttpComponentsClientHttpRequestFactoryBasicAuth(host);
restTemplate = new RestTemplate(requestFactory);
restTemplate.getInterceptors().add(new BasicAuthorizationInterceptor("user1", "user1Pass"));
restTemplate.getInterceptors().add(new BasicAuthenticationInterceptor("user1", "user1Pass"));
}
}

View File

@@ -8,7 +8,6 @@ import org.springframework.http.converter.HttpMessageConverter;
import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
import org.springframework.web.servlet.config.annotation.EnableWebMvc;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
@Configuration
@EnableWebMvc

View File

@@ -6,7 +6,7 @@ import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration({ "/WebSecurityConfig.xml" })
@ContextConfiguration({ "/webSecurityConfig.xml" })
public class SpringContextIntegrationTest {
@Test