Pausing to wait on Spring advice

fcrepo · May 31, 2013 · 6fec6fe · 6fec6fe
1 parent 1f350c2
commit 6fec6fe
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 9 deletions.
diff --git a/...pp/src/main/resources/spring/security.xml → ...po-webapp/src/main/resources/security.xml b/...pp/src/main/resources/spring/security.xml → ...po-webapp/src/main/resources/security.xml
diff --git a/fcrepo-webapp/src/main/webapp/WEB-INF/applicationContext.xml b/fcrepo-webapp/src/main/webapp/WEB-INF/applicationContext.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+    xmlns:oauth="http://www.springframework.org/schema/security/oauth2"
+    xmlns:sec="http://www.springframework.org/schema/security"
+    xmlns:mvc="http://www.springframework.org/schema/mvc"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.springframework.org/schema/security/oauth2 http://www.springframework.org/schema/security/spring-security-oauth2-1.0.xsd
+    http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.1.xsd
+    http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.1.xsd
+    http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
+
+</beans>
diff --git a/fcrepo-webapp/src/main/webapp/WEB-INF/web.xml b/fcrepo-webapp/src/main/webapp/WEB-INF/web.xml
@@ -7,11 +7,6 @@
 
   <display-name>Fedora Commons 4</display-name>
 
-  <context-param>
-    <param-name>contextConfigLocation</param-name>
-    <param-value>WEB-INF/classes/spring/*.xml</param-value>
-  </context-param>
-
   <listener>
     <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
   </listener>
@@ -33,10 +28,9 @@
     <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
     <init-param>
       <param-name>contextConfigLocation</param-name>
-      <param-value>WEB-INF/classes/spring/security.xml</param-value>
+      <param-value>WEB-INF/classes/security.xml</param-value>
     </init-param>
     <load-on-startup>1</load-on-startup>
-
   </servlet>
 
   <servlet-mapping>
@@ -45,14 +39,17 @@
   </servlet-mapping>
 
   <servlet>
-
     <servlet-name>jersey-servlet</servlet-name>
     <servlet-class>com.sun.jersey.spi.spring.container.servlet.SpringServlet</servlet-class>
     <init-param>
       <param-name>com.sun.jersey.config.property.packages</param-name>
       <param-value>org.fcrepo</param-value>
     </init-param>
-    <load-on-startup>1</load-on-startup>
+    <init-param>
+      <param-name>contextConfigLocation</param-name>
+      <param-value>WEB-INF/classes/spring/*.xml</param-value>
+    </init-param>
+    <load-on-startup>2</load-on-startup>
   </servlet>
 
   <servlet-mapping>