Commit 1a944439 authored by Matija Obreza's avatar Matija Obreza
Browse files

Moved Spring servlet.xml

parent 51967aa8
......@@ -59,7 +59,7 @@
</servlet-class>
<init-param>
<param-name>contextConfigLocation</param-name>
<param-value>classpath:/servlet/auth-servlet.xml</param-value>
<param-value>classpath:/spring/spring-servlet.xml</param-value>
</init-param>
<load-on-startup>1</load-on-startup>
</servlet>
......
......@@ -32,7 +32,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
@WebAppConfiguration
@ContextConfiguration(locations = {"classpath:spring/spring-common.xml",//ignore security
"classpath:spring/spring-db.xml",
"classpath:servlet/auth-servlet.xml",
"classpath:spring/spring-servlet.xml",
"classpath:spring/spring-security-test.xml"})
@ActiveProfiles("test")
public abstract class RestTest {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment