Commit 7f245218 authored by Gradl, Tobias's avatar Gradl, Tobias
Browse files

703: Implement simple sample application based on current frameworks

Task-Url: https://minfba.de.dariah.eu/mantisbt/view.php?id=703
parent 231ab247
......@@ -9,7 +9,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata;
@Configuration
@Conditional(ConditionalLocalSecurityConfiguration.Condition.class)
@ImportResource("file:**/WebContent/WEB-INF/spring/security/security-context-local.xml")
@ImportResource("classpath:spring/security/security-context-local.xml")
public class ConditionalLocalSecurityConfiguration {
static class Condition implements ConfigurationCondition {
@Override
......
......@@ -9,7 +9,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata;
@Configuration
@Conditional(ConditionalSamlSecurityConfiguration.Condition.class)
@ImportResource("file:**/WebContent/WEB-INF/spring/security/security-context-saml.xml")
@ImportResource("classpath:spring/security/security-context-saml.xml")
public class ConditionalSamlSecurityConfiguration {
static class Condition implements ConfigurationCondition {
@Override
......@@ -21,4 +21,4 @@ public class ConditionalSamlSecurityConfiguration {
return System.getProperty("saml")!=null && Boolean.parseBoolean(System.getProperty("saml"));
}
}
}
}
\ No newline at end of file
......@@ -8,7 +8,7 @@ http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
<display-name>dariahsp-sample</display-name>
<context-param>
<param-name>contextConfigLocation</param-name>
<param-value>WEB-INF/spring/*-context.xml</param-value>
<param-value>classpath:spring/*-context.xml</param-value>
</context-param>
<welcome-file-list>
<welcome-file>index.jsp</welcome-file>
......@@ -29,7 +29,7 @@ http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
<init-param>
<param-name>contextConfigLocation</param-name>
<param-value>/WEB-INF/spring/servlet/servlet-context.xml</param-value>
<param-value>classpath:spring/servlet/servlet-context.xml</param-value>
</init-param>
<load-on-startup>1</load-on-startup>
</servlet>
......
Supports Markdown
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