From 364506f1e4fb002e9a8ea5d1a26b22800490a3ae Mon Sep 17 00:00:00 2001
From: Paul-Christian Volkmer <paul-christian.volkmer@mni.thm.de>
Date: Sat, 11 Aug 2012 10:38:18 +0200
Subject: [PATCH] Prepared servlet config to pass config files as ressource
This is needed if using index.html instead of developer.html
---
src/main/webapp/WEB-INF/arsnova-servlet.xml | 4 ++--
src/main/webapp/WEB-INF/spring/spring-security.xml | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/webapp/WEB-INF/arsnova-servlet.xml b/src/main/webapp/WEB-INF/arsnova-servlet.xml
index be3eb585..f2e3c7e0 100644
--- a/src/main/webapp/WEB-INF/arsnova-servlet.xml
+++ b/src/main/webapp/WEB-INF/arsnova-servlet.xml
@@ -14,8 +14,8 @@
<mvc:resources mapping="/**.html" location="/" />
<mvc:resources mapping="/**.png" location="/"/>
<mvc:resources mapping="/**.manifest" location="/"/>
- <mvc:resources mapping="/config.json" location="/"/>
- <mvc:resources mapping="/config.xml" location="/"/>
+ <mvc:resources mapping="/**.json" location="/"/>
+ <mvc:resources mapping="/**.xml" location="/"/>
<mvc:resources mapping="/dojo/**" location="/dojo/"/>
<mvc:resources mapping="/dijit/**" location="/dijit/"/>
<mvc:resources mapping="/dojox/**" location="/dojox/"/>
diff --git a/src/main/webapp/WEB-INF/spring/spring-security.xml b/src/main/webapp/WEB-INF/spring/spring-security.xml
index 1088acc0..e1e54d7d 100644
--- a/src/main/webapp/WEB-INF/spring/spring-security.xml
+++ b/src/main/webapp/WEB-INF/spring/spring-security.xml
@@ -27,7 +27,7 @@
<sec:openid-login user-service-ref="openidUserDetailsService"
default-target-url="${security.openid-target-url}" />
</sec:http>
-
+
<bean id="casFilter"
class="org.springframework.security.cas.web.CasAuthenticationFilter">
<property name="authenticationManager" ref="casAuthManager" />
--
GitLab