diff --git a/curriculumsearch/src/main/java/com/roshka/configuration/WebSecurityConfig.java b/curriculumsearch/src/main/java/com/roshka/configuration/WebSecurityConfig.java index 6b366df..4cd6033 100644 --- a/curriculumsearch/src/main/java/com/roshka/configuration/WebSecurityConfig.java +++ b/curriculumsearch/src/main/java/com/roshka/configuration/WebSecurityConfig.java @@ -1,6 +1,5 @@ package com.roshka.configuration; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.security.authentication.dao.DaoAuthenticationProvider; @@ -12,13 +11,11 @@ import org.springframework.security.core.userdetails.UserDetailsService; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.security.web.util.matcher.AntPathRequestMatcher; -import javax.sql.DataSource; @Configuration @EnableWebSecurity public class WebSecurityConfig extends WebSecurityConfigurerAdapter { - @Autowired - private DataSource dataSource; + @Bean public UserDetailsService userDetailsService() { diff --git a/curriculumsearch/src/main/webapp/jsp/edit-user-data.jsp b/curriculumsearch/src/main/webapp/jsp/edit-user-data.jsp index 38b2f2b..751c0ae 100644 --- a/curriculumsearch/src/main/webapp/jsp/edit-user-data.jsp +++ b/curriculumsearch/src/main/webapp/jsp/edit-user-data.jsp @@ -1,66 +1,53 @@ -<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> - -
- -